Changeset 1944Tweet

Timestamp:

Sep 23, 2012, 5:35:24 PM (6 years ago)

Author:

sam

Message:

android: fix a synchronisation issue between Java and the game thread.

File:

• trunk/src/platform/android/androidapp.cpp (modified) (5 diffs)

trunk/src/platform/android/androidapp.cpp

@@ -36 +36 @@
 JavaVM *g_vm;
 jobject g_activity;
+Queue<int> g_main_queue;
 Thread *g_main_thread;
 
-AndroidApp::AndroidApp(char const *title, ivec2 res, float fps) :
-    data(0)
+AndroidApp::AndroidApp(char const *title, ivec2 res, float fps)
+  : data(0)
 {
 }
@@ -47 +48 @@
 }
 
+/* This is a fake Run() method. We just wait until we're called and
+ * signal nativeInit() that all the user's initialisation code was
+ * called. Then we sit here forever, the Java layer is in charge of
+ * calling TickDraw(). */
 void AndroidApp::Run()
 {
+    g_main_queue.Push(1);
+
     while (!Ticker::Finished())
     {
-        /* Tick the renderer, show the frame and clamp to desired framerate. */
-        Ticker::TickDraw();
+        /* Do nothing while the real render thread does the job. The
+         * real stuff happens in nativeRender() */
+        Timer t;
+        t.Wait(0.5f);
     }
 }
@@ -86 +95 @@
 Java_org_zoy_LolEngine_LolActivity_nativeInit(JNIEnv* env, jobject thiz)
 {
+    Log::Info("Java layer initialising activity");
     env->NewGlobalRef(thiz); /* FIXME: never released! */
     g_activity = thiz;
@@ -93 +103 @@
 Java_org_zoy_LolEngine_LolRenderer_nativeInit(JNIEnv* env)
 {
-    Log::Info("initialising renderer");
+    Log::Info("Java layer initialising renderer");
     Ticker::Setup(30.0f);
     Video::Setup(ivec2(320, 200));
 
     g_main_thread = new Thread(lol::AndroidApp::MainRun, NULL);;
+    g_main_queue.Pop();
 }
 
@@ -104 +115 @@
                                                 jint w, jint h)
 {
-    Log::Info("resizing to %i x %i", w, h);
+    Log::Info("Java layer resizing to %i x %i", w, h);
     Video::Setup(ivec2(w, h));
 }