From a697b6efa4e16a9a0e18a0befe1769e653d61dd2 Mon Sep 17 00:00:00 2001 From: "kim..ng" Date: Sat, 4 Jun 2011 20:33:55 +0000 Subject: [PATCH] Android: getTouchInput() interface add git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7549 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../com/jme3/system/lwjgl/LwjglAbstractDisplay.java | 7 ++++++- .../src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java | 1 - .../src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglDisplay.java | 1 + .../com/jme3/system/lwjgl/LwjglOffscreenBuffer.java | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglAbstractDisplay.java b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglAbstractDisplay.java index c84f9cd7f..9087db2c4 100644 --- a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglAbstractDisplay.java +++ b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglAbstractDisplay.java @@ -35,6 +35,7 @@ package com.jme3.system.lwjgl; import com.jme3.input.JoyInput; import com.jme3.input.KeyInput; import com.jme3.input.MouseInput; +import com.jme3.input.TouchInput; import com.jme3.input.lwjgl.JInputJoyInput; import com.jme3.input.lwjgl.LwjglKeyInput; import com.jme3.input.lwjgl.LwjglMouseInput; @@ -242,7 +243,11 @@ public abstract class LwjglAbstractDisplay extends LwjglContext implements Runna } return keyInput; } - + + public TouchInput getTouchInput() { + return null; + } + public void setAutoFlushFrames(boolean enabled){ this.autoFlush = enabled; } diff --git a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java index 18376abf5..7af5c4d8a 100644 --- a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java +++ b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java @@ -366,5 +366,4 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex // TODO: Fix deadlock that happens after the error (throw runtime exception?) } } - } diff --git a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglDisplay.java b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglDisplay.java index c906b3abd..523b30073 100644 --- a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglDisplay.java +++ b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglDisplay.java @@ -32,6 +32,7 @@ package com.jme3.system.lwjgl; +import com.jme3.input.TouchInput; import com.jme3.system.JmeContext.Type; import org.lwjgl.LWJGLException; import org.lwjgl.opengl.Display; diff --git a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java index b9bb69468..14228ce69 100644 --- a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java +++ b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java @@ -35,6 +35,7 @@ package com.jme3.system.lwjgl; import com.jme3.input.JoyInput; import com.jme3.input.KeyInput; import com.jme3.input.MouseInput; +import com.jme3.input.TouchInput; import com.jme3.input.dummy.DummyKeyInput; import com.jme3.input.dummy.DummyMouseInput; import java.util.concurrent.atomic.AtomicBoolean; @@ -196,6 +197,10 @@ public class LwjglOffscreenBuffer extends LwjglContext implements Runnable { public JoyInput getJoyInput() { return null; } + + public TouchInput getTouchInput() { + return null; + } public void setTitle(String title) { }