fixed super jumper help screens for GLES 2.0

diff --git a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios.userprefs b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios.userprefs
index bac7b2d..66af75b 100644 (file)
--- a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios.userprefs
+++ b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios.userprefs
@@ -1,9 +1,8 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="gdx-invaders-ios/Info.plist">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="gdx-invaders-ios/Main.cs">
     <Files>
-      <File FileName="gdx-invaders-ios/Main.cs" Line="8" Column="20" />
-      <File FileName="gdx-invaders-ios/Info.plist" />
+      <File FileName="gdx-invaders-ios/Main.cs" Line="9" Column="24" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>

diff --git a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/gdx-invaders-ios.csproj b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/gdx-invaders-ios.csproj
index 2084f0c..a612bba 100644 (file)
--- a/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/gdx-invaders-ios.csproj
+++ b/demos/invaders/gdx-invaders-ios/gdx-invaders-ios/gdx-invaders-ios.csproj
@@ -60,6 +60,14 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>True</MtouchDebug>
     <MtouchProfiling>True</MtouchProfiling>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../gdx-invaders/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;invaders.dll&quot; -DEXCLUDE=&quot;**/GdxInvadersDesktop.java&quot; -v" workingdir="${ProjectDir}" />
+      </CustomCommands>
+    </CustomCommands>
+    <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
+    <MtouchArch>ARMv7</MtouchArch>
+    <MtouchI18n>west</MtouchI18n>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -69,9 +77,15 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseLlvm>True</MtouchUseLlvm>
     <IpaPackageName />
     <MtouchI18n>west</MtouchI18n>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../gdx-invaders/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;invaders.dll&quot; -DEXCLUDE=&quot;**/GdxInvadersDesktop.java&quot; -v" workingdir="${ProjectDir}" />
+      </CustomCommands>
+    </CustomCommands>
+    <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
+    <MtouchArch>ARMv7</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>

diff --git a/demos/superjumper/superjumper-ios/superjumper-ios.userprefs b/demos/superjumper/superjumper-ios/superjumper-ios.userprefs
index d6586c5..87291ab 100644 (file)
--- a/demos/superjumper/superjumper-ios/superjumper-ios.userprefs
+++ b/demos/superjumper/superjumper-ios/superjumper-ios.userprefs
@@ -1,10 +1,9 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhoneSimulator" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="../../../../ikvm/ikvm-monotouch/runtime/JniInterface.cs">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="superjumper-ios/Main.cs">
     <Files>
-      <File FileName="superjumper-ios/Main.cs" Line="22" Column="4" />
+      <File FileName="superjumper-ios/Main.cs" Line="19" Column="4" />
       <File FileName="superjumper-ios/Info.plist" />
-      <File FileName="../../../../ikvm/ikvm-monotouch/runtime/JniInterface.cs" Line="1316" Column="24" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>

diff --git a/demos/superjumper/superjumper-ios/superjumper-ios/Main.cs b/demos/superjumper/superjumper-ios/superjumper-ios/Main.cs
index 0247cee..3c465c5 100644 (file)
--- a/demos/superjumper/superjumper-ios/superjumper-ios/Main.cs
+++ b/demos/superjumper/superjumper-ios/superjumper-ios/Main.cs
@@ -13,9 +13,17 @@ namespace superjumperios
        {
                [Register ("AppDelegate")]
                public partial class AppDelegate : IOSApplication {
-                       public AppDelegate(): base(new SuperJumper(), new IOSApplicationConfiguration()) {
+                       public AppDelegate(): base(new SuperJumper(), getConfig()) {
 
                        }
+
+                       internal static IOSApplicationConfiguration getConfig() {
+                               IOSApplicationConfiguration config = new IOSApplicationConfiguration();
+                               config.orientationLandscape = false;
+                               config.orientationPortrait = true;
+                               config.useAccelerometer = true;
+                               return config;
+                       }
                }
                
                static void Main (string[] args)

diff --git a/demos/superjumper/superjumper-ios/superjumper-ios/superjumper-ios.csproj b/demos/superjumper/superjumper-ios/superjumper-ios/superjumper-ios.csproj
index 745c854..cb3f22e 100644 (file)
--- a/demos/superjumper/superjumper-ios/superjumper-ios/superjumper-ios.csproj
+++ b/demos/superjumper/superjumper-ios/superjumper-ios/superjumper-ios.csproj
@@ -79,9 +79,15 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseLlvm>True</MtouchUseLlvm>
     <IpaPackageName />
     <MtouchI18n>west</MtouchI18n>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../superjumper/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;superjumper.dll&quot; -DEXCLUDE=&quot;**/SuperJumperDesktop.java&quot; -v" workingdir="${ProjectDir}" />
+      </CustomCommands>
+    </CustomCommands>
+    <MtouchArch>ARMv7</MtouchArch>
+    <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>

diff --git a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen.java b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen.java
index 1dbfdef..7e68a9a 100644 (file)
--- a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen.java
+++ b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen.java
@@ -67,6 +67,7 @@ public class HelpScreen implements Screen {
                gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                guiCam.update();\r
 \r
+               batcher.setProjectionMatrix(guiCam.combined);\r
                batcher.disableBlending();\r
                batcher.begin();\r
                batcher.draw(helpRegion, 0, 0, 320, 480);\r

diff --git a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen2.java b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen2.java
index cef6767..370956b 100644 (file)
--- a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen2.java
+++ b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen2.java
@@ -67,6 +67,7 @@ public class HelpScreen2 implements Screen {
                gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                guiCam.update();\r
 \r
+               batcher.setProjectionMatrix(guiCam.combined);\r
                batcher.disableBlending();\r
                batcher.begin();\r
                batcher.draw(helpRegion, 0, 0, 320, 480);\r

diff --git a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen3.java b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen3.java
index 9d6520b..201d2d1 100644 (file)
--- a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen3.java
+++ b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen3.java
@@ -67,6 +67,7 @@ public class HelpScreen3 implements Screen {
                gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                guiCam.update();\r
 \r
+               batcher.setProjectionMatrix(guiCam.combined);\r
                batcher.disableBlending();\r
                batcher.begin();\r
                batcher.draw(helpRegion, 0, 0, 320, 480);\r

diff --git a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen4.java b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen4.java
index ab85d3f..07a4359 100644 (file)
--- a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen4.java
+++ b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen4.java
@@ -67,6 +67,7 @@ public class HelpScreen4 implements Screen {
                gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                guiCam.update();\r
 \r
+               batcher.setProjectionMatrix(guiCam.combined);\r
                batcher.disableBlending();\r
                batcher.begin();\r
                batcher.draw(helpRegion, 0, 0, 320, 480);\r

diff --git a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen5.java b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen5.java
index 67fbfce..facafe3 100644 (file)
--- a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen5.java
+++ b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen5.java
@@ -67,6 +67,7 @@ public class HelpScreen5 implements Screen {
                gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                guiCam.update();\r
 \r
+               batcher.setProjectionMatrix(guiCam.combined);\r
                batcher.disableBlending();\r
                batcher.begin();\r
                batcher.draw(helpRegion, 0, 0, 320, 480);\r

diff --git a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HighscoresScreen.java b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HighscoresScreen.java
index a9e1d72..abae464 100644 (file)
--- a/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HighscoresScreen.java
+++ b/demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HighscoresScreen.java
@@ -69,6 +69,7 @@ public class HighscoresScreen implements Screen {
                gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                guiCam.update();\r
 \r
+               batcher.setProjectionMatrix(guiCam.combined);\r
                batcher.disableBlending();\r
                batcher.begin();\r
                batcher.draw(Assets.backgroundRegion, 0, 0, 320, 480);\r