Fewer errors, LoomDemo.java still needs lots of fixes, the fixes I ma…

…de for others might not be lasting.

.gitignore

@@ -100,3 +100,5 @@ loom/vendor/luajit/libluajit64.a
 loom/vendor/luajit/libluajit32.a
 output
 gems
+loom/engine/SDL2/platform/android/java/bin/
+loom/engine/SDL2/platform/android/java/gen/

application/android/src/co/theengine/loomdemo/LoomAdMob.java

@@ -11,8 +11,6 @@
 
 import com.google.ads.*;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 /**
  *  Java class that manages Admob instances. This maps directly to the platformAdMob C API
  */
@@ -26,8 +24,10 @@ private static void deferNativeCallback(String data, long callback, long payload
         final long fCallback = callback;
         final long fPayload  = payload;
         final int fType = type;
-
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+
+        final Activity activity = LoomAdMob.activity;
+        // TODO: does this require queueEvent?
+        activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 nativeCallback(fData, fCallback, fPayload, fType);

application/android/src/co/theengine/loomdemo/LoomDemo.java

@@ -23,11 +23,6 @@ of this software and associated documentation files (the "Software"), to deal
  ****************************************************************************/
 package co.theengine.loomdemo;
 
-import org.cocos2dx.lib.Cocos2dxActivity;
-import org.cocos2dx.lib.Cocos2dxEditText;
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-import org.cocos2dx.lib.Cocos2dxRenderer;
-
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -62,14 +57,12 @@ of this software and associated documentation files (the "Software"), to deal
 
 import com.dolby.DolbyAudio;
 
+import org.libsdl.app.SDLActivity;
 
-public class LoomDemo extends Cocos2dxActivity {
-
-    private Cocos2dxGLSurfaceView mGLView;
+public class LoomDemo extends SDLActivity {
 
     public static LoomDemo instance = null;
 
-
     public static String getMetadataString(Context context, String key) 
     {
         String metaString = null;

application/android/src/co/theengine/loomdemo/LoomFacebook.java

@@ -38,8 +38,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 
 
 // Loom.Facebook API
@@ -242,7 +240,8 @@ public void run()
     		            public void onComplete(Bundle values, FacebookException error) 
                         {
                             final boolean fSuccess = (error == null) ? true : false;
-                            Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+                            // TODO: does this require queueEvent?
+                            activity.runOnUiThread(new Runnable() 
                             {
                                 @Override
                                 public void run() 
@@ -346,7 +345,8 @@ else if(exception instanceof FacebookServiceException)
             }
 
             final int fErrorCode = errorCode;
-			Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+            // TODO: does this require queueEvent?
+			activity.runOnUiThread(new Runnable() 
             {
 				@Override
 				public void run() 

application/android/src/co/theengine/loomdemo/LoomHTTP.java

@@ -19,8 +19,6 @@
 
 import org.apache.http.entity.ByteArrayEntity;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 import android.util.Log;
 
 /**
@@ -97,7 +95,8 @@ public void onSuccess(byte[] binaryData) {
 
                 final String rfResponse = fResponse;
 
-                Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+                // TODO: does this require queueEvent?
+                activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
                         // Log.d(TAG, "Main view thread submitting '" + rfResponse + "'' from queue!");
@@ -135,7 +134,8 @@ public void onFailure(Throwable error, String content) {
 
                 Log.d("LoomHTTP", "Failed request with message: " + content);
 
-                Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+                // TODO: does this require queueEvent?
+                activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
                         LoomHTTP.onFailure(fContent, callback, payload);
@@ -157,7 +157,8 @@ else if(httpMethod.equals("POST"))
             }
             else
             {
-                Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+                // TODO: does this require queueEvent?
+                activity.runOnUiThread(new Runnable() 
                 {
                     @Override
                     public void run() {
@@ -169,7 +170,8 @@ public void run() {
         catch(Exception e)
         {
             Log.d("LoomHTTP", "Failed to make request due to: " + e.toString());
-            Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+            // TODO: does this require queueEvent?
+            activity.runOnUiThread(new Runnable() 
             {
                 @Override
                 public void run() {

application/android/src/co/theengine/loomdemo/LoomMobile.java

@@ -10,8 +10,6 @@
 import android.provider.Settings.System;
 import android.net.Uri;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 
 
 /**
@@ -29,6 +27,7 @@ public class LoomMobile
 
     ///vars
     private static Activity     _context;
+    private static Activity     activity;
     private static Vibrator     _vibrator;
     private static boolean      _canVibrate;
     private static Uri          _customURI = null;
@@ -39,6 +38,7 @@ public class LoomMobile
     public static void onCreate(Activity ctx)
     {
         _context = ctx;
+        activity = LoomAdMob.activity;
 
         //vibration initialization
         _canVibrate = false;
@@ -80,7 +80,8 @@ public static void onCreate(Activity ctx)
             else
             {
                 //notify that we've launched via a custom URL
-                Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+                // TODO: does this require queueEvent?
+                activity.runOnUiThread(new Runnable() 
                 {
                     @Override
                     public void run() 

application/android/src/co/theengine/loomdemo/LoomSensors.java

@@ -14,8 +14,6 @@
 import android.graphics.Matrix;
 import android.util.Log;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 
 
 
@@ -328,6 +326,7 @@ public void onAccuracyChanged(Sensor sensor, int accuracy)
     private static final String             TAG = "Loom Sensors";
 
     private static Context                  _context;
+    private static Activity                 activity;
     private static SensorManager            _sensorManager;
     private static int                      _naturalRotation;
     private static AndroidSensor[]          _sensorList;
@@ -338,6 +337,7 @@ public void onAccuracyChanged(Sensor sensor, int accuracy)
     public static void onCreate(Activity context)
     {
         _context = context;
+        activity = LoomAdMob.activity;
 
         //store sensor manager
         _sensorManager = (SensorManager)_context.getSystemService(Context.SENSOR_SERVICE);
@@ -468,7 +468,8 @@ private static void onRotationChanged(float x, float y, float z)
         final float fZ = z;
 
         ///make sure to call the delegate in the main thread
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+        // TODO: does this require queueEvent?
+        activity.runOnUiThread(new Runnable() 
         {
             @Override
             public void run() 
@@ -486,7 +487,8 @@ private static void onGravityChanged(float x, float y, float z)
         final float fZ = z;
 
         ///make sure to call the delegate in the main thread
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+        // TODO: does this require queueEvent?
+        activity.runOnUiThread(new Runnable() 
         {
             @Override
             public void run() 

application/android/src/co/theengine/loomdemo/LoomTeak.java

@@ -1,14 +1,13 @@
 package co.theengine.loomdemo;
 
+import android.app.Activity;
 import android.util.Log;
 import android.os.Bundle;
 import android.content.Intent;
 import android.content.Context;
 
 import com.CarrotInc.Carrot.Carrot;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 
 public class LoomTeak 
 {
@@ -17,10 +16,12 @@ public class LoomTeak
 
     static Carrot mTeak = null;
 
+    protected static Activity activity;
 
 
     public static void onCreate(LoomDemo loomDemo, String facebookAppId) 
     {
+        activity = LoomAdMob.activity;
         if(mTeak == null) 
         {
             String teakKey = LoomDemo.getMetadataString(loomDemo, TEAK_SECRET_KEY);
@@ -36,7 +37,8 @@ public static void onCreate(LoomDemo loomDemo, String facebookAppId)
                     public void authenticationStatusChanged(int authStatus) 
                     {
                         final int _authStatus = authStatus;
-                        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+                        // TODO: does this require queueEvent?
+                        activity.runOnUiThread(new Runnable() 
                         {
                             @Override
                             public void run() 

application/android/src/co/theengine/loomdemo/LoomVideo.java

@@ -14,6 +14,7 @@
 import android.view.ViewGroup;
 import android.view.MotionEvent;
 import android.view.View.OnTouchListener;
+import android.view.SurfaceView;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,9 +24,8 @@
 import android.view.KeyEvent;
 import android.graphics.Color;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
-
+import org.libsdl.app.SDLActivity;
+import org.libsdl.app.SDLActivity.SDLSurface;
 
 /**
  * Java Class that exposes Android fullscreen video playback
@@ -348,7 +348,8 @@ private static void cleanup()
         _rootView.setBackgroundColor(Color.TRANSPARENT);
 
         ///give focus back to the main surface view after we have removed the video view 
-        Cocos2dxGLSurfaceView.mainView.requestFocus();
+        // TODO: reimplement
+        //SDLActivity.getSurface().requestFocus();
     }
 
 
@@ -397,7 +398,8 @@ private static void deferNativeCallback(int type, String data)
         final int fType = type;
         final String fData = data;
 
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() 
+        // TODO: does this require queueEvent?
+        _context.runOnUiThread(new Runnable() 
         {
             @Override
             public void run() 

application/android/src/co/theengine/loomdemo/LoomWebView.java

@@ -12,8 +12,6 @@
 import android.webkit.WebChromeClient;
 import android.widget.RelativeLayout;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 /**
  *	Java class that manages WebView instances. This maps directly to the platformWebView C API
  */
@@ -28,7 +26,8 @@ private static void deferNativeCallback(String data, long callback, long payload
         final long fPayload = payload;
         final int fType = type;
 
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+        // TODO: does this require queueEvent?
+        activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 nativeCallback(fData, fCallback, fPayload, fType);

application/android/src/co/theengine/loomdemo/billing/LoomStore.java

@@ -21,8 +21,6 @@
 import android.os.RemoteException;
 import android.util.Log;
 
-import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
-
 /**
  * Provides Store functionality for Loom apps.
  * 
@@ -399,8 +397,8 @@ private static void deferNativeCallback(int type, String data)
     {
         final int fType = type;
         final String fData = data;
-
-        Cocos2dxGLSurfaceView.mainView.queueEvent(new Runnable() {
+        // TODO: does this require queueEvent?
+        _activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 nativeCallback(fType, fData);

loom/common/platform/platformMobileAndroid.cpp

@@ -20,8 +20,6 @@
 
 #include "loom/common/platform/platform.h"
 
-#define LOOM_PLATFORM LOOM_PLATFORM_ANDROID
-
 #if LOOM_PLATFORM == LOOM_PLATFORM_ANDROID
 
 #include <jni.h>

loom/engine/SDL2/platform/android/java/project.properties

@@ -10,5 +10,7 @@
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
+android.library=true
+
 # Project target.
 target=android-13