Changeset 1964 for trunk/src/platformTweet

Timestamp:

Oct 2, 2012, 10:35:20 AM (10 years ago)

Author:

sam

Message:

android: use the FPS value provided by the application; we now run at
60 fps on Android devices, too.

Location:

trunk/src/platform/android

Files:

• androidapp.cpp (modified) (4 diffs)
• androidapp.h (modified) (1 diff)

trunk/src/platform/android/androidapp.cpp

@@ -35 +35 @@
 Queue<int> g_main_queue;
 Thread *g_main_thread;
+float g_fps;
 
 AndroidApp::AndroidApp(char const *title, ivec2 res, float fps)
-  : data(0)
+  : m_data(0)
 {
+    g_fps = fps;
 }
 
@@ -51 +53 @@
 void AndroidApp::Run()
 {
+    g_main_queue.Push(1);
     g_main_queue.Push(1);
 
@@ -101 +104 @@
 Java_org_zoy_LolEngine_LolRenderer_nativeInit(JNIEnv* env)
 {
-    Log::Info("Java layer initialising renderer");
-    Ticker::Setup(30.0f);
+    /* Initialise app thread and wait for it to be ready, ie. set
+     * the FPS value at least. */
+    g_main_thread = new Thread(lol::AndroidApp::MainRun, NULL);;
+    g_main_queue.Pop();
+
+    /* Launch our ticker */
+    Log::Info("Java layer initialising renderer at %g fps", g_fps);
+    Ticker::Setup(g_fps);
     Video::Setup(ivec2(320, 200));
 
-    g_main_thread = new Thread(lol::AndroidApp::MainRun, NULL);;
+    /* Wake up app thread */
     g_main_queue.Pop();
 }
@@ -146 +155 @@
                                           jint x, jint y)
 {
-    ivec2 pos = ivec2(0, 479) + ivec2(x * 640, -y * 480) / Video::GetSize();
-    Input::SetMousePos(pos);
+    Input::SetMousePos(ivec2(x, y));
 }
 

trunk/src/platform/android/androidapp.h

@@ -36 +36 @@
 
 private:
-    AndroidAppData *data;
+    AndroidAppData *m_data;
 };