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

* Android renderer now supports configuration changes (see: http://jmonkeyengine.org/groups/android/forum/topic/supporting-device-configuration-changes/#post-181170)

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9543 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Sha..rd 2012-07-10 03:46:44 +00:00
parent 5d982c71d1
commit cc3577acdc
4 changed files with 159 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
engine/src/android/com/jme3/app/AndroidHarness.java
View File

@ -137,6 +137,25 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
protected FrameLayout frameLayout = null; protected FrameLayout frameLayout = null;
final private String ESCAPE_EVENT = "TouchEscape"; final private String ESCAPE_EVENT = "TouchEscape";
private boolean firstDrawFrame = true; private boolean firstDrawFrame = true;
private boolean inConfigChange = false;
private class DataObject {
protected Application app = null;
}
@Override
public Object onRetainNonConfigurationInstance() {
logger.log(Level.INFO, "onRetainNonConfigurationInstance called");
final DataObject data = new DataObject();
data.app = this.app;
inConfigChange = true;
logger.log(Level.INFO, "app: {0}", app.hashCode());
logger.log(Level.INFO, "ctx: {0}", ctx.hashCode());
logger.log(Level.INFO, "view: {0}", view.hashCode());
logger.log(Level.INFO, "isGLThreadPaused: {0}", isGLThreadPaused);
logger.log(Level.INFO, "inConfigChange: {0}", inConfigChange);
return data;
}
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -155,6 +174,22 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
setRequestedOrientation(screenOrientation); setRequestedOrientation(screenOrientation);
final DataObject data = (DataObject) getLastNonConfigurationInstance();
if (data != null) {
logger.log(Level.INFO, "onCreate: onRetainNonConfigurationInstance is not null");
this.app = data.app;
ctx = (OGLESContext) app.getContext();
view = ctx.createView(eglConfigType, eglConfigVerboseLogging);
ctx.setSystemListener(this);
layoutDisplay();
logger.log(Level.INFO, "app: {0}", app.hashCode());
logger.log(Level.INFO, "ctx: {0}", ctx.hashCode());
logger.log(Level.INFO, "view: {0}", view.hashCode());
} else {
logger.log(Level.INFO, "onCreate: onRetainNonConfigurationInstance is null");
// Create Settings // Create Settings
AppSettings settings = new AppSettings(true); AppSettings settings = new AppSettings(true);
settings.setEmulateMouse(mouseEventsEnabled); settings.setEmulateMouse(mouseEventsEnabled);
@ -188,6 +223,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
setContentView(new TextView(this)); setContentView(new TextView(this));
} }
} }
}
@Override @Override
protected void onRestart() { protected void onRestart() {
@ -258,9 +294,14 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
@Override @Override
protected void onDestroy() { protected void onDestroy() {
final DataObject data = (DataObject) getLastNonConfigurationInstance();
if (data != null || inConfigChange) {
logger.info("onDestroy: found DataObject or inConfigChange");
} else {
if (app != null) { if (app != null) {
app.stop(!isGLThreadPaused); app.stop(!isGLThreadPaused);
} }
}
logger.info("onDestroy"); logger.info("onDestroy");
super.onDestroy(); super.onDestroy();
} }
@ -293,7 +334,6 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
logger.log(Level.SEVERE, finalMsg); logger.log(Level.SEVERE, finalMsg);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
AlertDialog dialog = new AlertDialog.Builder(AndroidHarness.this) // .setIcon(R.drawable.alert_dialog_icon) AlertDialog dialog = new AlertDialog.Builder(AndroidHarness.this) // .setIcon(R.drawable.alert_dialog_icon)
@ -362,7 +402,14 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
splashImageView.setImageResource(splashPicID); splashImageView.setImageResource(splashPicID);
} }
if (view.getParent() != null) {
((ViewGroup)view.getParent()).removeView(view);
}
frameLayout.addView(view); frameLayout.addView(view);
if (splashImageView.getParent() != null) {
((ViewGroup)splashImageView.getParent()).removeView(splashImageView);
}
frameLayout.addView(splashImageView, lp); frameLayout.addView(splashImageView, lp);
setContentView(frameLayout); setContentView(frameLayout);

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

@ -1,12 +1,6 @@
package com.jme3.input.android; package com.jme3.input.android;
import android.content.Context; import android.view.*;
import android.opengl.GLSurfaceView;
import android.util.AttributeSet;
import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.ScaleGestureDetector;
import com.jme3.input.KeyInput; import com.jme3.input.KeyInput;
import com.jme3.input.RawInputListener; import com.jme3.input.RawInputListener;
import com.jme3.input.TouchInput; import com.jme3.input.TouchInput;
@ -25,8 +19,10 @@ import java.util.logging.Logger;
* @author larynx * @author larynx
* *
*/ */
public class AndroidInput extends GLSurfaceView implements public class AndroidInput implements
TouchInput, TouchInput,
View.OnTouchListener,
View.OnKeyListener,
GestureDetector.OnGestureListener, GestureDetector.OnGestureListener,
GestureDetector.OnDoubleTapListener, GestureDetector.OnDoubleTapListener,
ScaleGestureDetector.OnScaleGestureListener { ScaleGestureDetector.OnScaleGestureListener {
@ -44,6 +40,7 @@ public class AndroidInput extends GLSurfaceView implements
final private RingBuffer<TouchEvent> eventPool = new RingBuffer<TouchEvent>(MAX_EVENTS); final private RingBuffer<TouchEvent> eventPool = new RingBuffer<TouchEvent>(MAX_EVENTS);
final private HashMap<Integer, Vector2f> lastPositions = new HashMap<Integer, Vector2f>(); final private HashMap<Integer, Vector2f> lastPositions = new HashMap<Integer, Vector2f>();
// Internal // Internal
private View view;
private ScaleGestureDetector scaledetector; private ScaleGestureDetector scaledetector;
private GestureDetector detector; private GestureDetector detector;
private int lastX; private int lastX;
@ -149,17 +146,16 @@ public class AndroidInput extends GLSurfaceView implements
0x0,//mute 0x0,//mute
}; };
public AndroidInput(Context ctx, AttributeSet attribs) { public AndroidInput(View view) {
super(ctx, attribs); setView(view);
detector = new GestureDetector(null, this, null, false); detector = new GestureDetector(null, this, null, false);
scaledetector = new ScaleGestureDetector(ctx, this); scaledetector = new ScaleGestureDetector(view.getContext(), this);
} }
public AndroidInput(Context ctx) { public void setView(View view) {
super(ctx); this.view = view;
detector = new GestureDetector(null, this, null, false); this.view.setOnTouchListener(this);
scaledetector = new ScaleGestureDetector(ctx, this); this.view.setOnKeyListener(this);
} }
private TouchEvent getNextFreeTouchEvent() { private TouchEvent getNextFreeTouchEvent() {
@ -218,10 +214,12 @@ public class AndroidInput extends GLSurfaceView implements
} }
/** /**
* onTouchEvent gets called from android thread on touchpad events * onTouch gets called from android thread on touchpad events
*/ */
@Override public boolean onTouch(View view, MotionEvent event) {
public boolean onTouchEvent(MotionEvent event) { if (view != this.view) {
return false;
}
boolean bWasHandled = false; boolean bWasHandled = false;
TouchEvent touch; TouchEvent touch;
// System.out.println("native : " + event.getAction()); // System.out.println("native : " + event.getAction());
@ -236,7 +234,7 @@ public class AndroidInput extends GLSurfaceView implements
case MotionEvent.ACTION_POINTER_DOWN: case MotionEvent.ACTION_POINTER_DOWN:
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
touch = getNextFreeTouchEvent(); touch = getNextFreeTouchEvent();
touch.set(Type.DOWN, event.getX(pointerIndex), this.getHeight() - event.getY(pointerIndex), 0, 0); touch.set(Type.DOWN, event.getX(pointerIndex), view.getHeight() - event.getY(pointerIndex), 0, 0);
touch.setPointerId(pointerId); touch.setPointerId(pointerId);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
touch.setPressure(event.getPressure(pointerIndex)); touch.setPressure(event.getPressure(pointerIndex));
@ -248,7 +246,7 @@ public class AndroidInput extends GLSurfaceView implements
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
touch = getNextFreeTouchEvent(); touch = getNextFreeTouchEvent();
touch.set(Type.UP, event.getX(pointerIndex), this.getHeight() - event.getY(pointerIndex), 0, 0); touch.set(Type.UP, event.getX(pointerIndex), view.getHeight() - event.getY(pointerIndex), 0, 0);
touch.setPointerId(pointerId); touch.setPointerId(pointerId);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
touch.setPressure(event.getPressure(pointerIndex)); touch.setPressure(event.getPressure(pointerIndex));
@ -261,16 +259,16 @@ public class AndroidInput extends GLSurfaceView implements
for (int p = 0; p < event.getPointerCount(); p++) { for (int p = 0; p < event.getPointerCount(); p++) {
Vector2f lastPos = lastPositions.get(p); Vector2f lastPos = lastPositions.get(p);
if (lastPos == null) { if (lastPos == null) {
lastPos = new Vector2f(event.getX(p), this.getHeight() - event.getY(p)); lastPos = new Vector2f(event.getX(p), view.getHeight() - event.getY(p));
lastPositions.put(event.getPointerId(p), lastPos); lastPositions.put(event.getPointerId(p), lastPos);
} }
touch = getNextFreeTouchEvent(); touch = getNextFreeTouchEvent();
touch.set(Type.MOVE, event.getX(p), this.getHeight() - event.getY(p), event.getX(p) - lastPos.x, this.getHeight() - event.getY(p) - lastPos.y); touch.set(Type.MOVE, event.getX(p), view.getHeight() - event.getY(p), event.getX(p) - lastPos.x, view.getHeight() - event.getY(p) - lastPos.y);
touch.setPointerId(event.getPointerId(p)); touch.setPointerId(event.getPointerId(p));
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
touch.setPressure(event.getPressure(p)); touch.setPressure(event.getPressure(p));
processEvent(touch); processEvent(touch);
lastPos.set(event.getX(p), this.getHeight() - event.getY(p)); lastPos.set(event.getX(p), view.getHeight() - event.getY(p));
} }
bWasHandled = true; bWasHandled = true;
break; break;
@ -286,8 +284,15 @@ public class AndroidInput extends GLSurfaceView implements
return bWasHandled; return bWasHandled;
} }
@Override /**
public boolean onKeyDown(int keyCode, KeyEvent event) { * onKey gets called from android thread on key events
*/
public boolean onKey(View view, int keyCode, KeyEvent event) {
if (view != this.view) {
return false;
}
if (event.getAction() == KeyEvent.ACTION_DOWN) {
TouchEvent evt; TouchEvent evt;
evt = getNextFreeTouchEvent(); evt = getNextFreeTouchEvent();
evt.set(TouchEvent.Type.KEY_DOWN); evt.set(TouchEvent.Type.KEY_DOWN);
@ -304,10 +309,7 @@ public class AndroidInput extends GLSurfaceView implements
} else { } else {
return true; return true;
} }
} } else if (event.getAction() == KeyEvent.ACTION_UP) {
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
TouchEvent evt; TouchEvent evt;
evt = getNextFreeTouchEvent(); evt = getNextFreeTouchEvent();
evt.set(TouchEvent.Type.KEY_UP); evt.set(TouchEvent.Type.KEY_UP);
@ -324,6 +326,9 @@ public class AndroidInput extends GLSurfaceView implements
} else { } else {
return true; return true;
} }
} else {
return false;
}
} }
public void loadSettings(AppSettings settings) { public void loadSettings(AppSettings settings) {
@ -401,13 +406,13 @@ public class AndroidInput extends GLSurfaceView implements
if (mouseEventsEnabled) { if (mouseEventsEnabled) {
if (mouseEventsInvertX) { if (mouseEventsInvertX) {
newX = this.getWidth() - (int) event.getX(); newX = view.getWidth() - (int) event.getX();
} else { } else {
newX = (int) event.getX(); newX = (int) event.getX();
} }
if (mouseEventsInvertY) { if (mouseEventsInvertY) {
newY = this.getHeight() - (int) event.getY(); newY = view.getHeight() - (int) event.getY();
} else { } else {
newY = (int) event.getY(); newY = (int) event.getY();
} }
@ -476,7 +481,7 @@ public class AndroidInput extends GLSurfaceView implements
public void onLongPress(MotionEvent event) { public void onLongPress(MotionEvent event) {
TouchEvent touch = getNextFreeTouchEvent(); TouchEvent touch = getNextFreeTouchEvent();
touch.set(Type.LONGPRESSED, event.getX(), this.getHeight() - event.getY(), 0f, 0f); touch.set(Type.LONGPRESSED, event.getX(), view.getHeight() - event.getY(), 0f, 0f);
touch.setPointerId(0); touch.setPointerId(0);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
processEvent(touch); processEvent(touch);
@ -484,7 +489,7 @@ public class AndroidInput extends GLSurfaceView implements
public boolean onFling(MotionEvent event, MotionEvent event2, float vx, float vy) { public boolean onFling(MotionEvent event, MotionEvent event2, float vx, float vy) {
TouchEvent touch = getNextFreeTouchEvent(); TouchEvent touch = getNextFreeTouchEvent();
touch.set(Type.FLING, event.getX(), this.getHeight() - event.getY(), vx, vy); touch.set(Type.FLING, event.getX(), view.getHeight() - event.getY(), vx, vy);
touch.setPointerId(0); touch.setPointerId(0);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
processEvent(touch); processEvent(touch);
@ -499,7 +504,7 @@ public class AndroidInput extends GLSurfaceView implements
public boolean onDoubleTap(MotionEvent event) { public boolean onDoubleTap(MotionEvent event) {
TouchEvent touch = getNextFreeTouchEvent(); TouchEvent touch = getNextFreeTouchEvent();
touch.set(Type.DOUBLETAP, event.getX(), this.getHeight() - event.getY(), 0f, 0f); touch.set(Type.DOUBLETAP, event.getX(), view.getHeight() - event.getY(), 0f, 0f);
touch.setPointerId(0); touch.setPointerId(0);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
processEvent(touch); processEvent(touch);
@ -525,7 +530,7 @@ public class AndroidInput extends GLSurfaceView implements
public boolean onScale(ScaleGestureDetector scaleGestureDetector) { public boolean onScale(ScaleGestureDetector scaleGestureDetector) {
TouchEvent touch = getNextFreeTouchEvent(); TouchEvent touch = getNextFreeTouchEvent();
touch.set(Type.SCALE_MOVE, scaleGestureDetector.getFocusX(), this.getHeight() - scaleGestureDetector.getFocusY(), 0f, 0f); touch.set(Type.SCALE_MOVE, scaleGestureDetector.getFocusX(), view.getHeight() - scaleGestureDetector.getFocusY(), 0f, 0f);
touch.setPointerId(0); touch.setPointerId(0);
touch.setTime(scaleGestureDetector.getEventTime()); touch.setTime(scaleGestureDetector.getEventTime());
touch.setScaleSpan(scaleGestureDetector.getCurrentSpan()); touch.setScaleSpan(scaleGestureDetector.getCurrentSpan());
@ -538,7 +543,7 @@ public class AndroidInput extends GLSurfaceView implements
public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) { public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) {
TouchEvent touch = getNextFreeTouchEvent(); TouchEvent touch = getNextFreeTouchEvent();
touch.set(Type.SCALE_END, scaleGestureDetector.getFocusX(), this.getHeight() - scaleGestureDetector.getFocusY(), 0f, 0f); touch.set(Type.SCALE_END, scaleGestureDetector.getFocusX(), view.getHeight() - scaleGestureDetector.getFocusY(), 0f, 0f);
touch.setPointerId(0); touch.setPointerId(0);
touch.setTime(scaleGestureDetector.getEventTime()); touch.setTime(scaleGestureDetector.getEventTime());
touch.setScaleSpan(scaleGestureDetector.getCurrentSpan()); touch.setScaleSpan(scaleGestureDetector.getCurrentSpan());
@ -548,7 +553,7 @@ public class AndroidInput extends GLSurfaceView implements
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
TouchEvent touch = getNextFreeTouchEvent(); TouchEvent touch = getNextFreeTouchEvent();
touch.set(Type.SCROLL, e1.getX(), this.getHeight() - e1.getY(), distanceX, distanceY * (-1)); touch.set(Type.SCROLL, e1.getX(), view.getHeight() - e1.getY(), distanceX, distanceY * (-1));
touch.setPointerId(0); touch.setPointerId(0);
touch.setTime(e1.getEventTime()); touch.setTime(e1.getEventTime());
processEvent(touch); processEvent(touch);
@ -558,7 +563,7 @@ public class AndroidInput extends GLSurfaceView implements
public void onShowPress(MotionEvent event) { public void onShowPress(MotionEvent event) {
TouchEvent touch = getNextFreeTouchEvent(); TouchEvent touch = getNextFreeTouchEvent();
touch.set(Type.SHOWPRESS, event.getX(), this.getHeight() - event.getY(), 0f, 0f); touch.set(Type.SHOWPRESS, event.getX(), view.getHeight() - event.getY(), 0f, 0f);
touch.setPointerId(0); touch.setPointerId(0);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
processEvent(touch); processEvent(touch);
@ -566,7 +571,7 @@ public class AndroidInput extends GLSurfaceView implements
public boolean onSingleTapUp(MotionEvent event) { public boolean onSingleTapUp(MotionEvent event) {
TouchEvent touch = getNextFreeTouchEvent(); TouchEvent touch = getNextFreeTouchEvent();
touch.set(Type.TAP, event.getX(), this.getHeight() - event.getY(), 0f, 0f); touch.set(Type.TAP, event.getX(), view.getHeight() - event.getY(), 0f, 0f);
touch.setPointerId(0); touch.setPointerId(0);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
processEvent(touch); processEvent(touch);
@ -623,4 +628,5 @@ public class AndroidInput extends GLSurfaceView implements
public boolean isSimulateMouse() { public boolean isSimulateMouse() {
return mouseEventsEnabled; return mouseEventsEnabled;
} }
} }

26
engine/src/android/com/jme3/renderer/android/AndroidGLSurfaceView.java Normal file
View File

@ -0,0 +1,26 @@
package com.jme3.renderer.android;
import android.content.Context;
import android.opengl.GLSurfaceView;
import android.util.AttributeSet;
import java.util.logging.Logger;
/**
* <code>AndroidGLSurfaceView</code> is derived from GLSurfaceView
* @author iwgeric
*
*/
public class AndroidGLSurfaceView extends GLSurfaceView {
private final static Logger logger = Logger.getLogger(AndroidGLSurfaceView.class.getName());
public AndroidGLSurfaceView(Context ctx, AttributeSet attribs) {
super(ctx, attribs);
}
public AndroidGLSurfaceView(Context ctx) {
super(ctx);
}
}

16
engine/src/android/com/jme3/system/android/OGLESContext.java
View File

@ -31,9 +31,10 @@
*/ */
package com.jme3.system.android; package com.jme3.system.android;
import com.jme3.renderer.android.AndroidGLSurfaceView;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.graphics.PixelFormat;
import android.opengl.GLSurfaceView; import android.opengl.GLSurfaceView;
import android.text.InputType; import android.text.InputType;
import android.view.Gravity; import android.view.Gravity;
@ -73,7 +74,8 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
protected Timer timer; protected Timer timer;
protected SystemListener listener; protected SystemListener listener;
protected boolean autoFlush = true; protected boolean autoFlush = true;
protected AndroidInput view; protected AndroidInput androidInput;
protected AndroidGLSurfaceView view;
protected int minFrameDuration = 0; // No FPS cap protected int minFrameDuration = 0; // No FPS cap
/** /**
* EGL_RENDERABLE_TYPE: EGL_OPENGL_ES_BIT = OpenGL ES 1.0 | * EGL_RENDERABLE_TYPE: EGL_OPENGL_ES_BIT = OpenGL ES 1.0 |
@ -105,9 +107,13 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
* @return GLSurfaceView The newly created view * @return GLSurfaceView The newly created view
*/ */
public GLSurfaceView createView(ConfigType configType, boolean eglConfigVerboseLogging) { public GLSurfaceView createView(ConfigType configType, boolean eglConfigVerboseLogging) {
// Start to set up the view // Start to set up the view
this.view = new AndroidInput(JmeAndroidSystem.getActivity()); view = new AndroidGLSurfaceView(JmeAndroidSystem.getActivity());
if (androidInput == null) {
androidInput = new AndroidInput(view);
} else {
androidInput.setView(view);
}
if (configType == ConfigType.LEGACY) { if (configType == ConfigType.LEGACY) {
// Hardcoded egl setup // Hardcoded egl setup
clientOpenGLESVersion = 2; clientOpenGLESVersion = 2;
@ -268,7 +274,7 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer, SoftTex
@Override @Override
public TouchInput getTouchInput() { public TouchInput getTouchInput() {
return view; return androidInput;
} }
@Override @Override