sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Committed patch from iwgEric that fixes a couple of issues on android touchinput http://jmonkeyengine.org/groups/android/forum/topic/error-with-nifty-and-awt/?topic_page=2#post-165433

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9226 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-03-02 09:12:38 +00:00
parent 2bc7128eb6
commit 859123673e
4 changed files with 1753 additions and 1730 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1236
engine/src/android/com/jme3/input/android/AndroidInput.java
View File

File diff suppressed because it is too large Load Diff

1773
engine/src/core/com/jme3/input/InputManager.java
View File

File diff suppressed because it is too large Load Diff

6
engine/src/core/com/jme3/input/TouchInput.java
View File

@ -73,6 +73,12 @@ public interface TouchInput extends Input {
* @param simulate if mouse events should be generated * @param simulate if mouse events should be generated
*/ */
public void setSimulateMouse(boolean simulate); public void setSimulateMouse(boolean simulate);
/**
* Get if mouse events are generated
*
*/
public boolean getSimulateMouse();
/** /**
* Set if keyboard events should be generated * Set if keyboard events should be generated

468
engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
View File

@ -1,233 +1,235 @@
/* /*
* Copyright (c) 2009-2010 jMonkeyEngine * Copyright (c) 2009-2010 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
* met: * met:
* *
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* * Neither the name of 'jMonkeyEngine' nor the names of its contributors * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
* may be used to endorse or promote products derived from this software * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package com.jme3.niftygui; package com.jme3.niftygui;
import com.jme3.input.InputManager; import com.jme3.input.InputManager;
import com.jme3.input.KeyInput; import com.jme3.input.KeyInput;
import com.jme3.input.RawInputListener; import com.jme3.input.RawInputListener;
import com.jme3.input.event.*; import com.jme3.input.event.*;
import de.lessvoid.nifty.Nifty; import de.lessvoid.nifty.Nifty;
import de.lessvoid.nifty.NiftyInputConsumer; import de.lessvoid.nifty.NiftyInputConsumer;
import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader; import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader;
import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent; import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
import de.lessvoid.nifty.spi.input.InputSystem; import de.lessvoid.nifty.spi.input.InputSystem;
import java.util.ArrayList; import java.util.ArrayList;
public class InputSystemJme implements InputSystem, RawInputListener { public class InputSystemJme implements InputSystem, RawInputListener {
private final ArrayList<InputEvent> inputQueue = new ArrayList<InputEvent>(); private final ArrayList<InputEvent> inputQueue = new ArrayList<InputEvent>();
private InputManager inputManager; private InputManager inputManager;
private boolean isDragging = false, niftyOwnsDragging = false; private boolean isDragging = false, niftyOwnsDragging = false;
private boolean pressed = false; private boolean pressed = false;
private int buttonIndex; private int buttonIndex;
private int x, y; private int x, y;
private int height; private int height;
private boolean shiftDown = false; private boolean shiftDown = false;
private boolean ctrlDown = false; private boolean ctrlDown = false;
private Nifty nifty; private Nifty nifty;
public InputSystemJme(InputManager inputManager){ public InputSystemJme(InputManager inputManager){
this.inputManager = inputManager; this.inputManager = inputManager;
} }
public void setResourceLoader(NiftyResourceLoader niftyResourceLoader) { public void setResourceLoader(NiftyResourceLoader niftyResourceLoader) {
} }
public void setNifty(Nifty nifty) { public void setNifty(Nifty nifty) {
this.nifty = nifty; this.nifty = nifty;
} }
/** /**
* @param height The height of the viewport. Used to convert * @param height The height of the viewport. Used to convert
* buttom-left origin to upper-left origin. * buttom-left origin to upper-left origin.
*/ */
public void setHeight(int height){ public void setHeight(int height){
this.height = height; this.height = height;
} }
public void setMousePosition(int x, int y){ public void setMousePosition(int x, int y){
} }
public void beginInput(){ public void beginInput(){
} }
public void endInput(){ public void endInput(){
boolean result = nifty.update(); boolean result = nifty.update();
} }
private void onTouchEventQueued(TouchEvent evt, NiftyInputConsumer nic) { private void onTouchEventQueued(TouchEvent evt, NiftyInputConsumer nic) {
boolean consumed = false; boolean consumed = false;
x = (int) evt.getX(); x = (int) evt.getX();
y = (int) (height - evt.getY()); y = (int) (height - evt.getY());
switch (evt.getType()) { if (!inputManager.getSimulateMouse()) {
case DOWN: switch (evt.getType()) {
consumed = nic.processMouseEvent(x, y, 0, 0, false); case DOWN:
isDragging = true; consumed = nic.processMouseEvent(x, y, 0, 0, true);
niftyOwnsDragging = consumed; isDragging = true;
if (consumed){ niftyOwnsDragging = consumed;
evt.setConsumed(); if (consumed){
} evt.setConsumed();
}
break;
break;
case UP:
if (niftyOwnsDragging){ case UP:
consumed = nic.processMouseEvent(x, y, 0, buttonIndex, pressed); if (niftyOwnsDragging){
if (consumed){ consumed = nic.processMouseEvent(x, y, 0, 0, false);
evt.setConsumed(); if (consumed){
} evt.setConsumed();
} }
}
isDragging = false;
niftyOwnsDragging = false; isDragging = false;
break; niftyOwnsDragging = false;
} break;
} }
}
private void onMouseMotionEventQueued(MouseMotionEvent evt, NiftyInputConsumer nic) { }
x = evt.getX();
y = height - evt.getY(); private void onMouseMotionEventQueued(MouseMotionEvent evt, NiftyInputConsumer nic) {
nic.processMouseEvent(x, y, evt.getDeltaWheel(), buttonIndex, pressed); x = evt.getX();
// if (nic.processMouseEvent(niftyEvt) /*|| nifty.getCurrentScreen().isMouseOverElement()*/){ y = height - evt.getY();
// Do not consume motion events nic.processMouseEvent(x, y, evt.getDeltaWheel(), buttonIndex, pressed);
//evt.setConsumed(); // if (nic.processMouseEvent(niftyEvt) /*|| nifty.getCurrentScreen().isMouseOverElement()*/){
// } // Do not consume motion events
} //evt.setConsumed();
// }
private void onMouseButtonEventQueued(MouseButtonEvent evt, NiftyInputConsumer nic) { }
boolean wasPressed = pressed;
boolean forwardToNifty = true; private void onMouseButtonEventQueued(MouseButtonEvent evt, NiftyInputConsumer nic) {
boolean wasPressed = pressed;
buttonIndex = evt.getButtonIndex(); boolean forwardToNifty = true;
pressed = evt.isPressed();
buttonIndex = evt.getButtonIndex();
// Mouse button raised. End dragging pressed = evt.isPressed();
if (wasPressed && !pressed){
if (!niftyOwnsDragging){ // Mouse button raised. End dragging
forwardToNifty = false; if (wasPressed && !pressed){
} if (!niftyOwnsDragging){
isDragging = false; forwardToNifty = false;
niftyOwnsDragging = false; }
} isDragging = false;
niftyOwnsDragging = false;
boolean consumed = false; }
if (forwardToNifty){
consumed = nic.processMouseEvent(x, y, 0, buttonIndex, pressed); boolean consumed = false;
if (consumed){ if (forwardToNifty){
evt.setConsumed(); consumed = nic.processMouseEvent(x, y, 0, buttonIndex, pressed);
} if (consumed){
} evt.setConsumed();
}
// Mouse button pressed. Begin dragging }
if (!wasPressed && pressed){
isDragging = true; // Mouse button pressed. Begin dragging
niftyOwnsDragging = consumed; if (!wasPressed && pressed){
} isDragging = true;
} niftyOwnsDragging = consumed;
}
private void onKeyEventQueued(KeyInputEvent evt, NiftyInputConsumer nic) { }
int code = evt.getKeyCode();
private void onKeyEventQueued(KeyInputEvent evt, NiftyInputConsumer nic) {
if (code == KeyInput.KEY_LSHIFT || code == KeyInput.KEY_RSHIFT) { int code = evt.getKeyCode();
shiftDown = evt.isPressed();
} else if (code == KeyInput.KEY_LCONTROL || code == KeyInput.KEY_RCONTROL) { if (code == KeyInput.KEY_LSHIFT || code == KeyInput.KEY_RSHIFT) {
ctrlDown = evt.isPressed(); shiftDown = evt.isPressed();
} } else if (code == KeyInput.KEY_LCONTROL || code == KeyInput.KEY_RCONTROL) {
ctrlDown = evt.isPressed();
KeyboardInputEvent keyEvt = new KeyboardInputEvent(code, }
evt.getKeyChar(),
evt.isPressed(), KeyboardInputEvent keyEvt = new KeyboardInputEvent(code,
shiftDown, evt.getKeyChar(),
ctrlDown); evt.isPressed(),
shiftDown,
if (nic.processKeyboardEvent(keyEvt)){ ctrlDown);
evt.setConsumed();
} if (nic.processKeyboardEvent(keyEvt)){
} evt.setConsumed();
}
public void onMouseMotionEvent(MouseMotionEvent evt) { }
// Only forward the event if there's actual motion involved.
if (inputManager.isCursorVisible() && (evt.getDX() != 0 || public void onMouseMotionEvent(MouseMotionEvent evt) {
evt.getDY() != 0 || // Only forward the event if there's actual motion involved.
evt.getDeltaWheel() != 0)){ if (inputManager.isCursorVisible() && (evt.getDX() != 0 ||
inputQueue.add(evt); evt.getDY() != 0 ||
} evt.getDeltaWheel() != 0)){
} inputQueue.add(evt);
}
public void onMouseButtonEvent(MouseButtonEvent evt) { }
if (inputManager.isCursorVisible() && evt.getButtonIndex() >= 0 && evt.getButtonIndex() <= 2){
inputQueue.add(evt); public void onMouseButtonEvent(MouseButtonEvent evt) {
} if (inputManager.isCursorVisible() && evt.getButtonIndex() >= 0 && evt.getButtonIndex() <= 2){
} inputQueue.add(evt);
}
public void onJoyAxisEvent(JoyAxisEvent evt) { }
}
public void onJoyAxisEvent(JoyAxisEvent evt) {
public void onJoyButtonEvent(JoyButtonEvent evt) { }
}
public void onJoyButtonEvent(JoyButtonEvent evt) {
public void onKeyEvent(KeyInputEvent evt) { }
inputQueue.add(evt);
} public void onKeyEvent(KeyInputEvent evt) {
inputQueue.add(evt);
public void onTouchEvent(TouchEvent evt) { }
inputQueue.add(evt);
} public void onTouchEvent(TouchEvent evt) {
inputQueue.add(evt);
public void forwardEvents(NiftyInputConsumer nic) { }
int queueSize = inputQueue.size();
public void forwardEvents(NiftyInputConsumer nic) {
for (int i = 0; i < queueSize; i++){ int queueSize = inputQueue.size();
InputEvent evt = inputQueue.get(i);
if (evt instanceof MouseMotionEvent){ for (int i = 0; i < queueSize; i++){
onMouseMotionEventQueued( (MouseMotionEvent)evt, nic); InputEvent evt = inputQueue.get(i);
}else if (evt instanceof MouseButtonEvent){ if (evt instanceof MouseMotionEvent){
onMouseButtonEventQueued( (MouseButtonEvent)evt, nic); onMouseMotionEventQueued( (MouseMotionEvent)evt, nic);
}else if (evt instanceof KeyInputEvent){ }else if (evt instanceof MouseButtonEvent){
onKeyEventQueued( (KeyInputEvent)evt, nic); onMouseButtonEventQueued( (MouseButtonEvent)evt, nic);
}else if (evt instanceof TouchEvent){ }else if (evt instanceof KeyInputEvent){
onTouchEventQueued( (TouchEvent)evt, nic); onKeyEventQueued( (KeyInputEvent)evt, nic);
} }else if (evt instanceof TouchEvent){
} onTouchEventQueued( (TouchEvent)evt, nic);
}
inputQueue.clear(); }
}
inputQueue.clear();
}
}
}