OSDN Git Service

added test listener, updated natives for ios..
authorbadlogic <contact@badlogicgames.com>
Tue, 9 Oct 2012 22:03:27 +0000 (00:03 +0200)
committerbadlogic <contact@badlogicgames.com>
Tue, 9 Oct 2012 22:03:27 +0000 (00:03 +0200)
backends/gdx-backend-iosmonotouch/mono/mono/libgdx.a
demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs
tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.sln
tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/Main.cs
tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/libgdx.a

index 79e81af..31e490f 100644 (file)
Binary files a/backends/gdx-backend-iosmonotouch/mono/mono/libgdx.a and b/backends/gdx-backend-iosmonotouch/mono/mono/libgdx.a differ
index c9e1725..9416360 100644 (file)
@@ -2,7 +2,7 @@
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
   <MonoDevelop.Ide.Workbench ActiveDocument="gdx-vectorpinball-ios/Main.cs">
     <Files>
-      <File FileName="gdx-vectorpinball-ios/Main.cs" Line="25" Column="18" />
+      <File FileName="gdx-vectorpinball-ios/Main.cs" Line="16" Column="2" />
       <File FileName="gdx-vectorpinball-ios/Info.plist" />
     </Files>
   </MonoDevelop.Ide.Workbench>
index 94fce8c..8f57fc4 100644 (file)
@@ -1,9 +1,7 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 11.00\r
 # Visual Studio 2010\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gdx-tests-iosmonotouch", "gdx-tests-iosmonotouch\gdx-tests-iosmonotouch.csproj", "{D4C6163A-37F9-48B5-9A04-6362E83D4F67}"\r
-EndProject\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "superjumper-ios", "..\..\demos\superjumper\superjumper-ios\superjumper-ios\superjumper-ios.csproj", "{E9434FE8-789E-4EF9-AD1E-40F73DBA497B}"\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gdx-tests-iosmonotouch", "gdx-tests-iosmonotouch\gdx-tests-iosmonotouch.csproj", "{E9434FE8-789E-4EF9-AD1E-40F73DBA497B}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -15,18 +13,6 @@ Global
                AppStore|iPhone = AppStore|iPhone\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.AppStore|iPhone.ActiveCfg = AppStore|iPhone\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.AppStore|iPhone.Build.0 = AppStore|iPhone\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Debug|iPhone.ActiveCfg = Debug|iPhone\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Debug|iPhone.Build.0 = Debug|iPhone\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Release|iPhone.ActiveCfg = Release|iPhone\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Release|iPhone.Build.0 = Release|iPhone\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator\r
-               {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator\r
                {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone\r
                {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone\r
                {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.AppStore|iPhone.ActiveCfg = AppStore|iPhone\r
index 9b92c5b..edef15b 100644 (file)
@@ -4,17 +4,27 @@ using System.Linq;
 
 using MonoTouch.Foundation;
 using MonoTouch.UIKit;
+using com.badlogic.gdx;
+using com.badlogic.gdx.files;
+using com.badlogic.gdx.graphics.g2d;
 using com.badlogic.gdx.backends.ios;
 using com.badlogic.gdx.tests.gwt;
 using com.badlogic.gdx.tests;
 
 namespace superjumperios
 {              
+       public class TestListener: ApplicationAdapter {
+               public override void create() {
+                       FileHandle file = Gdx.files.@internal("data/uiskin.atlas").parent();
+                       new TextureAtlas(Gdx.files.@internal("data/uiskin.atlas"), false);
+               }
+       }
+
        public class Application
        {
                [Register ("AppDelegate")]
                public partial class AppDelegate : IOSApplication {
-                       public AppDelegate(): base(new SpriteBatchShaderTest(), new IOSApplicationConfiguration()) {
+                       public AppDelegate(): base(new UITest(), new IOSApplicationConfiguration()) {
                                
                        }
                }
index 7546d1c..79e81af 100644 (file)
Binary files a/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/libgdx.a and b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/libgdx.a differ