merged in code from other machine

engine/compilers/android/AndroidManifest.xml

@@ -12,6 +12,7 @@
         android:targetSdkVersion="15" />   
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-feature android:glEsVersion="0x00010001" />
 
     <application
         android:allowBackup="true"

engine/compilers/android/jni/Android.mk

@@ -456,9 +456,7 @@ LOCAL_SRC_FILES :=  ../../../lib/ljpeg/jcapimin.c \
 					../../../source/platformAndroid/AndroidWindow.cpp \
 					../../../source/platformAndroid/main.cpp \
 					../../../source/platformAndroid/SoundEngine.cpp \
-					../../../source/platformAndroid/T2DAppDelegate.cpp \
-					../../../source/platformAndroid/T2DView.cpp \
-					../../../source/platformAndroid/T2DViewController.cpp \
+					../../../source/platformAndroid/T2DActivity.cpp \
 					../../../source/sim/scriptGroup.cc \
 					../../../source/sim/scriptObject.cc \
 					../../../source/sim/simBase.cc \
@@ -514,9 +512,9 @@ LOCAL_SRC_FILES :=  ../../../lib/ljpeg/jcapimin.c \
 #					../../../source/testing/unitTesting.cc
  
 			   
-LOCAL_CFLAGS := -DENABLE_CONSOLE_MSGS -D__ANDROID__ -DTORQUE_OS_ANDROID -O0 -fsigned-char
+LOCAL_CFLAGS := -DENABLE_CONSOLE_MSGS -D__ANDROID__ -DTORQUE_OS_ANDROID -DGL_GLEXT_PROTOTYPES -O0 -fsigned-char
 				   
-LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2 -lz -lOpenSLES
+LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv1_CM -lz -lOpenSLES
 LOCAL_STATIC_LIBRARIES := android_native_app_glue libpng libjpeg
 
 LOCAL_ARM_MODE := arm

engine/source/platformAndroid/AndroidFont.cpp

@@ -20,10 +20,10 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#import "platform/platform.h"
-#import "platformAndroid/platformAndroid.h"
-#import "platformAndroid/AndroidFont.h"
-#import "string/Unicode.h"
+#include "platform/platform.h"
+#include "platformAndroid/platformAndroid.h"
+#include "platformAndroid/AndroidFont.h"
+#include "string/Unicode.h"
 
 //------------------------------------------------------------------------------
 // New Unicode capable font class.

engine/source/platformAndroid/AndroidGL2ES.cpp

@@ -28,9 +28,9 @@
 //  Copyright 2008 Pick Up And Play. All rights reserved.
 //
 
-#import "AndroidGL2ES.h"
-#import "platform/platformAssert.h"
-#import "AndroidOGLVideo.h"
+#include "AndroidGL2ES.h"
+#include "platform/platformAssert.h"
+#include "AndroidOGLVideo.h"
 
 #include "math/mMatrix.h"
 #include "math/mPoint.h"

engine/source/platformAndroid/AndroidGL2ES.h

@@ -34,6 +34,7 @@
 
 #include "platform/types.h"
 #include <GLES/gl.h>
+#include <GLES/glext.h>
 
 extern "C"
 {

engine/source/platformAndroid/AndroidMotionManager.cpp

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#import "AndroidMotionManager.h"
+#include "AndroidMotionManager.h"
 
 #include "platformAndroid.h"
 #include "string/stringBuffer.h"

engine/source/platformAndroid/T2DActivity.cpp

@@ -0,0 +1,810 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2013 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+#include "platformAndroid/platformGL.h"
+#include "platformAndroid/AndroidWindow.h"
+#include "platformAndroid/platformAndroid.h"
+#include "graphics/dgl.h"
+
+#include <errno.h>
+#include <EGL/egl.h>
+//#include <android/sensor.h>
+#include <android/log.h>
+#include <android_native_app_glue.h>
+#include <android/asset_manager.h>
+#include <sstream>
+#include <list>
+#include <unistd.h>
+#include <time.h>
+
+/**
+ * Our saved state data.
+ */
+struct saved_state {
+    float angle;
+    int32_t x;
+    int32_t y;
+};
+
+/**
+ * Shared state for our app.
+ */
+struct engine {
+    struct android_app* app;
+
+    int animating;
+    EGLDisplay display;
+    EGLSurface surface;
+    EGLContext context;
+    int32_t width;
+    int32_t height;
+    struct saved_state state;
+};
+
+static struct engine engine;
+
+extern AndroidPlatState platState;
+
+bool keyboardShowing = false;
+float keyboardTransition = 1.0f;
+bool bSuspended = false;
+bool SetupCompleted = false;
+double lastSystemTime = 0;
+
+#define USE_DEPTH_BUFFER 0
+
+extern int _AndroidRunTorqueMain();
+extern bool createMouseMoveEvent(S32 i, S32 x, S32 y, S32 lastX, S32 lastY);
+extern bool createMouseDownEvent(S32 touchNumber, S32 x, S32 y, U32 numTouches);
+extern bool createMouseUpEvent(S32 touchNumber, S32 x, S32 y, S32 lastX, S32 lastY, U32 numTouches); //EFM
+extern void createMouseTapEvent( S32 nbrTaps, S32 x, S32 y );
+extern void _AndroidGameInnerLoop();
+extern void _AndroidGameResignActive();
+extern void _AndroidGameBecomeActive();
+extern void _AndroidGameWillTerminate();
+extern S32 _AndroidGameGetOrientation();
+
+// Store current orientation for easy access
+extern void _AndroidGameChangeOrientation(S32 newOrientation);
+//TODO: android
+/*
+UIDeviceOrientation currentOrientation;
+*/
+bool _AndroidTorqueFatalError = false;
+
+//-Mat we should update the accelereometer once per frame
+extern U32  AccelerometerUpdateMS;
+extern void _AndroidGameInnerLoop();
+
+double timeGetTime() {
+
+    struct timeval  tv;
+    gettimeofday(&tv, NULL);
+
+    return ((tv.tv_sec) * 1000.0 + (tv.tv_usec) / 1000.0);
+
+}
+
+bool T2DActivity::createFramebuffer() {
+	
+	glGenFramebuffersOES(1, &viewFramebuffer);
+	glGenRenderbuffersOES(1, &viewRenderbuffer);
+	
+	glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
+	glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
+	//TODO: android
+	//[self.context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)self.view.layer];
+	glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, viewRenderbuffer);
+	
+	glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &backingWidth);
+	glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &backingHeight);
+	
+	if (USE_DEPTH_BUFFER) {
+		glGenRenderbuffersOES(1, &depthRenderbuffer);
+		glBindRenderbufferOES(GL_RENDERBUFFER_OES, depthRenderbuffer);
+		glRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH_COMPONENT16_OES, backingWidth, backingHeight);
+		glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, depthRenderbuffer);
+	}
+	
+	if(glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES) {
+		//TODO: android
+		//NSLog(@"failed to make complete framebuffer object %x", glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
+		return false;
+	}
+	
+	return true;
+}
+
+
+void T2DActivity::destroyFramebuffer() {
+	
+	glDeleteFramebuffersOES(1, &viewFramebuffer);
+	viewFramebuffer = 0;
+	glDeleteRenderbuffersOES(1, &viewRenderbuffer);
+	viewRenderbuffer = 0;
+	
+	if(depthRenderbuffer) {
+		glDeleteRenderbuffersOES(1, &depthRenderbuffer);
+		depthRenderbuffer = 0;
+	}
+}
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+void T2DActivity::finishGLSetup()
+{
+    //TODO: android
+    //self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
+    
+    //if (!self.context) {
+      //  NSLog(@"Failed to create ES context");
+    //}
+    
+	if( AccelerometerUpdateMS <= 0 ) {
+        //Luma:	This variable needs to be store MS value, not Seconds value
+        AccelerometerUpdateMS = 33; // 33 ms
+	}
+	
+	//[EAGLContext setCurrentContext:self.context];
+	createFramebuffer();
+	
+    platState.multipleTouchesEnabled = true;
+    //[self.view setMultipleTouchEnabled:YES];
+    
+	_AndroidTorqueFatalError = false;
+	if(!_AndroidRunTorqueMain())
+	{
+		_AndroidTorqueFatalError = true;
+		return;
+	}
+}
+
+void T2DActivity::finishShutdown()
+{
+	//TODO: android
+    // Release any retained subviews of the main view.
+    //if ([EAGLContext currentContext] == self.context) {
+      //  [EAGLContext setCurrentContext:nil];
+    //}
+    
+    //self.context = nil;
+}
+
+void T2DActivity::update()
+{
+    _AndroidGameInnerLoop();
+}
+
+Vector<Point2I> rawLastTouches;
+
+// Handle touch and keyboard input from android OS
+static int32_t engine_handle_input(struct android_app* app, AInputEvent* event) {
+
+	struct engine* engine = (struct engine*)app->userData;
+
+    if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION) {
+
+        if ((AMotionEvent_getAction(event) & AMOTION_EVENT_ACTION_MASK) == AMOTION_EVENT_ACTION_DOWN) {
+
+        	size_t touchCount = AMotionEvent_getPointerCount(event);
+        	for (U8 i = 0; i < touchCount; i++)
+        	{
+        		Point2I point;
+        		point.x = AMotionEvent_getX(event, i);
+        		point.y = AMotionEvent_getY(event, i);
+
+        		if (rawLastTouches.size() < i)
+        			rawLastTouches.push_back(point);
+        		else
+        		{
+        			rawLastTouches[i].x = point.x;
+        			rawLastTouches[i].y = point.y;
+        		}
+
+        	    S32 orientation = _AndroidGameGetOrientation();
+        	    //TODO: android
+        	    /* if (UIDeviceOrientationIsPortrait(orientation))
+        	    {
+        	    	point.y -= _AndroidGetPortraitTouchoffset();
+        	    }
+        	    */
+        	    createMouseDownEvent(i, point.x, point.y, touchCount);
+        	}
+
+        }
+
+        if ((AMotionEvent_getAction(event) & AMOTION_EVENT_ACTION_MASK) == AMOTION_EVENT_ACTION_UP) {
+
+        	size_t touchCount = AMotionEvent_getPointerCount(event);
+			for (U8 i = 0; i < touchCount; i++)
+			{
+				Point2I point;
+				point.x = AMotionEvent_getX(event, i);
+				point.y = AMotionEvent_getY(event, i);
+				Point2I prevPoint = rawLastTouches[i];
+
+				S32 orientation = _AndroidGameGetOrientation();
+				//TODO: android
+				/*if (UIDeviceOrientationIsPortrait(orientation))
+				{
+					point.y -= _AndroidGetPortraitTouchoffset();
+					prevPoint.y -= _AndroidGetPortraitTouchoffset();
+				}*/
+				createMouseUpEvent(i, point.x, point.y, prevPoint.x, prevPoint.y, touchCount);
+
+    	        //Luma: Tap support
+
+    	        if (touchCount > 0)
+    	        {
+    	            // this was a tap, so create a tap event
+    	            createMouseTapEvent(touchCount, (int) point.x, (int) point.y);
+    	        }
+			}
+        }
+
+        if ((AMotionEvent_getAction(event) & AMOTION_EVENT_ACTION_MASK) == AMOTION_EVENT_ACTION_MOVE) {
+
+        	size_t touchCount = AMotionEvent_getPointerCount(event);
+			for (U8 i = 0; i < touchCount; i++)
+			{
+				Point2I point;
+				point.x = AMotionEvent_getX(event, i);
+				point.y = AMotionEvent_getY(event, i);
+				Point2I prevPoint = rawLastTouches[i];
+
+				S32 orientation = _AndroidGameGetOrientation();
+				//TODO: android
+				/*
+				if (UIDeviceOrientationIsPortrait(orientation))
+				{
+					point.y -= _AndroidGetPortraitTouchoffset();
+					prevPoint.y -= _AndroidGetPortraitTouchoffset();
+				}*/
+				createMouseMoveEvent(i, point.x, point.y, prevPoint.x, prevPoint.y);
+
+				rawLastTouches[i].x = point.x;
+				rawLastTouches[i].y = point.y;
+
+			}
+        }
+
+        if ((AMotionEvent_getAction(event) & AMOTION_EVENT_ACTION_MASK) == AMOTION_EVENT_ACTION_CANCEL) {
+
+        	size_t touchCount = AMotionEvent_getPointerCount(event);
+			for (U8 i = 0; i < touchCount; i++)
+			{
+				Point2I point;
+				point.x = AMotionEvent_getX(event, i);
+				point.y = AMotionEvent_getY(event, i);
+				Point2I prevPoint = rawLastTouches[i];
+
+				S32 orientation = _AndroidGameGetOrientation();
+				//TODO: android
+				/*
+				if (UIDeviceOrientationIsPortrait(orientation))
+				{
+					point.y -= _AndroidGetPortraitTouchoffset();
+					prevPoint.y -= _AndroidGetPortraitTouchoffset();
+				}
+				*/
+				createMouseUpEvent(i, point.x, point.y, prevPoint.x, prevPoint.y, touchCount);
+
+				//Luma: Tap support
+
+				if (touchCount > 0)
+				{
+					// this was a tap, so create a tap event
+					createMouseTapEvent(touchCount, (int) point.x, (int) point.y);
+				}
+			}
+        }
+
+        return 1;
+
+    } else if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_KEY) {
+
+    	int action = AKeyEvent_getAction(event);
+    	int key_val = AKeyEvent_getKeyCode(event);
+    	int metastate = AKeyEvent_getMetaState(event);
+
+		switch(action)
+		{
+			case AKEY_EVENT_ACTION_DOWN:
+
+				if (key_val == AKEYCODE_VOLUME_UP) {
+					//TODO: android
+					//ChangeVolume(true);
+				} else if (key_val == AKEYCODE_VOLUME_DOWN) {
+					//TODO: android
+					//ChangeVolume(false);
+				} else if (key_val == AKEYCODE_BACK) {
+					//android back button
+			    } else {
+			        //TODO: android
+			    	//convertAndroidToWindowsKeyCode(key_val);
+			    }
+				break;
+
+			case AKEY_EVENT_ACTION_UP:
+
+				if (key_val == AKEYCODE_VOLUME_UP) {
+					//TODO: android
+					//ChangeVolume(true);
+				} else if (key_val == AKEYCODE_VOLUME_DOWN) {
+					//TODO: android
+					//ChangeVolume(false);
+				} else if (key_val == AKEYCODE_BACK) {
+					//android back button
+				} else {
+					//TODO: android
+					//convertAndroidToWindowsKeyCode(key_val);
+				}
+				break;
+
+		}
+
+    	return 1;
+    }
+
+    return 0;
+}
+
+int _AndroidGetScreenWidth() {
+
+	return engine.width;
+}
+
+int _AndroidGetScreenHeight() {
+
+	return engine.height;
+}
+
+bool _AndroidGetFileDescriptor(const char* fileName, int32_t *mDescriptor, off_t *mStart, off_t* mLength) {
+
+	AAsset* asset = AAssetManager_open(engine.app->activity->assetManager, fileName, AASSET_MODE_UNKNOWN);
+	if (asset != NULL) {
+		*mDescriptor = AAsset_openFileDescriptor(asset, mStart, mLength);
+		AAsset_close(asset);
+		return true;
+	}
+
+	*mDescriptor = 0;
+	*mStart = 0;
+	*mLength = 0;
+
+	return false;
+}
+
+char* _AndroidLoadFile(const char* fileName, int *size) {
+
+	AAsset *asset;
+	uint8_t buf[1024];
+	char* buffer = NULL;
+	*size = 0;
+	asset = AAssetManager_open(engine.app->activity->assetManager, fileName, AASSET_MODE_UNKNOWN);
+	if(asset != NULL){
+		*size = AAsset_getLength(asset);
+		if (*size <= 0)
+			return NULL;
+		buffer = new char[*size + 1];
+		int count = 0;
+		while(true)
+		{
+			int read = AAsset_read(asset, buf, 1024);
+			if (read <= 0)
+				break;
+
+			memcpy(buffer+count,buf, read);
+			count += read;
+
+	    }
+		buffer[*size] = '\0';
+
+		AAsset_close(asset);
+	}
+
+	return buffer;
+
+}
+
+void _AndroidGetDeviceIPAddress(char* address) {
+
+	 int fd;
+	 strcpy(address, "error");
+
+	 // Attaches the current thread to the JVM.
+	 jint lResult;
+	 jint lFlags = 0;
+
+	 JavaVM* lJavaVM = engine.app->activity->vm;
+	 JNIEnv* lJNIEnv = engine.app->activity->env;
+
+	 JavaVMAttachArgs lJavaVMAttachArgs;
+	 lJavaVMAttachArgs.version = JNI_VERSION_1_6;
+	 lJavaVMAttachArgs.name = "NativeThread";
+	 lJavaVMAttachArgs.group = NULL;
+
+	 lResult=lJavaVM->AttachCurrentThread(&lJNIEnv, &lJavaVMAttachArgs);
+	 if (lResult == JNI_ERR) {
+		 return;
+	 }
+
+	 // Retrieves NativeActivity.
+	 jobject lNativeActivity = engine.app->activity->clazz;
+	 jclass ClassNativeActivity = lJNIEnv->GetObjectClass(lNativeActivity);
+
+	 // Retrieves Context.INPUT_METHOD_SERVICE.
+	 jclass ClassContext = lJNIEnv->FindClass("android/content/Context");
+	 jfieldID FieldWIFI_SERVICE =
+		 lJNIEnv->GetStaticFieldID(ClassContext,
+			 "WIFI_SERVICE", "Ljava/lang/String;");
+	 jobject WIFI_SERVICE =
+		 lJNIEnv->GetStaticObjectField(ClassContext,
+			 FieldWIFI_SERVICE);
+
+	 // Runs getSystemService(Context.WIFI_SERVICE).
+	 jclass ClassWifiManager = lJNIEnv->FindClass(
+		 "android/net/wifi/WifiManager");
+	 jclass ClassWifiInfo = lJNIEnv->FindClass(
+	 		 "android/net/wifi/WifiInfo");
+	 jmethodID MethodGetSystemService = lJNIEnv->GetMethodID(
+		 ClassNativeActivity, "getSystemService",
+		 "(Ljava/lang/String;)Ljava/lang/Object;");
+	 jobject lWifiManager = lJNIEnv->CallObjectMethod(
+		 lNativeActivity, MethodGetSystemService,
+		 WIFI_SERVICE);
+
+	 // Runs wifiManager.getConnectionInfo()
+     jmethodID MethodGetConnectionInfo = lJNIEnv->GetMethodID(
+			 ClassWifiManager, "getConnectionInfo",
+			 "()Landroid/net/wifi/WifiInfo;");
+     jobject lWifiInfo = lJNIEnv->CallObjectMethod(
+			 lWifiManager, MethodGetConnectionInfo);
+
+     // Runs wifiInfo.getIpAddress()
+     jmethodID MethodGetIPAddress = lJNIEnv->GetMethodID(
+    		 ClassWifiInfo, "getIpAddress",
+     		"()I");
+     jint lIPAddress = lJNIEnv->CallIntMethod(
+     	     lWifiInfo, MethodGetIPAddress);
+
+     int ip = lIPAddress;
+
+	 // Finished with the JVM.
+	 lJavaVM->DetachCurrentThread();
+
+	 char buffer[32];
+	 sprintf(buffer, "%d.%d.%d.%d", (ip & 0xFF), (ip >> 8 & 0xFF), (ip >> 16 & 0xFF), (ip >> 24 & 0xFF));
+	 strcpy(address, buffer);
+
+}
+
+/**
+ * Initialize an EGL context for the current display.
+ */
+static int engine_init_display(struct engine* engine) {
+    // initialize OpenGL ES and EGL
+
+    /*
+     * Here specify the attributes of the desired configuration.
+     * Below, we select an EGLConfig with at least 8 bits per color
+     * component compatible with on-screen windows
+     */
+    const EGLint attribs[] = {
+            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+            EGL_BLUE_SIZE, 8,
+            EGL_GREEN_SIZE, 8,
+            EGL_RED_SIZE, 8,
+            //EGL_ALPHA_SIZE, 8,
+            //EGL_DEPTH_SIZE, 24,
+            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT,
+            EGL_NONE
+    };
+
+    static const EGLint ctx_attribs[] = {
+          EGL_CONTEXT_CLIENT_VERSION, 2,
+          EGL_NONE
+        };
+
+    EGLint w, h, dummy, format;
+    EGLint numConfigs;
+    EGLConfig config;
+    EGLSurface surface;
+    EGLContext context;
+
+    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+
+    eglInitialize(display, 0, 0);
+
+    /* Here, the application chooses the configuration it desires. In this
+     * sample, we have a very simplified selection process, where we pick
+     * the first EGLConfig that matches our criteria */
+    eglChooseConfig(display, attribs, &config, 1, &numConfigs);
+
+    /* EGL_NATIVE_VISUAL_ID is an attribute of the EGLConfig that is
+     * guaranteed to be accepted by ANativeWindow_setBuffersGeometry().
+     * As soon as we picked a EGLConfig, we can safely reconfigure the
+     * ANativeWindow buffers to match, using EGL_NATIVE_VISUAL_ID. */
+    eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &format);
+
+    ANativeWindow_setBuffersGeometry(engine->app->window, 0, 0, format);
+
+    surface = eglCreateWindowSurface(display, config, engine->app->window, NULL);
+    context = eglCreateContext(display, config, EGL_NO_CONTEXT, ctx_attribs);
+
+    if (eglMakeCurrent(display, surface, surface, context) == EGL_FALSE) {
+    	adprintf("Unable to eglMakeCurrent");
+        return -1;
+    }
+
+    eglQuerySurface(display, surface, EGL_WIDTH, &w);
+    eglQuerySurface(display, surface, EGL_HEIGHT, &h);
+
+    engine->display = display;
+    engine->context = context;
+    engine->surface = surface;
+    engine->width = w;
+    engine->height = h;
+    engine->state.angle = 0;
+
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+
+    engine->animating = 1;
+
+    glViewport(0, 0, engine->width, engine->height);
+
+    if (SetupCompleted == false)
+    {
+
+    	//TODO: android
+
+    }
+    else
+    {
+    	if(!_AndroidTorqueFatalError)
+    	        _AndroidGameBecomeActive();
+    }
+
+    return 0;
+}
+
+/**
+ * update callback
+ */
+static void engine_update_frame(struct engine* engine) {
+
+	if (bSuspended == true)
+	    return;
+
+	double thisSysTime = timeGetTime();
+	float timeElapsed = (thisSysTime-lastSystemTime)/1000.0f;
+	if (timeElapsed > 1.0f)
+		timeElapsed = 1.0f; // clamp it
+
+	if (SetupCompleted == false) {
+		if (timeElapsed > 0.25f) {
+			//TODO: android load
+			SetupCompleted = true;
+			lastSystemTime = timeGetTime();
+		}
+	} else {
+
+		lastSystemTime = thisSysTime;
+
+		if (keyboardShowing) {
+			if (keyboardTransition > 0.0f) {
+				keyboardTransition -= timeElapsed * 2.0f;
+				if (keyboardTransition < 0.0f)
+					keyboardTransition = 0.0f;
+			}
+		} else {
+			if (keyboardTransition < 1.0f) {
+				keyboardTransition += timeElapsed * 2.0f;
+				if (keyboardTransition > 1.0f)
+					keyboardTransition = 1.0f;
+			}
+		}
+
+		_AndroidGameInnerLoop();
+	}
+
+}
+
+/**
+ * Just the current frame in the display.
+ */
+static void engine_draw_frame(struct engine* engine) {
+    if (engine->display == NULL) {
+        // No display.
+        return;
+    }
+
+    if (bSuspended == true)
+    	return;
+
+	if (SetupCompleted == false) {
+		return;
+	}
+
+	if (keyboardShowing == true) {
+		glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	}
+	//backBufferFBO[currentActiveBuffer].AcceptRender(true);
+
+	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	//TODO: android
+	//PandaDraw();
+
+	//glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+	//int height = engine_screenHeight() - (keyboardTransition * (engine_screenHeight()/2));
+
+	//draw tp screen
+	/*if (isDeviceiPhone()) {
+
+		float scale = 1.0f;
+		//shrink it to fit screen if we have blown it up
+		//if (engine->height > 0 && engine->width == 1024 && engine->height < 768) {
+		//	scale = 1.0f / ARTIF_SCALE;
+		//}
+
+		if (currentActiveBufferPerc < 1.0f)
+			backBufferFBO[otherBuffer].bitmap->DrawBuffer((engine_screenWidth()/2 - ((engine_screenWidth()*currentActiveBufferPerc) * currentBufferDirection)) * scale,height * scale, scale);
+		backBufferFBO[currentActiveBuffer].bitmap->DrawBuffer((engine_screenWidth()/2 + ((engine_screenWidth()-(engine_screenWidth()*currentActiveBufferPerc)) * currentBufferDirection)) * scale,height * scale, scale);
+
+	} else {
+		float scale = 1.0f;
+		float width = engine_screenWidth()/2;
+		//shrink it to fit screen if we have blown it up
+		//if (engine->height > 0 && engine->width == 1024 && engine->height < 768) {
+		//	scale = 1.0f / ARTIF_SCALE;
+		//}
+
+		backBufferFBO[currentActiveBuffer].bitmap->DrawBuffer(width*scale,height*scale, scale);
+	}
+*/
+    eglSwapBuffers(engine->display, engine->surface);
+}
+
+/**
+ * Tear down the EGL context currently associated with the display.
+ */
+static void engine_term_display(struct engine* engine, bool shutdown) {
+
+	if (shutdown == true) {
+		_AndroidGameWillTerminate();
+	} else {
+		 _AndroidGameResignActive();
+	}
+
+    if (engine->display != EGL_NO_DISPLAY) {
+        eglMakeCurrent(engine->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+        if (engine->context != EGL_NO_CONTEXT) {
+            eglDestroyContext(engine->display, engine->context);
+        }
+        if (engine->surface != EGL_NO_SURFACE) {
+            eglDestroySurface(engine->display, engine->surface);
+        }
+        eglTerminate(engine->display);
+    }
+    engine->animating = 0;
+    engine->display = EGL_NO_DISPLAY;
+    engine->context = EGL_NO_CONTEXT;
+    engine->surface = EGL_NO_SURFACE;
+}
+
+//TODO: android rotate
+/*- (void)didRotate:(NSNotification *)notification
+{
+    //Default to landscape left
+	UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
+	if(currentOrientation != orientation)
+	{
+		//Change the orientation
+		currentOrientation = orientation;
+		//Tell the rest of the engine
+		_AndroidGameChangeOrientation(currentOrientation);
+	}
+}*/
+
+void supportLandscape( bool enable)
+{
+	//TODO: android
+    //platState.viewController->mOrientationLandscapeLeftSupported = enable;
+    //platState.viewController->mOrientationLandscapeRightSupported = enable;
+}
+
+ConsoleFunction(supportLandscape, void, 2, 2, "supportLandscape( bool ) "
+                "enable or disable Landscape")
+{
+    bool enable = true;
+    if( argc > 1 )
+        enable = dAtob( argv[1] );
+    
+    supportLandscape(enable);
+}
+
+void supportPortrait( bool enable )
+{
+	//TODO: android
+    //platState.viewController->mOrientationPortraitSupported = enable;
+    //platState.viewController->mOrientationPortraitUpsideDownSupported = enable;
+}
+
+ConsoleFunction(supportPortrait, void, 2, 2, "supportPortrait( bool ) "
+                "enable or disable portrait")
+{
+    bool enable = true;
+    if( argc > 1 )
+        enable = dAtob( argv[1] );
+    
+    supportPortrait(enable);
+}
+
+void adprintf(const char* fmt,...) {
+
+	va_list argptr;
+	int cnt;
+	char s[4096];
+	time_t now;
+
+	va_start(argptr,fmt);
+	cnt = vsprintf(s,fmt,argptr);
+	va_end(argptr);
+
+	time(&now);
+	tm* t = localtime(&now);
+
+	std::stringstream ss;
+	ss.clear();
+	ss << "[";
+	ss << (t->tm_year + 1900);
+	ss << "/";
+	if (t->tm_mon < 9)
+		ss << "0";
+	ss << (t->tm_mon+1);
+	ss << "/";
+	if (t->tm_mday < 10)
+		ss << "0";
+	ss << t->tm_mday;
+	ss << " ";
+	if (t->tm_hour < 10)
+		ss << "0";
+	ss << t->tm_hour;
+	ss << ":";
+	if (t->tm_min < 10)
+		ss << "0";
+	ss << t->tm_min;
+	ss << ":";
+	if (t->tm_sec < 10)
+		ss << "0";
+	ss << t->tm_sec;
+	ss << "] ";
+	ss << s;
+
+    __android_log_print(ANDROID_LOG_INFO, "Torque2D", "%s", ss.str().c_str());
+}
+
+

engine/source/platformAndroid/T2DViewController.h → engine/source/platformAndroid/T2DActivity.h

@@ -19,12 +19,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
-//TODO: android
-/*
-#import <GLKit/GLKit.h>
+#include "platformAndroid/AndroidGL2ES.h"
 
+extern void adprintf(const char* fmt,...);
 
-@interface T2DViewController : GLKViewController {
+class T2DActivity {
+
+private:
 	// The pixel dimensions of the backbuffer
 	GLint backingWidth;
 	GLint backingHeight;
@@ -32,7 +33,7 @@
     // OpenGL names for the renderbuffer and framebuffers used to render to this view
 	GLuint viewRenderbuffer, viewFramebuffer;
 	
-	/ OpenGL name for the depth buffer that is attached to viewFramebuffer, if it exists (0 if it does not exist)
+	// OpenGL name for the depth buffer that is attached to viewFramebuffer, if it exists (0 if it does not exist)
 	GLuint depthRenderbuffer;
     
     GLuint _vertexBuffer;
@@ -41,21 +42,20 @@
     
     bool isLayedOut;
     
-@public
-    NSURLConnection *connection;
-    NSMutableData *connectionData;
+public:
+    //TODO: android
+    //NSURLConnection *connection;
+    //NSMutableData *connectionData;
     bool mOrientationLandscapeRightSupported;
     bool mOrientationLandscapeLeftSupported;
     bool mOrientationPortraitSupported;
     bool mOrientationPortraitUpsideDownSupported;
-}
-
-@property (strong, nonatomic) EAGLContext *context;
-
-@property (nonatomic, strong) NSURLConnection   *connection;
-@property (nonatomic, strong) NSMutableData     *connectionData;
 
-void supportLandscape( bool );
-void supportPortrait( bool );
-@end
-*/
+    void supportLandscape( bool );
+    void supportPortrait( bool );
+    bool createFramebuffer();
+    void destroyFramebuffer();
+    void update();
+    void finishShutdown();
+    void finishGLSetup();
+};

engine/source/platformAndroid/T2DAppDelegate.cpp

@@ -1,94 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-#import "platformAndroid/T2DAppDelegate.h"
-
-#include "platform/platformInput.h"
-#include "platformAndroid/AndroidUtil.h"
-#include "console/console.h"
-
-extern void _AndroidGameInnerLoop();
-extern void _AndroidGameResignActive();
-extern void _AndroidGameBecomeActive();
-extern void _AndroidGameWillTerminate();
-
-// Store current orientation for easy access
-extern void _AndroidGameChangeOrientation(S32 newOrientation);
-//TODO: android
-/*
-UIDeviceOrientation currentOrientation;
-
-bool _AndroidTorqueFatalError = false;
-
-@implementation T2DAppDelegate
-
-@synthesize window = _window;
-
-
-- (void)applicationDidFinishLaunching:(UIApplication *)application {
-    
-	[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
-	//Also we set the currentRotation up so its not invalid
-	currentOrientation = [UIDevice currentDevice].orientation;
-	//So we make a selector to handle that, called didRotate (lower down in the code)
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(didRotate:)
-												 name:UIDeviceOrientationDidChangeNotification
-											   object:nil];
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application
-{
-    _AndroidGameResignActive();
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-    if(!_AndroidTorqueFatalError)
-        _AndroidGameBecomeActive();
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application
-{
-    _AndroidGameWillTerminate();
-	
-	[[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
-}
-
-- (void)didRotate:(NSNotification *)notification
-{
-    //Default to landscape left
-	UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
-	if(currentOrientation != orientation)
-	{
-		//Change the orientation
-		currentOrientation = orientation;
-		//Tell the rest of the engine
-		_AndroidGameChangeOrientation(currentOrientation);
-	}
-}
-
-- (void) runMainLoop
-{
-	_AndroidGameInnerLoop();
-}
-*/

engine/source/platformAndroid/T2DAppDelegate.h

@@ -1,34 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-//TODO: android
-/*
-#import <UIKit/UIKit.h>
-#import <GLKit/GLKit.h>
-
-@interface T2DAppDelegate : NSObject <UIApplicationDelegate, GLKViewDelegate, GLKViewControllerDelegate> {
-	IBOutlet UIWindow *window;
-}
-
-@property (nonatomic, strong) UIWindow *window;
-
-@end
-*/

engine/source/platformAndroid/T2DView.cpp

@@ -1,208 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-#import "platformAndroid/T2DView.h"
-//#import <QuartzCore/QuartzCore.h>
-//#include "platformiPhone/iPhoneEvents.h"
-
-#import "platformAndroid/platformAndroid.h"
-#import "platformAndroid/platformGL.h"
-#import "platformAndroid/AndroidOGLVideo.h"
-#include "console/console.h"
-#include "math/mPoint.h"
-#include "platform/event.h"
-#include "game/gameInterface.h"
-#include "console/consoleInternal.h"
-#include "console/ast.h"
-#include "io/fileStream.h"
-#include "platformAndroid/AndroidUtil.h"
-#include "platformAndroid/AndroidEvents.h"
-#include "graphics/dgl.h"
-#include "debug/profiler.h"
-
-#define USE_DEPTH_BUFFER 0
-
-extern bool createMouseMoveEvent(S32 i, S32 x, S32 y, S32 lastX, S32 lastY);
-extern bool createMouseDownEvent(S32 touchNumber, S32 x, S32 y, U32 numTouches);
-extern bool createMouseUpEvent(S32 touchNumber, S32 x, S32 y, S32 lastX, S32 lastY, U32 numTouches); //EFM
-extern void createMouseTapEvent( S32 nbrTaps, S32 x, S32 y );
-
-//TODO: android
-/*
-bool retinaEnabled;
-
-void ConvertToRetina(CGPoint *p)
-{
-    p->x *= 2;
-    p->y *= 2;
-}
-
-@implementation T2DView
-
-@synthesize context = _context;
-@synthesize currentAngle;
-@synthesize isLayedOut;
-
--(void)swapBuffers {
-	if( self.isLayedOut == true ) {
-		[self.context presentRenderbuffer:GL_RENDERBUFFER_OES];
-	}
-}
-
-- (void)layoutSubviews {
-}
-
--(void)rotateByAngle:(CGFloat)angle {
-	
-	CGAffineTransform transform = self.transform;
-    
-	transform = CGAffineTransformRotate(transform, angle);
-	self.transform = transform;
-}
-
--(void)rotateToAngle:(CGFloat)angle {
-	CGFloat rotateAmount = (angle - currentAngle);//need to make this work better
-	if( rotateAmount == 0 ) {
-		return;
-	}
-	currentAngle = angle;
-	[self rotateByAngle:rotateAmount];
-}
-
--(void)centerOnPoint:(CGPoint)point {
-	self.center = point;
-}
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    
-    NSUInteger touchCount = 0;
-    // Enumerates through all touch objects
-    for (UITouch *touch in touches)
-    {
-        CGPoint point = [touch locationInView:self];
-        
-        if (retinaEnabled)
-        {
-            ConvertToRetina(&point);
-        }
-        
-        S32 orientation = _AndroidGameGetOrientation();
-        if (UIDeviceOrientationIsPortrait(orientation))
-        {
-            point.y -= _AndroidGetPortraitTouchoffset();
-        }
-        
-        int numTouches = [touch tapCount];
-        createMouseDownEvent(touchCount, point.x, point.y, numTouches);
-        touchCount++;
-    }
-}
-
-
-extern Vector<Event *> TouchMoveEvents;
-
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    
-    NSUInteger touchCount = 0;
-    // Enumerates through all touch objects
-    for (UITouch *touch in touches)
-    {
-        CGPoint point = [touch locationInView:self];
-        CGPoint prevPoint = [touch previousLocationInView:self]; //EFM
-        
-        if (retinaEnabled)
-        {
-            ConvertToRetina(&point);
-            ConvertToRetina(&prevPoint);
-        }
-        
-        S32 orientation = _AndroidGameGetOrientation();
-        if (UIDeviceOrientationIsPortrait(orientation))
-        {
-            point.y -= _AndroidGetPortraitTouchoffset();
-            prevPoint.y -= _AndroidGetPortraitTouchoffset();
-        }
-        
-        createMouseMoveEvent(touchCount, point.x, point.y, prevPoint.x, prevPoint.y);
-        touchCount++;
-    }
-    
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    
-    NSUInteger touchCount = 0;
-    // Enumerates through all touch objects
-    for (UITouch *touch in touches)
-    {
-        CGPoint point = [touch locationInView:self];
-        CGPoint prevPoint = [touch previousLocationInView:self]; //EFM
-        
-        if (retinaEnabled)
-        {
-            ConvertToRetina(&point);
-            ConvertToRetina(&prevPoint);
-        }
-        
-        S32 orientation = _AndroidGameGetOrientation();
-        if (UIDeviceOrientationIsPortrait(orientation))
-        {
-            point.y -= _AndroidGetPortraitTouchoffset();
-            prevPoint.y -= _AndroidGetPortraitTouchoffset();
-        }
-        
-        int tc = [touch tapCount];
-        createMouseUpEvent(touchCount, point.x, point.y, prevPoint.x, prevPoint.y, tc);
-        touchCount++;
-        
-        //Luma: Tap support
-        
-        if (tc > 0)
-        {
-            // this was a tap, so create a tap event
-            createMouseTapEvent(tc, (int) point.x, (int) point.y);
-        }
-    }
-    
-}
-
-- (void)touchesChangedWithEvent:(UIEvent *)event
-{
-    Con::printf("Touches Changed with Event");
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-    [self touchesEnded:touches withEvent:event];
-}
-
-bool gScreenAutoRotate = false;
-int currentRotate = 0;
-#define ROTATE_LEFT		0
-#define ROTATE_RIGHT	1
-#define ROTATE_UP		2
-@end
-*/

engine/source/platformAndroid/T2DView.h

@@ -1,40 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-//TODO: android
-/*
-#import <GLKit/GLKit.h>
-
-@interface T2DView : GLKView {
-}
-
-@property (strong, nonatomic) EAGLContext *context;
-@property (nonatomic) CGFloat currentAngle;//for knowing our current oriantion
-@property (nonatomic) BOOL isLayedOut;
-
-- (void)swapBuffers;
-- (void)rotateByAngle:(CGFloat)angle;//rotate BY a certain degree
-- (void)rotateToAngle:(CGFloat)angle;//rotate TO a certain degree
-- (void)centerOnPoint:(CGPoint)point;//set the center position
-
-
-@end
-*/

engine/source/platformAndroid/T2DViewController.cpp

@@ -1,263 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-#import "T2DViewController.h"
-#import "platformAndroid/platformGL.h"
-#include "platformAndroid/AndroidWindow.h"
-#include "platformAndroid/platformAndroid.h"
-#include "graphics/dgl.h"
-
-extern AndroidPlatState platState;
-
-
-#define USE_DEPTH_BUFFER 0
-
-extern bool retinaEnabled;
-//TODO: android
-/*
-extern void ConvertToRetina (CGPoint *p);
-
-extern bool _AndroidTorqueFatalError;
-extern int _AndroidRunTorqueMain( id appID,  UIView *Window, T2DViewController *Controller );
-*/
-//-Mat we should update the accelereometer once per frame
-extern U32  AccelerometerUpdateMS;
-extern void _AndroidGameInnerLoop();
-
-//TODO: android
-/*
-@implementation T2DViewController
-
-@synthesize context = _context;
-@synthesize connectionData = _connectionData;
-@synthesize connection = _connection;
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
-- (void)didReceiveMemoryWarning
-{
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-#pragma mark - View lifecycle
-
-
--(void)swapBuffers {
-	if( isLayedOut == true ) {
-		[self.context presentRenderbuffer:GL_RENDERBUFFER_OES];
-	}
-}
-
-- (BOOL)createFramebuffer {
-	
-	glGenFramebuffersOES(1, &viewFramebuffer);
-	glGenRenderbuffersOES(1, &viewRenderbuffer);
-	
-	glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
-	glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
-	[self.context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)self.view.layer];
-	glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, viewRenderbuffer);
-	
-	glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &backingWidth);
-	glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &backingHeight);
-	
-	if (USE_DEPTH_BUFFER) {
-		glGenRenderbuffersOES(1, &depthRenderbuffer);
-		glBindRenderbufferOES(GL_RENDERBUFFER_OES, depthRenderbuffer);
-		glRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_DEPTH_COMPONENT16_OES, backingWidth, backingHeight);
-		glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, depthRenderbuffer);
-	}
-	
-	if(glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES) {
-		NSLog(@"failed to make complete framebuffer object %x", glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
-		return NO;
-	}
-	
-	return YES;
-}
-
-
-- (void)destroyFramebuffer {
-	
-	glDeleteFramebuffersOES(1, &viewFramebuffer);
-	viewFramebuffer = 0;
-	glDeleteRenderbuffersOES(1, &viewRenderbuffer);
-	viewRenderbuffer = 0;
-	
-	if(depthRenderbuffer) {
-		glDeleteRenderbuffersOES(1, &depthRenderbuffer);
-		depthRenderbuffer = 0;
-	}
-}
-
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    self.context = [[EAGLContext alloc]
-                    initWithAPI:kEAGLRenderingAPIOpenGLES1];
-    
-    if (!self.context) {
-        NSLog(@"Failed to create ES context");
-    }
-    
-    T2DView *view = (T2DView *) self.view;
-    view.context = self.context;
-    
-	if( AccelerometerUpdateMS <= 0 ) {
-        //Luma:	This variable needs to be store MS value, not Seconds value
-        AccelerometerUpdateMS = 33; // 33 ms
-	}
-	
-	//Luma: Do division by 1000.0f here to get the seconds value that the UIAccelerometer needs
-	//[[UIAccelerometer sharedAccelerometer] setUpdateInterval:(AccelerometerUpdateMS / 1000.0f)];//this value is in seconds
-	//[[UIAccelerometer sharedAccelerometer] setDelegate:self];
-    
-	[EAGLContext setCurrentContext:self.context];
-	[self createFramebuffer];
-	
-    view.isLayedOut = true;
-    
-    //by default, we are in portrait(upright) mode
-	view.currentAngle = (M_PI / 2.0);
-    
-    platState.multipleTouchesEnabled = true;
-    [self.view setMultipleTouchEnabled:YES];
-    
-    retinaEnabled = false;
-    
-    if([[UIScreen mainScreen] respondsToSelector:@selector(scale)] && [[UIScreen mainScreen] scale] == 2)
-        retinaEnabled = true;
-    
-    UIApplication * application = [UIApplication sharedApplication];
-    id appDelegate = [application delegate];
-    
-	_AndroidTorqueFatalError = false;
-	if(!_AndroidRunTorqueMain( appDelegate, self.view, self ))
-	{
-		_AndroidTorqueFatalError = true;
-		return;
-	};
-}
-
-- (void)viewDidUnload
-{
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    if ([EAGLContext currentContext] == self.context) {
-        [EAGLContext setCurrentContext:nil];
-    }
-    
-    self.context = nil;
-}
-
-- (void)update
-{
-    _AndroidGameInnerLoop();
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    // Return YES for supported orientations
-    
-    switch (interfaceOrientation)
-    {
-        case UIDeviceOrientationPortraitUpsideDown:
-            return mOrientationPortraitUpsideDownSupported;
-            break;
-            
-        case UIDeviceOrientationPortrait:
-            return mOrientationPortraitSupported;
-            break;
-            
-        case UIDeviceOrientationLandscapeRight:
-            return mOrientationLandscapeRightSupported;
-            break;
-            
-        case UIDeviceOrientationLandscapeLeft:
-            return mOrientationLandscapeLeftSupported;
-            break;
-            
-        default:
-            break;
-    }
-    
-    return NO;
-}
-
-
-- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation
-{
-    return UIInterfaceOrientationLandscapeRight;
-}
-
-void supportLandscape( bool enable)
-{
-    platState.viewController->mOrientationLandscapeLeftSupported = enable;
-    platState.viewController->mOrientationLandscapeRightSupported = enable;
-}
-
-ConsoleFunction(supportLandscape, void, 2, 2, "supportLandscape( bool ) "
-                "enable or disable Landscape")
-{
-    bool enable = true;
-    if( argc > 1 )
-        enable = dAtob( argv[1] );
-    
-    supportLandscape(enable);
-}
-
-void supportPortrait( bool enable )
-{
-    platState.viewController->mOrientationPortraitSupported = enable;
-    platState.viewController->mOrientationPortraitUpsideDownSupported = enable;
-}
-
-ConsoleFunction(supportPortrait, void, 2, 2, "supportPortrait( bool ) "
-                "enable or disable portrait")
-{
-    bool enable = true;
-    if( argc > 1 )
-        enable = dAtob( argv[1] );
-    
-    supportPortrait(enable);
-}
-
-
-- (void)viewDidLayoutSubviews
-{
-    [self destroyFramebuffer];
-	[self createFramebuffer];
-}
-
-@end
-*/

engine/source/platformAndroid/main.cpp

@@ -19,10 +19,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
-#import "platformAndroid/platformAndroid.h"
-#import "platformAndroid/T2DAppDelegate.h"
-#import "platformAndroid/AndroidEvents.h"
-#import "platformAndroid/AndroidUtil.h"
+#include "platformAndroid/platformAndroid.h"
+#include "platformAndroid/AndroidEvents.h"
+#include "platformAndroid/AndroidUtil.h"
 #include "platform/threads/thread.h"
 #include "game/gameInterface.h"
 #include "io/fileObject.h"
@@ -34,10 +33,10 @@ S32 gLastStart = 0;
 bool appIsRunning = true;
 
 //TODO: android
-/*
-int _AndroidRunTorqueMain( id appID, UIView * Window, T2DViewController *viewController)
-{
 
+int _AndroidRunTorqueMain()
+{
+/*
     UIApplication *app = [UIApplication sharedApplication];
     platState.viewController = viewController;
     
@@ -57,8 +56,9 @@ int _AndroidRunTorqueMain( id appID, UIView * Window, T2DViewController *viewCon
 	{
 		return 0;
 	}
+	*/
 }
-*/
+
 
 void _AndroidGameInnerLoop()
 {

engine/source/platformAndroid/platformAndroid.h

@@ -28,9 +28,7 @@
 #include "platformAndroid/AndroidEvents.h"
 
 #include "platformAndroid/AndroidOGLVideo.h"
-
-#include "platformAndroid/T2DView.h"
-#include "platformAndroid/T2DViewController.h"
+#include "platformAndroid/T2DActivity.h"
 
 // Mich Note: Do not try to spend too much time analyzing this class.
 // It is planned to refactor the Android platform layer and replace this