Started adding in android activity code. Removed the iOS classes that are not needed

engine/compilers/android/.classpath

@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

engine/compilers/android/.cproject

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="com.android.toolchain.gcc.1442582075">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.1442582075" moduleId="org.eclipse.cdt.core.settings" name="Default">
@@ -23,10 +25,9 @@
 							<builder arguments="NDEBUG=1" command="ndk-build" id="com.android.builder.1818800065" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder"/>
 							<tool id="com.android.gcc.compiler.1014866906" name="Android GCC Compiler" superClass="com.android.gcc.compiler">
 								<option id="com.android.gcc.option.includePath.100688008" superClass="com.android.gcc.option.includePath" valueType="includePath">
-									<listOptionValue builtIn="false" value="/Users/timmgt/androidDev/android-ndk-r8e/sources/cxx-stl/stlport/stlport"/>
-									<listOptionValue builtIn="false" value="/Users/timmgt/androidDev/android-ndk-r8e/platforms/android-14/arch-arm/usr/include"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Torque2D/jni/include/libpng}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Torque2D/jni/include/libjpeg}&quot;"/>
+									<listOptionValue builtIn="false" value="/Users/tnewell/androidDev/android-ndk-r9/sources/cxx-stl/stlport/stlport"/>
+									<listOptionValue builtIn="false" value="/Users/tnewell/androidDev/android-ndk-r9/platforms/android-14/arch-arm/usr/include"/>
 								</option>
 								<inputType id="com.android.gcc.inputType.2067917403" superClass="com.android.gcc.inputType"/>
 							</tool>
@@ -40,7 +41,9 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="Torque2D.null.1900297553" name="Torque2D"/>
 	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="1"/>
+	<storageModule moduleId="refreshScope" versionNumber="1">
+		<resource resourceType="PROJECT" workspacePath="/Torque2D"/>
+	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

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 \

engine/compilers/android/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-18

engine/source/platformAndroid/T2DActivity.cpp

@@ -0,0 +1,527 @@
+//-----------------------------------------------------------------------------
+// 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 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();
+
+// 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();
+
+bool 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 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 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( appDelegate, self.view, self ))
+	{
+		_AndroidTorqueFatalError = true;
+		return;
+	}
+}
+
+void finishShutdown()
+{
+	//TODO: android
+    // Release any retained subviews of the main view.
+    //if ([EAGLContext currentContext] == self.context) {
+      //  [EAGLContext setCurrentContext:nil];
+    //}
+    
+    //self.context = nil;
+}
+
+void update()
+{
+    _AndroidGameInnerLoop();
+}
+
+extern Vector<Event *> TouchMoveEvents;
+Vector<Point2I> lastTouches;
+
+// 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 (lastTouches.size() < i)
+        			lastTouches.push_back(point);
+        		else
+        		{
+        			lastTouches[i].x = point.x;
+        			lastTouches[i].y = point.y;
+        		}
+
+        	    S32 orientation = _AndroidGameGetOrientation();
+        	    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 = lastTouches[i];
+
+				S32 orientation = _AndroidGameGetOrientation();
+				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 = lastTouches[i];
+
+				S32 orientation = _AndroidGameGetOrientation();
+				if (UIDeviceOrientationIsPortrait(orientation))
+				{
+					point.y -= _AndroidGetPortraitTouchoffset();
+					prevPoint.y -= _AndroidGetPortraitTouchoffset();
+				}
+				createMouseMoveEvent(i, point.x, point.y, prevPoint.x, prevPoint.y);
+
+				lastTouches[i].x = point.x;
+				lastTouches[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 = lastTouches[i];
+
+				S32 orientation = _AndroidGameGetOrientation();
+				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;
+	 struct ifreq ifr;
+
+	 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);
+
+}
+
+
+- (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();
+}
+*/
+
+
+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);
+}
+

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

@@ -19,12 +19,11 @@
 // 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 T2DViewController : GLKViewController {
+
+class T2DViewController {
+
 	// The pixel dimensions of the backbuffer
 	GLint backingWidth;
 	GLint backingHeight;
@@ -32,7 +31,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 +40,15 @@
     
     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 );
+}

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
-*/