android-studio 2.2.3 support

engine/compilers/android-studio/android-studio.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="android-studio" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" version="4">
+<module external.linked.project.id="android-studio" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

engine/compilers/android-studio/app/app.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -22,6 +22,11 @@
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
+    <facet type="native-android-gradle" name="Native-Android-Gradle">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
@@ -47,7 +52,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -55,7 +59,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -64,40 +67,33 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/game" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndkBuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -105,7 +101,187 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
+    <content url="file://$MODULE_DIR$/../../../lib/libogg/src">
+      <sourceFolder url="file://$MODULE_DIR$/../../../lib/libogg/src" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../lib/libvorbis">
+      <sourceFolder url="file://$MODULE_DIR$/../../../lib/libvorbis" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../lib/ljpeg">
+      <sourceFolder url="file://$MODULE_DIR$/../../../lib/ljpeg" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../lib/lpng">
+      <sourceFolder url="file://$MODULE_DIR$/../../../lib/lpng" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/2d/assets">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/2d/assets" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/2d/controllers">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/2d/controllers" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/2d/controllers/core">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/2d/controllers/core" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/2d/core">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/2d/core" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/2d/experimental/composites">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/2d/experimental/composites" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/2d/gui">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/2d/gui" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/2d/scene">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/2d/scene" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/2d/sceneobject">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/2d/sceneobject" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/Box2D/Collision">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/Box2D/Collision" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/Box2D/Collision/Shapes">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/Box2D/Collision/Shapes" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/Box2D/Common">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/Box2D/Common" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/Box2D/Dynamics">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/Box2D/Dynamics" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/Box2D/Dynamics/Contacts">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/Box2D/Dynamics/Contacts" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/Box2D/Dynamics/Joints">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/Box2D/Dynamics/Joints" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/Box2D/Rope">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/Box2D/Rope" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/algorithm">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/algorithm" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/assets">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/assets" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/audio">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/audio" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/bitmapFont">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/bitmapFont" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/collection">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/collection" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/component">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/component" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/component/behaviors">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/component/behaviors" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/console">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/console" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/debug">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/debug" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/debug/remote">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/debug/remote" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/delegates">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/delegates" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/game">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/game" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/graphics">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/graphics" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/gui">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/gui" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/gui/buttons">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/gui/buttons" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/gui/containers">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/gui/containers" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/gui/editor">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/gui/editor" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/gui/language">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/gui/language" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/input">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/input" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/io">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/io" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/io/resource">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/io/resource" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/io/zip">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/io/zip" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/math">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/math" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/memory">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/memory" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/messaging">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/messaging" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/module">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/module" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/network">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/network" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/persistence">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/persistence" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/persistence/taml">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/persistence/taml" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/persistence/taml/binary">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/persistence/taml/binary" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/persistence/taml/json">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/persistence/taml/json" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/persistence/taml/xml">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/persistence/taml/xml" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/persistence/tinyXML">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/persistence/tinyXML" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/platform">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/platform" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/platform/menus">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/platform/menus" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/platform/nativeDialogs">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/platform/nativeDialogs" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/platformAndroid">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/platformAndroid" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/platformAndroid/menus">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/platformAndroid/menus" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/sim">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/sim" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/spine">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/spine" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../source/string">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source/string" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

engine/compilers/android-studio/app/build.gradle

@@ -1,10 +1,9 @@
 apply plugin: 'com.android.application'
 
-/*import org.apache.tools.ant.taskdefs.condition.Os*/
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
 
     externalNativeBuild{
         ndkBuild{
@@ -14,34 +13,18 @@ android {
     defaultConfig {
         applicationId "com.garagegames.torque2d"
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 25
 
         sourceSets.main {
             assets.srcDirs=[
                     'src/main/assets',
                     'src/main/game'
             ]
-           // jni.srcDirs = ['../../../source/']
-           // jniLibs.srcDir 'src/main/libs'
 
+            ndk {
+                     abiFilters 'x86', 'x86_64', 'armeabi-v7a'
+            }
         }
-       /* task buildNative(type: Exec, description: 'Compile JNI source via NDK') {
-            def ndkDir = plugins.getPlugin('com.android.application').sdkHandler.getNdkFolder()
-            def extension = (Os.isFamily(Os.FAMILY_WINDOWS))? '.cmd' : ''
-            commandLine "$ndkDir/ndk-build" + extension,
-                    '-C', file('src/main/jni').absolutePath,
-                    '-j', Runtime.runtime.availableProcessors(),
-                    'all',
-                    'NDK_DEBUG=1'
-        }*/
-
-       /* task cleanNative(type: Exec, description: 'Clean JNI object files') {
-            def ndkDir = plugins.getPlugin('com.android.application').sdkHandler.getNdkFolder()
-            def extension = (Os.isFamily(Os.FAMILY_WINDOWS))? '.cmd' : ''
-            commandLine "$ndkDir/ndk-build" + extension,
-                    '-C', file('src/main/jni').absolutePath,
-                    'clean'
-        }*/
 
         task copyGame(type: Copy, description: 'Copy torque scripts and modules'){
             from('../../../../'){
@@ -67,18 +50,12 @@ android {
             delete 'src/main/game/'
         }
 
-        /*clean.dependsOn 'cleanNative'*/
         clean.dependsOn 'wipeGame'
 
         tasks.withType(JavaCompile) {
             compileTask -> compileTask.dependsOn copyGame
         }
-        /*tasks.withType(JavaCompile) {
-            compileTask -> compileTask.dependsOn buildNative
-        }*/
-        /*tasks.withType(com.android.build.gradle.tasks.NdkCompile){task->
-            task.enabled = false
-        }*/
+
 
     }
 

engine/compilers/android-studio/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-alpha7'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 

engine/source/gui/editor/guiGraphCtrl.cc

@@ -120,10 +120,10 @@ void GuiGraphCtrl::onRender(Point2I offset, const RectI &updateRect)
 					temp2 = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)sample);
 
 				GLfloat verts[] = {
-					getPosition().x + temp1, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale),
-					getPosition().x + temp2, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale),
-					getPosition().x + temp2, getPosition().y + getExtent().y,//may need to switch these last two
-					getPosition().x + temp1, getPosition().y + getExtent().y,				
+					static_cast<GLfloat>(getPosition().x + temp1), static_cast<GLfloat>((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)),
+					static_cast<GLfloat>(getPosition().x + temp2), static_cast<GLfloat>((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)),
+					static_cast<GLfloat>(getPosition().x + temp2), static_cast<GLfloat>(getPosition().y + getExtent().y),//may need to switch these last two
+					static_cast<GLfloat>(getPosition().x + temp1), static_cast<GLfloat>(getPosition().y + getExtent().y),
 				};
 				glVertexPointer(2, GL_FLOAT, 0, verts);
 				glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -149,10 +149,10 @@ void GuiGraphCtrl::onRender(Point2I offset, const RectI &updateRect)
 					temp2 = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)sample);
 
 				GLfloat verts[] = {
-					getPosition().x + temp1, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale),
-					getPosition().x + temp2, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample+1) * Scale),
-					getPosition().x + temp2, getPosition().y + getExtent().y,//may need to switch these last two
-					getPosition().x + temp1, getPosition().y + getExtent().y,
+						static_cast<GLfloat>(getPosition().x + temp1), static_cast<GLfloat>((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)),
+						static_cast<GLfloat>(getPosition().x + temp2), static_cast<GLfloat>((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample+1) * Scale)),
+						static_cast<GLfloat>(getPosition().x + temp2), static_cast<GLfloat>(getPosition().y + getExtent().y),//may need to switch these last two
+						static_cast<GLfloat>(getPosition().x + temp1), static_cast<GLfloat>(getPosition().y + getExtent().y),
 				};
 				glVertexPointer(2, GL_FLOAT, 0, verts);
 				glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -170,10 +170,10 @@ void GuiGraphCtrl::onRender(Point2I offset, const RectI &updateRect)
 				temp2 = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)sample);
 
 			GLfloat last[] = {
-				getPosition().x + temp1, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale),
-				getPosition().x + temp2, (getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale),
-				getPosition().x + temp2, getPosition().y + getExtent().y,
-				getPosition().x + temp1, getPosition().y + getExtent().y,
+					static_cast<GLfloat>(getPosition().x + temp1), static_cast<GLfloat>((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)),
+					static_cast<GLfloat>(getPosition().x + temp2), static_cast<GLfloat>((getPosition().y + getExtent().y) - (S32)(getDatum(k, sample) * Scale)),
+					static_cast<GLfloat>(getPosition().x + temp2), static_cast<GLfloat>(getPosition().y + getExtent().y),
+					static_cast<GLfloat>(getPosition().x + temp1), static_cast<GLfloat>(getPosition().y + getExtent().y),
 			};
 			glVertexPointer(2, GL_FLOAT, 0, last);
 			glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -194,7 +194,7 @@ void GuiGraphCtrl::onRender(Point2I offset, const RectI &updateRect)
 				temp = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)0);
 			
 			GLfloat verts[] = {
-				getPosition().x + temp, getPosition().y + getExtent().y - (S32)(getDatum(k, 0) * Scale),
+					static_cast<GLfloat>(getPosition().x + temp), static_cast<GLfloat>(getPosition().y + getExtent().y - (S32)(getDatum(k, 0) * Scale)),
 				0, 0
 			};
 			

engine/source/gui/guiColorPicker.cc

@@ -103,8 +103,8 @@ void GuiColorPickerCtrl::initPersistFields()
 #if defined(TORQUE_OS_IOS) || defined(TORQUE_OS_ANDROID) || defined(TORQUE_OS_EMSCRIPTEN)
 void dglDrawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, ColorF &c3, ColorF &c4)
 {
-   S32 left = bounds.point.x, right = bounds.point.x + bounds.extent.x - 1;
-   S32 top = bounds.point.y, bottom = bounds.point.y + bounds.extent.y - 1;
+   GLfloat left = bounds.point.x, right = bounds.point.x + bounds.extent.x - 1;
+   GLfloat top = bounds.point.y, bottom = bounds.point.y + bounds.extent.y - 1;
    
    glEnable(GL_BLEND);
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -117,10 +117,10 @@ void dglDrawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, ColorF &c3, ColorF &
         right,   bottom,
     };
     const GLubyte squareColors[] = {
-        255 * c1.red, 255 * c1.green, 255 * c1.blue, 255 * c1.alpha,
-        255 * c2.red, 255 * c2.green, 255 * c2.blue, 255 * c2.alpha,
-        255 * c3.red, 255 * c3.green, 255 * c3.blue, 255 * c3.alpha,
-        255 * c4.red, 255 * c4.green, 255 * c4.blue, 255 * c4.alpha,
+        static_cast<GLubyte>(255 * c1.red),  static_cast<GLubyte>(255 * c1.green),  static_cast<GLubyte>(255 * c1.blue),  static_cast<GLubyte>(255 * c1.alpha),
+        static_cast<GLubyte>(255 * c2.red),  static_cast<GLubyte>(255 * c2.green),  static_cast<GLubyte>(255 * c2.blue),  static_cast<GLubyte>(255 * c2.alpha),
+        static_cast<GLubyte>(255 * c3.red),  static_cast<GLubyte>(255 * c3.green),  static_cast<GLubyte>(255 * c3.blue),  static_cast<GLubyte>(255 * c3.alpha),
+        static_cast<GLubyte>(255 * c4.red),  static_cast<GLubyte>(255 * c4.green),  static_cast<GLubyte>(255 * c4.blue),  static_cast<GLubyte>(255 * c4.alpha),
     };
     glVertexPointer(2, GL_FLOAT, 0, verts);
     glEnableClientState(GL_VERTEX_ARRAY);

engine/source/platformAndroid/android_native_app_glue.h

@@ -0,0 +1,349 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef _ANDROID_NATIVE_APP_GLUE_H
+#define _ANDROID_NATIVE_APP_GLUE_H
+
+#include <poll.h>
+#include <pthread.h>
+#include <sched.h>
+
+#include <android/configuration.h>
+#include <android/looper.h>
+#include <android/native_activity.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * The native activity interface provided by <android/native_activity.h>
+ * is based on a set of application-provided callbacks that will be called
+ * by the Activity's main thread when certain events occur.
+ *
+ * This means that each one of this callbacks _should_ _not_ block, or they
+ * risk having the system force-close the application. This programming
+ * model is direct, lightweight, but constraining.
+ *
+ * The 'threaded_native_app' static library is used to provide a different
+ * execution model where the application can implement its own main event
+ * loop in a different thread instead. Here's how it works:
+ *
+ * 1/ The application must provide a function named "android_main()" that
+ *    will be called when the activity is created, in a new thread that is
+ *    distinct from the activity's main thread.
+ *
+ * 2/ android_main() receives a pointer to a valid "android_app" structure
+ *    that contains references to other important objects, e.g. the
+ *    ANativeActivity obejct instance the application is running in.
+ *
+ * 3/ the "android_app" object holds an ALooper instance that already
+ *    listens to two important things:
+ *
+ *      - activity lifecycle events (e.g. "pause", "resume"). See APP_CMD_XXX
+ *        declarations below.
+ *
+ *      - input events coming from the AInputQueue attached to the activity.
+ *
+ *    Each of these correspond to an ALooper identifier returned by
+ *    ALooper_pollOnce with values of LOOPER_ID_MAIN and LOOPER_ID_INPUT,
+ *    respectively.
+ *
+ *    Your application can use the same ALooper to listen to additional
+ *    file-descriptors.  They can either be callback based, or with return
+ *    identifiers starting with LOOPER_ID_USER.
+ *
+ * 4/ Whenever you receive a LOOPER_ID_MAIN or LOOPER_ID_INPUT event,
+ *    the returned data will point to an android_poll_source structure.  You
+ *    can call the process() function on it, and fill in android_app->onAppCmd
+ *    and android_app->onInputEvent to be called for your own processing
+ *    of the event.
+ *
+ *    Alternatively, you can call the low-level functions to read and process
+ *    the data directly...  look at the process_cmd() and process_input()
+ *    implementations in the glue to see how to do this.
+ *
+ * See the sample named "native-activity" that comes with the NDK with a
+ * full usage example.  Also look at the JavaDoc of NativeActivity.
+ */
+
+struct android_app;
+
+/**
+ * Data associated with an ALooper fd that will be returned as the "outData"
+ * when that source has data ready.
+ */
+struct android_poll_source {
+    // The identifier of this source.  May be LOOPER_ID_MAIN or
+    // LOOPER_ID_INPUT.
+    int32_t id;
+
+    // The android_app this ident is associated with.
+    struct android_app* app;
+
+    // Function to call to perform the standard processing of data from
+    // this source.
+    void (*process)(struct android_app* app, struct android_poll_source* source);
+};
+
+/**
+ * This is the interface for the standard glue code of a threaded
+ * application.  In this model, the application's code is running
+ * in its own thread separate from the main thread of the process.
+ * It is not required that this thread be associated with the Java
+ * VM, although it will need to be in order to make JNI calls any
+ * Java objects.
+ */
+struct android_app {
+    // The application can place a pointer to its own state object
+    // here if it likes.
+    void* userData;
+
+    // Fill this in with the function to process main app commands (APP_CMD_*)
+    void (*onAppCmd)(struct android_app* app, int32_t cmd);
+
+    // Fill this in with the function to process input events.  At this point
+    // the event has already been pre-dispatched, and it will be finished upon
+    // return.  Return 1 if you have handled the event, 0 for any default
+    // dispatching.
+    int32_t (*onInputEvent)(struct android_app* app, AInputEvent* event);
+
+    // The ANativeActivity object instance that this app is running in.
+    ANativeActivity* activity;
+
+    // The current configuration the app is running in.
+    AConfiguration* config;
+
+    // This is the last instance's saved state, as provided at creation time.
+    // It is NULL if there was no state.  You can use this as you need; the
+    // memory will remain around until you call android_app_exec_cmd() for
+    // APP_CMD_RESUME, at which point it will be freed and savedState set to NULL.
+    // These variables should only be changed when processing a APP_CMD_SAVE_STATE,
+    // at which point they will be initialized to NULL and you can malloc your
+    // state and place the information here.  In that case the memory will be
+    // freed for you later.
+    void* savedState;
+    size_t savedStateSize;
+
+    // The ALooper associated with the app's thread.
+    ALooper* looper;
+
+    // When non-NULL, this is the input queue from which the app will
+    // receive user input events.
+    AInputQueue* inputQueue;
+
+    // When non-NULL, this is the window surface that the app can draw in.
+    ANativeWindow* window;
+
+    // Current content rectangle of the window; this is the area where the
+    // window's content should be placed to be seen by the user.
+    ARect contentRect;
+
+    // Current state of the app's activity.  May be either APP_CMD_START,
+    // APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP; see below.
+    int activityState;
+
+    // This is non-zero when the application's NativeActivity is being
+    // destroyed and waiting for the app thread to complete.
+    int destroyRequested;
+
+    // -------------------------------------------------
+    // Below are "private" implementation of the glue code.
+
+    pthread_mutex_t mutex;
+    pthread_cond_t cond;
+
+    int msgread;
+    int msgwrite;
+
+    pthread_t thread;
+
+    struct android_poll_source cmdPollSource;
+    struct android_poll_source inputPollSource;
+
+    int running;
+    int stateSaved;
+    int destroyed;
+    int redrawNeeded;
+    AInputQueue* pendingInputQueue;
+    ANativeWindow* pendingWindow;
+    ARect pendingContentRect;
+};
+
+enum {
+    /**
+     * Looper data ID of commands coming from the app's main thread, which
+     * is returned as an identifier from ALooper_pollOnce().  The data for this
+     * identifier is a pointer to an android_poll_source structure.
+     * These can be retrieved and processed with android_app_read_cmd()
+     * and android_app_exec_cmd().
+     */
+            LOOPER_ID_MAIN = 1,
+
+    /**
+     * Looper data ID of events coming from the AInputQueue of the
+     * application's window, which is returned as an identifier from
+     * ALooper_pollOnce().  The data for this identifier is a pointer to an
+     * android_poll_source structure.  These can be read via the inputQueue
+     * object of android_app.
+     */
+            LOOPER_ID_INPUT = 2,
+
+    /**
+     * Start of user-defined ALooper identifiers.
+     */
+            LOOPER_ID_USER = 3,
+};
+
+enum {
+    /**
+     * Command from main thread: the AInputQueue has changed.  Upon processing
+     * this command, android_app->inputQueue will be updated to the new queue
+     * (or NULL).
+     */
+            APP_CMD_INPUT_CHANGED,
+
+    /**
+     * Command from main thread: a new ANativeWindow is ready for use.  Upon
+     * receiving this command, android_app->window will contain the new window
+     * surface.
+     */
+            APP_CMD_INIT_WINDOW,
+
+    /**
+     * Command from main thread: the existing ANativeWindow needs to be
+     * terminated.  Upon receiving this command, android_app->window still
+     * contains the existing window; after calling android_app_exec_cmd
+     * it will be set to NULL.
+     */
+            APP_CMD_TERM_WINDOW,
+
+    /**
+     * Command from main thread: the current ANativeWindow has been resized.
+     * Please redraw with its new size.
+     */
+            APP_CMD_WINDOW_RESIZED,
+
+    /**
+     * Command from main thread: the system needs that the current ANativeWindow
+     * be redrawn.  You should redraw the window before handing this to
+     * android_app_exec_cmd() in order to avoid transient drawing glitches.
+     */
+            APP_CMD_WINDOW_REDRAW_NEEDED,
+
+    /**
+     * Command from main thread: the content area of the window has changed,
+     * such as from the soft input window being shown or hidden.  You can
+     * find the new content rect in android_app::contentRect.
+     */
+            APP_CMD_CONTENT_RECT_CHANGED,
+
+    /**
+     * Command from main thread: the app's activity window has gained
+     * input focus.
+     */
+            APP_CMD_GAINED_FOCUS,
+
+    /**
+     * Command from main thread: the app's activity window has lost
+     * input focus.
+     */
+            APP_CMD_LOST_FOCUS,
+
+    /**
+     * Command from main thread: the current device configuration has changed.
+     */
+            APP_CMD_CONFIG_CHANGED,
+
+    /**
+     * Command from main thread: the system is running low on memory.
+     * Try to reduce your memory use.
+     */
+            APP_CMD_LOW_MEMORY,
+
+    /**
+     * Command from main thread: the app's activity has been started.
+     */
+            APP_CMD_START,
+
+    /**
+     * Command from main thread: the app's activity has been resumed.
+     */
+            APP_CMD_RESUME,
+
+    /**
+     * Command from main thread: the app should generate a new saved state
+     * for itself, to restore from later if needed.  If you have saved state,
+     * allocate it with malloc and place it in android_app.savedState with
+     * the size in android_app.savedStateSize.  The will be freed for you
+     * later.
+     */
+            APP_CMD_SAVE_STATE,
+
+    /**
+     * Command from main thread: the app's activity has been paused.
+     */
+            APP_CMD_PAUSE,
+
+    /**
+     * Command from main thread: the app's activity has been stopped.
+     */
+            APP_CMD_STOP,
+
+    /**
+     * Command from main thread: the app's activity is being destroyed,
+     * and waiting for the app thread to clean up and exit before proceeding.
+     */
+            APP_CMD_DESTROY,
+};
+
+/**
+ * Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next
+ * app command message.
+ */
+int8_t android_app_read_cmd(struct android_app* android_app);
+
+/**
+ * Call with the command returned by android_app_read_cmd() to do the
+ * initial pre-processing of the given command.  You can perform your own
+ * actions for the command after calling this function.
+ */
+void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd);
+
+/**
+ * Call with the command returned by android_app_read_cmd() to do the
+ * final post-processing of the given command.  You must have done your own
+ * actions for the command before calling this function.
+ */
+void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd);
+
+/**
+ * Dummy function you can call to ensure glue code isn't stripped.
+ */
+void app_dummy();
+
+/**
+ * This is the function that application code must implement, representing
+ * the main entry to the app.
+ */
+extern void android_main(struct android_app* app);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ANDROID_NATIVE_APP_GLUE_H */