Mercurial > sdl-ios-xcode

diff android/testproject/jni/app-android.cpp @ 4722:faa228f7ce5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Cleaned up a bunch of code - Added 'feature' enable/disable so we're not running accel/sound/whatever in Java when we don't need to be - More work on the sound system. But it still crashes pretty horribly, not sure why yet.
author Paul Hunkin <paul@bieh.net>
date Tue, 27 Jul 2010 21:21:24 +0200
parents f2c2a33a1a38
children 74da47b2f5b7
line wrap: on
line diff
--- a/android/testproject/jni/app-android.cpp	Tue Jul 27 21:20:17 2010 +0200
+++ b/android/testproject/jni/app-android.cpp	Tue Jul 27 21:21:24 2010 +0200
@@ -34,6 +34,7 @@
 //method signatures
 jmethodID midCreateGLContext;
 jmethodID midFlipBuffers;
+jmethodID midEnableFeature;
 
 extern "C" int SDL_main();
 extern "C" int Android_OnKeyDown(int keycode);
@@ -41,10 +42,18 @@
 extern "C" void Android_SetScreenResolution(int width, int height);
 extern "C" void Android_OnResize(int width, int height, int format);
 extern "C" int SDL_SendQuit();
+extern "C" void Android_EnableFeature(int featureid, bool enabled);
 
 //If we're not the active app, don't try to render
 bool bRenderingEnabled = false;
 
+//Feature IDs
+static const int FEATURE_SOUND = 1;
+static const int FEATURE_ACCEL = 2;
+
+//Accelerometer data storage
+float fLastAccelerometer[3];
+
 /*******************************************************************************
                  Functions called by JNI
 *******************************************************************************/	
@@ -67,8 +76,9 @@
     mActivityInstance = cls;
     midCreateGLContext = mEnv->GetStaticMethodID(cls,"createGLContext","()V");
     midFlipBuffers = mEnv->GetStaticMethodID(cls,"flipBuffers","()V");
+    midEnableFeature = mEnv->GetStaticMethodID(cls,"enableFeature","(I, I)V");
 
-    if(!midCreateGLContext || !midFlipBuffers){
+    if(!midCreateGLContext || !midFlipBuffers || !midEnableFeature){
         __android_log_print(ANDROID_LOG_INFO, "SDL", "SDL: Bad mids\n");
     }else{
         __android_log_print(ANDROID_LOG_INFO, "SDL", "SDL: Good mids\n");
@@ -84,8 +94,9 @@
 	__android_log_print(ANDROID_LOG_INFO, "SDL", "SDL: Native Init");
 
 	mEnv = env;
+	bRenderingEnabled = true;
 
-	bRenderingEnabled = true;
+	Android_EnableFeature(FEATURE_ACCEL, true);
 
     SDL_main();
 }
@@ -152,12 +163,20 @@
     Android_OnResize(width, height, format);
 }
 
+extern "C" void Java_org_libsdl_android_SDLActivity_onNativeAccel(
+                                        JNIEnv*  env, jobject obj,
+                                        jfloat x, jfloat y, jfloat z){
+    fLastAccelerometer[0] = x;
+    fLastAccelerometer[1] = y;
+    fLastAccelerometer[2] = z;   
+}
+
 
 
 /*******************************************************************************
-                 Functions called by SDL
+             Functions called by SDL into Java
 *******************************************************************************/
-extern "C" void sdl_create_context(){
+extern "C" void Android_CreateContext(){
 	__android_log_print(ANDROID_LOG_INFO, "SDL", "SDL: sdl_create_context()\n");
 
 	bRenderingEnabled = true;
@@ -165,7 +184,7 @@
     mEnv->CallStaticVoidMethod(mActivityInstance, midCreateGLContext ); 
 }
 
-extern "C" void sdl_render(){
+extern "C" void Android_Render(){
 
     if(!bRenderingEnabled){
         return;
@@ -175,3 +194,9 @@
     mEnv->CallStaticVoidMethod(mActivityInstance, midFlipBuffers ); 
 }
 
+extern "C" void Android_EnableFeature(int featureid, bool enabled){
+
+    mEnv->CallStaticVoidMethod(mActivityInstance, midFlipBuffers, 
+                                featureid, (int)enabled); 
+}
+