diff --git a/.gitignore b/.gitignore index dd92d374c41..c97ed7ceb6e 100644 --- a/.gitignore +++ b/.gitignore @@ -149,6 +149,11 @@ /tests/gdx-tests-gwt/gwt-unitCache /tests/gdx-tests-gwt/war +/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/bin +/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/target +/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/obj +/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/gdx-tests.dll + /tests/gdx-tests-jogl/bin /tests/gdx-tests-lwjgl/bin diff --git a/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs b/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs index 271bc61f8c0..4ef11dc07bb 100644 --- a/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs +++ b/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs @@ -1,8 +1,9 @@  - + + diff --git a/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.sln b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.sln new file mode 100644 index 00000000000..94fce8c5481 --- /dev/null +++ b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.sln @@ -0,0 +1,46 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gdx-tests-iosmonotouch", "gdx-tests-iosmonotouch\gdx-tests-iosmonotouch.csproj", "{D4C6163A-37F9-48B5-9A04-6362E83D4F67}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "superjumper-ios", "..\..\demos\superjumper\superjumper-ios\superjumper-ios\superjumper-ios.csproj", "{E9434FE8-789E-4EF9-AD1E-40F73DBA497B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|iPhoneSimulator = Debug|iPhoneSimulator + Release|iPhoneSimulator = Release|iPhoneSimulator + Debug|iPhone = Debug|iPhone + Release|iPhone = Release|iPhone + Ad-Hoc|iPhone = Ad-Hoc|iPhone + AppStore|iPhone = AppStore|iPhone + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.AppStore|iPhone.ActiveCfg = AppStore|iPhone + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.AppStore|iPhone.Build.0 = AppStore|iPhone + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Debug|iPhone.ActiveCfg = Debug|iPhone + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Debug|iPhone.Build.0 = Debug|iPhone + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Release|iPhone.ActiveCfg = Release|iPhone + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Release|iPhone.Build.0 = Release|iPhone + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {D4C6163A-37F9-48B5-9A04-6362E83D4F67}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.AppStore|iPhone.ActiveCfg = AppStore|iPhone + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.AppStore|iPhone.Build.0 = AppStore|iPhone + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Debug|iPhone.ActiveCfg = Debug|iPhone + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Debug|iPhone.Build.0 = Debug|iPhone + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Release|iPhone.ActiveCfg = Release|iPhone + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Release|iPhone.Build.0 = Release|iPhone + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = gdx-tests-iosmonotouch\gdx-tests-iosmonotouch.csproj + EndGlobalSection +EndGlobal diff --git a/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.userprefs b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.userprefs new file mode 100644 index 00000000000..886a1c2411c --- /dev/null +++ b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.userprefs @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/Info.plist b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/Info.plist new file mode 100644 index 00000000000..a93691df897 --- /dev/null +++ b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/Info.plist @@ -0,0 +1,28 @@ + + + + + MinimumOSVersion + 3.2 + UIDeviceFamily + + 1 + 2 + + UIStatusBarHidden + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/Main.cs b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/Main.cs new file mode 100644 index 00000000000..9b92c5bc1a8 --- /dev/null +++ b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/Main.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +using MonoTouch.Foundation; +using MonoTouch.UIKit; +using com.badlogic.gdx.backends.ios; +using com.badlogic.gdx.tests.gwt; +using com.badlogic.gdx.tests; + +namespace superjumperios +{ + public class Application + { + [Register ("AppDelegate")] + public partial class AppDelegate : IOSApplication { + public AppDelegate(): base(new SpriteBatchShaderTest(), new IOSApplicationConfiguration()) { + + } + } + + static void Main (string[] args) + { + UIApplication.Main (args, null, "AppDelegate"); + } + } +} diff --git a/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/convert.xml b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/convert.xml new file mode 100644 index 00000000000..b26d1d924ee --- /dev/null +++ b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/convert.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.csproj b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.csproj new file mode 100644 index 00000000000..2264bebe9f9 --- /dev/null +++ b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch.csproj @@ -0,0 +1,543 @@ + + + + Debug + iPhoneSimulator + 10.0.0 + 2.0 + {E9434FE8-789E-4EF9-AD1E-40F73DBA497B} + {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Exe + superjumperios + superjumperios + + + True + full + False + bin\iPhoneSimulator\Debug + DEBUG; + prompt + 4 + False + True + True + None + -nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a" + west + + + + + + + + none + True + bin\iPhoneSimulator\Release + prompt + 4 + False + None + -nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a" + west + True + + + True + full + False + bin\iPhone\Debug + DEBUG; + prompt + 4 + False + iPhone Developer + True + True + + + none + True + bin\iPhone\Release + prompt + 4 + False + iPhone Developer + True + + west + + + none + True + bin\iPhone\Ad-Hoc + prompt + 4 + False + True + iPhone Distribution + + + none + True + bin\iPhone\AppStore + prompt + 4 + False + iPhone Distribution + + + + + + + + ..\..\..\..\..\ikvm-monotouch\bin\ICSharpCode.SharpZipLib.dll + + + ..\..\..\..\..\ikvm-monotouch\bin\IKVM.OpenJDK.Beans.dll + + + ..\..\..\..\..\ikvm-monotouch\bin\IKVM.OpenJDK.Charsets.dll + + + ..\..\..\..\..\ikvm-monotouch\bin\IKVM.OpenJDK.Core.dll + + + ..\..\..\..\..\ikvm-monotouch\bin\IKVM.OpenJDK.Misc.dll + + + ..\..\..\..\..\ikvm-monotouch\bin\IKVM.OpenJDK.Text.dll + + + ..\..\..\..\..\ikvm-monotouch\bin\IKVM.OpenJDK.Util.dll + + + ..\..\..\..\..\ikvm-monotouch\bin\IKVM.Reflection.dll + + + ..\..\..\..\..\ikvm-monotouch\bin\IKVM.Runtime.JNI.dll + + + ..\..\..\..\..\ikvm-monotouch\bin\IKVM.Runtime.dll + + + ..\..\..\backends\gdx-backend-iosmonotouch\libs\gdx.dll + + + ..\..\..\backends\gdx-backend-iosmonotouch\libs\gdx-backend-ios.dll + + + gdx-tests.dll + + + + + + + + + + + + + + + + + + data\43kJgl.jpg + + + data\Textures1.png + + + data\alpha.png + + + data\animation.png + + + data\arial-15_00.png + + + data\badlogic.jpg + + + data\badlogicsmall.jpg + + + data\black_marked_0.png + + + data\bobargb8888-32x32.png + + + data\bobrgb888-32x32.png + + + data\border_corner_a.png + + + data\debug.png + + + data\default.png + + + data\default_00.png + + + data\egg.png + + + data\font.png + + + data\group-debug.png + + + data\heightmap.png + + + data\isotile.png + + + data\jump.png + + + data\layers.png + + + data\pack1.png + + + data\particle-cloud.png + + + data\particle-fire.png + + + data\particle-star.png + + + data\particle.png + + + data\planet_earth.png + + + data\planet_heavyclouds.jpg + + + data\playback.png + + + data\ps-bobargb8888-32x32.png + + + data\ps-bobrgb888-32x32.png + + + data\resource1.jpg + + + data\rgb.png + + + data\shiptexture.png + + + data\stone2.png + + + data\stones.jpg + + + data\sys.png + + + data\t8890.png + + + data\test.png + + + data\test3.png + + + data\test4.png + + + data\testbar.png + + + data\testdot.png + + + data\tile.png + + + data\tiles.png + + + data\tree.png + + + data\ui.png + + + data\uiskin.png + + + data\verdana39.png + + + data\walkanim.png + + + data\wheel.png + + + data\tiledmap\perspective walls test1.png + + + data\tiledmap\perspective walls1.png + + + data\tiledmap\tileset1.png + + + data\tiledmap\tileset21.png + + + data\tiledmap\tileset31.png + + + data\tiledmap\tileset41.png + + + data\tiledmap\tmw-desert-spacing1.png + + + data\tiledmap\flip_rotate\tmw-desert-spacing1.png + + + data\8.12.mp3 + + + data\DroidSansJapanese.ttf + + + data\DroidSerif-Bold.ttf + + + data\DroidSerif-Italic.ttf + + + data\DroidSerif-Regular.ttf + + + data\arial-15.fnt + + + data\arial.ttf + + + data\bubblepop.ogg + + + data\cloudconnected.ogg + + + data\cube.obj + + + data\default.fnt + + + data\engine-2.ogg + + + data\font.fnt + + + data\garuda.ttf + + + data\gwttestparams.txt + + + data\issue_pack + + + data\jump.txt + + + data\pack + + + data\russkij.ttf + + + data\scene.obj + + + data\scene2.obj + + + data\sell_buy_item.wav + + + data\shotgun.mp3 + + + data\shotgun.ogg + + + data\shotgun.wav + + + data\sphere.obj + + + data\test.etc1 + + + data\test.p + + + data\test2_notwork.wav + + + data\testpack + + + data\tree.psh + + + data\uiskin.atlas + + + data\uiskin.json + + + data\unbom.ttf + + + data\verdana39.fnt + + + data\walk1.md5anim + + + data\zfat.md5mesh + + + data\tiledmap\flip_rotate\flip_rotate.tmx + + + data\tiledmap\flip_rotate\tmw-desert-spacing packfile + + + data\tiledmap\alignment test.tmx + + + data\tiledmap\margin spacing doctype test.tmx + + + data\tiledmap\perspective walls packfile + + + data\tiledmap\perspective walls test packfile + + + data\tiledmap\perspective walls.tmx + + + data\tiledmap\tilemap csv.tmx + + + data\tiledmap\tilemap gzip.tmx + + + data\tiledmap\tilemap uncompressed.tmx + + + data\tiledmap\tilemap xml.tmx + + + data\tiledmap\tilemap zlib.tmx + + + data\tiledmap\tileset packfile + + + data\tiledmap\tileset2 packfile + + + data\tiledmap\tileset3 packfile + + + data\tiledmap\tileset4 packfile + + + data\tiledmap\tmw-desert-spacing packfile + + + data\shaders\batch.frag + + + data\shaders\batch.vert + + + data\shaders\convolution.frag + + + data\shaders\default.frag + + + data\shaders\default.vert + + + data\shaders\depthtocolor.frag + + + data\shaders\flat-frag.glsl + + + data\shaders\flat-vert.glsl + + + data\shaders\flattex-frag.glsl + + + data\shaders\flattex-vert.glsl + + + data\shaders\projtex-frag.glsl + + + data\shaders\projtex-vert.glsl + + + data\shaders\shader-fs.glsl + + + data\shaders\shader-vs.glsl + + + data\shaders\shadowgen-frag.glsl + + + data\shaders\shadowgen-vert.glsl + + + data\shaders\shadowmap-frag.glsl + + + data\shaders\shadowmap-vert.glsl + + + \ No newline at end of file diff --git a/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/libgdx.a b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/libgdx.a new file mode 100644 index 00000000000..7546d1c738b Binary files /dev/null and b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/libgdx.a differ diff --git a/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/libikvm-natives.a b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/libikvm-natives.a new file mode 100644 index 00000000000..29296a25e72 Binary files /dev/null and b/tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch/libikvm-natives.a differ diff --git a/tests/gdx-tests/.classpath b/tests/gdx-tests/.classpath index 609cbaf927f..63aea58b52d 100644 --- a/tests/gdx-tests/.classpath +++ b/tests/gdx-tests/.classpath @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/tests/gdx-tests/.settings/org.eclipse.core.resources.prefs b/tests/gdx-tests/.settings/org.eclipse.core.resources.prefs index 6f2ac189356..4b5f8d6ca1b 100644 --- a/tests/gdx-tests/.settings/org.eclipse.core.resources.prefs +++ b/tests/gdx-tests/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ -eclipse.preferences.version=1 -encoding//src/com/badlogic/gdx/tests/InternationalFontsTest.java=UTF-8 +#Sun Sep 16 18:28:43 CEST 2012 +eclipse.preferences.version=1 +encoding//src/com/badlogic/gdx/tests/extensions/InternationalFontsTest.java=UTF-8 diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/FFTTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/FFTTest.java similarity index 95% rename from tests/gdx-tests/src/com/badlogic/gdx/tests/FFTTest.java rename to tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/FFTTest.java index 85f7f3c75d6..f42c88b776a 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/FFTTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/FFTTest.java @@ -14,7 +14,7 @@ * limitations under the License. ******************************************************************************/ -package com.badlogic.gdx.tests; +package com.badlogic.gdx.tests.extensions; import java.util.Arrays; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/FreeTypeTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/FreeTypeTest.java similarity index 95% rename from tests/gdx-tests/src/com/badlogic/gdx/tests/FreeTypeTest.java rename to tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/FreeTypeTest.java index 6bd0ab70cdc..2d3a6f23b90 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/FreeTypeTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/FreeTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. ******************************************************************************/ -package com.badlogic.gdx.tests; +package com.badlogic.gdx.tests.extensions; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/InternationalFontsTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/InternationalFontsTest.java similarity index 95% rename from tests/gdx-tests/src/com/badlogic/gdx/tests/InternationalFontsTest.java rename to tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/InternationalFontsTest.java index 2c594865f3c..e45f21b9bf4 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/InternationalFontsTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/InternationalFontsTest.java @@ -1,5 +1,5 @@ -package com.badlogic.gdx.tests; +package com.badlogic.gdx.tests.extensions; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL10; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/JpegTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/JpegTest.java similarity index 94% rename from tests/gdx-tests/src/com/badlogic/gdx/tests/JpegTest.java rename to tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/JpegTest.java index fd821673871..c88f3807870 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/JpegTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/JpegTest.java @@ -14,7 +14,7 @@ * limitations under the License. ******************************************************************************/ -package com.badlogic.gdx.tests; +package com.badlogic.gdx.tests.extensions; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL10; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/Mpg123Test.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/Mpg123Test.java similarity index 95% rename from tests/gdx-tests/src/com/badlogic/gdx/tests/Mpg123Test.java rename to tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/Mpg123Test.java index 430d8d89e83..ef60031b437 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/Mpg123Test.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/Mpg123Test.java @@ -14,7 +14,7 @@ * limitations under the License. ******************************************************************************/ -package com.badlogic.gdx.tests; +package com.badlogic.gdx.tests.extensions; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.audio.AudioDevice; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SoundTouchTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/SoundTouchTest.java similarity index 96% rename from tests/gdx-tests/src/com/badlogic/gdx/tests/SoundTouchTest.java rename to tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/SoundTouchTest.java index da9a3a0dadb..4e0dcee1d67 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SoundTouchTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/SoundTouchTest.java @@ -14,7 +14,7 @@ * limitations under the License. ******************************************************************************/ -package com.badlogic.gdx.tests; +package com.badlogic.gdx.tests.extensions; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.audio.AudioDevice; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/VorbisTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/VorbisTest.java similarity index 95% rename from tests/gdx-tests/src/com/badlogic/gdx/tests/VorbisTest.java rename to tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/VorbisTest.java index 5ccc47e9c0e..b8ae233efe9 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/VorbisTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/VorbisTest.java @@ -14,7 +14,7 @@ * limitations under the License. ******************************************************************************/ -package com.badlogic.gdx.tests; +package com.badlogic.gdx.tests.extensions; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.audio.AudioDevice; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/WavTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/WavTest.java similarity index 95% rename from tests/gdx-tests/src/com/badlogic/gdx/tests/WavTest.java rename to tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/WavTest.java index 36b714f50fd..827051be89f 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/WavTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/WavTest.java @@ -14,7 +14,7 @@ * limitations under the License. ******************************************************************************/ -package com.badlogic.gdx.tests; +package com.badlogic.gdx.tests.extensions; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.audio.AudioDevice; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java index bce975323b7..ce1e25a3818 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java @@ -65,11 +65,13 @@ public class GdxTests { TextureDownloadTest.class, TextureFormatTest.class, TextureAtlasTest.class, TextInputDialogTest.class, TextureRenderTest.class, TiledMapTest.class, TileTest.class, UITest.class, VBOVATest.class, VertexArrayTest.class, VertexBufferObjectTest.class, VertexArrayClassTest.class, VertexBufferObjectClassTest.class, LetterBoxTest2.class, - VertexBufferObjectShaderTest.class, VibratorTest.class, VorbisTest.class, WaterRipples.class, HelloTriangle.class, - SimpleVertexShader.class, ShapeRendererTest.class, MoveSpriteExample.class, SoundTouchTest.class, Mpg123Test.class, - WavTest.class, TextButtonTest.class, TextButtonTestGL2.class, TextureBindTest.class, SortedSpriteTest.class, - ExternalMusicTest.class, SoftKeyboardTest.class, DirtyRenderingTest.class, FreeTypeTest.class, YDownTest.class, - ScreenCaptureTest.class, InternationalFontsTest.class, BitmapFontTest.class, LabelScaleTest.class}; + VertexBufferObjectShaderTest.class, VibratorTest.class, WaterRipples.class, HelloTriangle.class, + SimpleVertexShader.class, ShapeRendererTest.class, MoveSpriteExample.class, + // SoundTouchTest.class, Mpg123Test.class, WavTest.class, FreeTypeTest.class, + // InternationalFontsTest.class, VorbisTest.class + TextButtonTest.class, TextButtonTestGL2.class, TextureBindTest.class, SortedSpriteTest.class, + ExternalMusicTest.class, SoftKeyboardTest.class, DirtyRenderingTest.class, YDownTest.class, + ScreenCaptureTest.class, BitmapFontTest.class, LabelScaleTest.class}; public static String[] getNames () { List names = new ArrayList();