OSDN Git Service

merged nate's stuff...
authorbadlogic <badlogicgames@gmail.com>
Sun, 6 Oct 2013 13:28:07 +0000 (15:28 +0200)
committerbadlogic <badlogicgames@gmail.com>
Sun, 6 Oct 2013 13:28:07 +0000 (15:28 +0200)
1  2 
gdx/src/com/badlogic/gdx/graphics/OrthographicCamera.java
tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java

@@@ -43,7 -43,66 +43,7 @@@ public class OrthographicCamera extend
                this.near = 0;\r
                update();\r
        }\r
 -\r
 -      /** Constructs a new OrthographicCamera, using the given viewport width and height. This will create a camera useable for\r
 -       * iso-metric views. The diamond angle is specifies the angle of a tile viewed isometrically.\r
 -       * @param viewportWidth the viewport width\r
 -       * @param viewportHeight the viewport height\r
 -       * @param diamondAngle the angle in degrees */\r
 -      public OrthographicCamera (float viewportWidth, float viewportHeight, float diamondAngle) {\r
 -              this.viewportWidth = viewportWidth;\r
 -              this.viewportHeight = viewportHeight;\r
 -              this.near = 0;\r
 -              findDirectionForIsoView(diamondAngle, 0.00000001f, 20);\r
 -              update();\r
 -      }\r
 -\r
 -      public void findDirectionForIsoView (float targetAngle, float epsilon, int maxIterations) {\r
 -              float start = targetAngle - 5;\r
 -              float end = targetAngle + 5;\r
 -              float mid = targetAngle;\r
 -\r
 -              int iterations = 0;\r
 -              float aMid = 0;\r
 -              while (Math.abs(targetAngle - aMid) > epsilon && iterations++ < maxIterations) {\r
 -                      aMid = calculateAngle(mid);\r
 -\r
 -                      if (targetAngle < aMid) {\r
 -                              end = mid;\r
 -                      } else {\r
 -                              start = mid;\r
 -                      }\r
 -                      mid = start + (end - start) / 2;\r
 -              }\r
 -              position.set(calculateDirection(mid));\r
 -              position.y = -position.y;\r
 -              lookAt(0, 0, 0);\r
 -              normalizeUp();\r
 -      }\r
 -\r
 -      private float calculateAngle (float a) {\r
 -              Vector3 camPos = calculateDirection(a);\r
 -              position.set(camPos.scl(30));\r
 -              lookAt(0, 0, 0);\r
 -              normalizeUp();\r
 -              update();\r
 -\r
 -              Vector3 orig = new Vector3(0, 0, 0);\r
 -              Vector3 vec = new Vector3(1, 0, 0);\r
 -              project(orig);\r
 -              project(vec);\r
 -              Vector2 d = new Vector2(vec.x - orig.x, -(vec.y - orig.y));\r
 -              return d.angle();\r
 -      }\r
 -\r
 -      private Vector3 calculateDirection (float angle) {\r
 -              Matrix4 transform = new Matrix4();\r
 -              Vector3 dir = new Vector3(-1, 0, 1).nor();\r
 -              transform.setToRotation(new Vector3(1, 0, 1).nor(), angle);\r
 -              dir.mul(transform).nor();\r
 -              return dir;\r
 -      }\r
--\r
++
        private final Vector3 tmp = new Vector3();\r
  \r
        @Override\r
@@@ -54,42 -54,183 +54,182 @@@ import com.badlogic.gdx.tests.superkoal
   * \r
   * @author badlogicgames@gmail.com */\r
  public class GdxTests {\r
--      public static final List<Class<? extends GdxTest>> tests = new ArrayList<Class<? extends GdxTest>>(Arrays.asList(\r
-               AnimationTest.class, AccelerometerTest.class, ActionTest.class, ActionSequenceTest.class, LetterBoxTest3.class,\r
-               GroupTest.class, AlphaTest.class, AtlasIssueTest.class, AssetManagerTest.class, FilterPerformanceTest.class,\r
-               AudioDeviceTest.class, AudioRecorderTest.class, BitmapFontAlignmentTest.class, BitmapFontDistanceFieldTest.class, BitmapFontFlipTest.class,\r
-               GroupCullingTest.class, GestureDetectorTest.class, LabelTest.class, BitmapFontMetricsTest.class, BlitTest.class, TableTest.class,\r
-               BobTest.class, ImageScaleTest.class, TableLayoutTest.class, Box2DTest.class, BulletTestCollection.class, InterpolationTest.class, TouchpadTest.class,\r
-               Box2DTestCollection.class, BufferUtilsTest.class, ImageTest.class, CompassTest.class, ComplexActionTest.class,\r
-               CullTest.class, DeltaTimeTest.class, EarClippingTriangulatorTest.class, EdgeDetectionTest.class, ETC1Test.class, ExitTest.class, FilesTest.class,\r
-               ScrollPaneTest.class, FloatTest.class, FloatTextureTest.class, FrameBufferTest.class, FramebufferToTextureTest.class, FrustumTest.class,\r
-               FullscreenTest.class, Gdx2DTest.class, GroupFadeTest.class, ImmediateModeRendererTest.class, Scene2dTest.class,\r
-               ImmediateModeRendererAlphaTest.class, IndexBufferObjectClassTest.class, TreeTest.class, IndexBufferObjectShaderTest.class,\r
-               InputTest.class, IntegerBitmapFontTest.class, InverseKinematicsTest.class, IsometricTileTest.class,\r
-               KinematicBodyTest.class, LifeCycleTest.class, LineDrawingTest.class, ScrollPane2Test.class, ManagedTest.class,\r
-               ManualBindTest.class, MaterialTest.class, MatrixJNITest.class, MeshMultitextureTest.class, MeshShaderTest.class, MeshTest.class,\r
-               MipMapTest.class, MultitouchTest.class, MusicTest.class, MyFirstTriangle.class, ObjTest.class, OnscreenKeyboardTest.class,\r
-               OrthoCamBorderTest.class, ParallaxTest.class, ParticleEmitterTest.class, PickingTest.class, PixelsPerInchTest.class,\r
-               PixmapBlendingTest.class, PixmapTest.class, PixmapPackerTest.class, PolygonRegionTest.class, PolygonSpriteTest.class, PreferencesTest.class,\r
-               ProjectiveTextureTest.class, Pong.class, ProjectTest.class, RemoteTest.class, RotationTest.class, DragAndDropTest.class,\r
++      public static final List<Class<? extends GdxTest>> tests = new ArrayList<Class<? extends GdxTest>>(Arrays.asList(
+               // @off\r
+               AccelerometerTest.class,\r
+               ActionSequenceTest.class,\r
+               ActionTest.class,\r
+               AlphaTest.class,\r
+               Animation3DTest.class,\r
+               AnimationTest.class,\r
+               AssetManagerTest.class,\r
+               AtlasIssueTest.class,\r
+               AudioDeviceTest.class,\r
+               AudioRecorderTest.class,\r
+               Basic3DSceneTest.class,\r
+               Basic3DTest.class,\r
+               BitmapFontAlignmentTest.class,\r
+               BitmapFontDistanceFieldTest.class,\r
+               BitmapFontFlipTest.class,\r
+               BitmapFontMetricsTest.class,\r
+               BitmapFontTest.class,\r
+               BlitTest.class,\r
+               BobTest.class,\r
+               Box2DTest.class,\r
+               Box2DTestCollection.class,\r
+               Bresenham2Test.class,\r
+               BufferUtilsTest.class,\r
+               BulletTestCollection.class,\r
+               CompassTest.class,\r
+               ComplexActionTest.class,\r
+               CullTest.class,\r
+               DelaunayTriangulatorTest.class,\r
+               DeltaTimeTest.class,\r
+               DirtyRenderingTest.class,\r
+               DragAndDropTest.class,\r
+               ETC1Test.class,\r
+               EarClippingTriangulatorTest.class,\r
+               EdgeDetectionTest.class,\r
+               ExitTest.class,\r
+               ExternalMusicTest.class,\r
+               FilesTest.class,\r
+               FilterPerformanceTest.class,\r
+               FloatTest.class,\r
+               FloatTextureTest.class,\r
+               FogTest.class,\r
+               FrameBufferTest.class,\r
+               FramebufferToTextureTest.class,\r
+               FrustumTest.class,\r
+               FullscreenTest.class,\r
+               GamepadTest.class,\r
+               Gdx2DTest.class,\r
+               GestureDetectorTest.class,\r
+               GroupCullingTest.class,\r
+               GroupFadeTest.class,\r
+               GroupTest.class,\r
+               HelloTriangle.class,\r
+               HexagonalTiledMapTest.class,\r
+               ImageScaleTest.class,\r
+               ImageTest.class,\r
+               ImmediateModeRendererAlphaTest.class,\r
+               ImmediateModeRendererTest.class,\r
+               IndexBufferObjectClassTest.class,\r
+               IndexBufferObjectShaderTest.class,\r
+               InputTest.class,\r
+               IntegerBitmapFontTest.class,\r
+               InterpolationTest.class,\r
+               InverseKinematicsTest.class,\r
 -              IsoCamTest.class,\r
+               IsometricTileTest.class,\r
+               KinematicBodyTest.class,\r
+               LabelScaleTest.class,\r
+               LabelTest.class,\r
+               LetterBoxTest1.class,\r
+               LetterBoxTest2.class,\r
+               LetterBoxTest3.class,\r
+               LifeCycleTest.class,\r
+               LineDrawingTest.class,\r
+               ManagedTest.class,\r
+               ManualBindTest.class,\r
+               MaterialTest.class,\r
+               MatrixJNITest.class,\r
+               MeshMultitextureTest.class,\r
+               MeshShaderTest.class,\r
+               MeshTest.class,\r
+               MipMapTest.class,\r
+               ModelTest.class,\r
+               MoveSpriteExample.class,\r
+               MultitouchTest.class,\r
+               MusicTest.class,\r
+               MyFirstTriangle.class,\r
+               NetAPITest.class,\r
+               NinePatchTest.class,\r
+               ObjTest.class,\r
+               OnscreenKeyboardTest.class,\r
+               OrthoCamBorderTest.class,\r
+               ParallaxTest.class,\r
+               ParticleEmitterTest.class,\r
+               PathTest.class,\r
+               PickingTest.class,\r
+               PixelsPerInchTest.class,\r
+               PixmapBlendingTest.class,\r
+               PixmapPackerTest.class,\r
+               PixmapTest.class,\r
+               PolygonRegionTest.class,\r
+               PolygonSpriteTest.class,\r
+               Pong.class,\r
+               PreferencesTest.class,\r
+               ProjectTest.class,\r
+               ProjectiveTextureTest.class,\r
+               RemoteTest.class,\r
+               RotationTest.class,\r
+               RunnablePostTest.class,\r
+               Scene2dTest.class,\r
+               ScreenCaptureTest.class,\r
+               ScrollPane2Test.class,\r
+               ScrollPaneScrollBarsTest.class,\r
+               ScrollPaneTest.class,\r
                SelectTest.class,\r
-               ShaderMultitextureTest.class, ShadowMappingTest.class, PathTest.class, SimpleAnimationTest.class, SimpleDecalTest.class,\r
-               SimpleStageCullingTest.class, SoundTest.class, SpriteCacheTest.class, SpriteCacheOffsetTest.class, LetterBoxTest1.class,\r
-               SpriteBatchRotationTest.class, SpriteBatchShaderTest.class, SpriteBatchTest.class, SpritePerformanceTest.class,\r
-               SpritePerformanceTest2.class, StagePerformanceTest.class, StageTest.class, TerrainTest.class, TextureDataTest.class,\r
-               TextureDownloadTest.class, TextureFormatTest.class, TextureAtlasTest.class, TextInputDialogTest.class,\r
-               TextureRenderTest.class, TileTest.class, UITest.class, VBOVATest.class, VertexArrayTest.class,\r
-               VertexBufferObjectTest.class, VertexArrayClassTest.class, VertexBufferObjectClassTest.class, LetterBoxTest2.class,\r
-               VertexBufferObjectShaderTest.class, VibratorTest.class, WaterRipples.class, HelloTriangle.class,\r
-               SimpleVertexShader.class, ShapeRendererTest.class, MoveSpriteExample.class, UISimpleTest.class,\r
+               ShaderCollectionTest.class,\r
+               ShaderMultitextureTest.class,\r
+               ShaderTest.class,\r
+               ShadowMappingTest.class,\r
+               ShapeRendererTest.class,\r
+               SimpleAnimationTest.class,\r
+               SimpleDecalTest.class,\r
+               SimpleStageCullingTest.class,\r
+               SimpleVertexShader.class,\r
+               SkeletonTest.class,\r
+               SoftKeyboardTest.class,\r
+               SortedSpriteTest.class,\r
+               SoundTest.class,\r
+               SpriteBatchRotationTest.class,\r
+               SpriteBatchShaderTest.class,\r
+               SpriteBatchTest.class,\r
+               SpriteCacheOffsetTest.class,\r
+               SpriteCacheTest.class,\r
+               SpritePerformanceTest.class,\r
+               SpritePerformanceTest2.class,\r
+               StagePerformanceTest.class,\r
+               StageTest.class,\r
+               SuperKoalio.class,\r
+               TableLayoutTest.class,\r
+               TableTest.class,\r
+               TerrainTest.class,\r
+               TextButtonTest.class,\r
+               TextButtonTestGL2.class,\r
+               TextInputDialogTest.class,\r
+               TextureAtlasTest.class,\r
+               TextureBindTest.class,\r
+               TextureDataTest.class,\r
+               TextureDownloadTest.class,\r
+               TextureFormatTest.class,\r
+               TextureRenderTest.class,\r
+               TideMapAssetManagerTest.class,\r
+               TideMapDirectLoaderTest.class,\r
+               TileTest.class,\r
+               TiledMapAssetManagerTest.class,\r
+               TiledMapBench.class,\r
+               TimerTest.class,\r
+               TouchpadTest.class,\r
+               TreeTest.class,\r
+               UISimpleTest.class,\r
+               UITest.class,\r
+               VBOVATest.class,\r
+               Vector2dTest.class,\r
+               VertexArrayClassTest.class,\r
+               VertexArrayTest.class,\r
+               VertexBufferObjectClassTest.class,\r
+               VertexBufferObjectShaderTest.class,\r
+               VertexBufferObjectTest.class,\r
+               VibratorTest.class,\r
+               WaterRipples.class,\r
+               YDownTest.class\r
+               // @on\r
\r
                // SoundTouchTest.class, Mpg123Test.class, WavTest.class, FreeTypeTest.class,\r
                // InternationalFontsTest.class, VorbisTest.class\r
-               TextButtonTest.class, TextButtonTestGL2.class, TextureBindTest.class, SortedSpriteTest.class, DelaunayTriangulatorTest.class,\r
-               ExternalMusicTest.class, SoftKeyboardTest.class, DirtyRenderingTest.class, YDownTest.class, ShaderCollectionTest.class,\r
-               ScreenCaptureTest.class, BitmapFontTest.class, LabelScaleTest.class, GamepadTest.class, NetAPITest.class, TideMapAssetManagerTest.class, TideMapDirectLoaderTest.class, TiledMapAssetManagerTest.class, TiledMapBench.class,\r
-               RunnablePostTest.class, Vector2dTest.class, SuperKoalio.class, NinePatchTest.class, Basic3DSceneTest.class, Animation3DTest.class,\r
-               ModelTest.class, Basic3DTest.class, ShaderTest.class, SkeletonTest.class, HexagonalTiledMapTest.class, FogTest.class, TimerTest.class, Bresenham2Test.class));\r
-       \r
+               ));\r
\r
        public static List<String> getNames () {\r
                List<String> names = new ArrayList<String>(tests.size());\r
                for (Class clazz : tests)\r