Skip to content
Browse files

removed OpenGL ES 1.x, fixed up all the things...

  • Loading branch information...
1 parent 08711a2 commit 38e65331c71f092470a2c193adcbf2a75f05251d @badlogic badlogic committed Mar 2, 2014
Showing with 1,100 additions and 6,406 deletions.
  1. +0 −1 demos/cuboc/cuboc-android/src/com/badlogic/cuboc/Cuboc.java
  2. +1 −1 demos/cuboc/cuboc/src/com/badlogic/cubocy/CubocDesktop.java
  3. +3 −3 demos/cuboc/cuboc/src/com/badlogic/cubocy/MapRenderer.java
  4. +2 −2 demos/cuboc/cuboc/src/com/badlogic/cubocy/screens/GameOverScreen.java
  5. +2 −2 demos/cuboc/cuboc/src/com/badlogic/cubocy/screens/GameScreen.java
  6. +2 −2 demos/cuboc/cuboc/src/com/badlogic/cubocy/screens/IntroScreen.java
  7. +2 −2 demos/cuboc/cuboc/src/com/badlogic/cubocy/screens/MainMenu.java
  8. +0 −1 demos/invaders/gdx-invaders-android/src/com/badlogic/gdxinvaders/GdxInvadersAndroid.java
  9. +13 −12 demos/invaders/gdx-invaders-html5/.classpath
  10. +1 −0 demos/invaders/gdx-invaders-html5/.settings/com.google.gwt.eclipse.core.prefs
  11. +0 −1 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/GdxInvadersDesktop.java
  12. +6 −6 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/Renderer.java
  13. +3 −3 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameOver.java
  14. +3 −4 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/MainMenu.java
  15. +4 −4 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Simulation.java
  16. +1 −1 demos/metagun/metagun-android/src/com/badlogic/metagun/MetagunAndroid.java
  17. +2 −2 demos/metagun/metagun-desktop/src/com/mojang/metagun/Metagun.java
  18. +1 −1 demos/metagun/metagun-desktop/src/com/mojang/metagun/MetagunDesktop.java
  19. +1 −2 demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/PaxBritannicaDesktop.java
  20. +2 −2 demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/help/Help.java
  21. +1 −3 demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/mainmenu/MainMenu.java
  22. +1 −1 demos/superjumper/superjumper-android/src/com/badlogicgames/superjumper/SuperJumperAndroid.java
  23. +3 −3 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/GameScreen.java
  24. +3 −3 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen.java
  25. +3 −3 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen2.java
  26. +3 −3 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen3.java
  27. +3 −3 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen4.java
  28. +3 −3 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen5.java
  29. +2 −2 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HighscoresScreen.java
  30. +2 −2 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/MainMenuScreen.java
  31. +1 −1 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/SuperJumperDesktop.java
  32. +1 −1 demos/vector-pinball/gdx-vectorpinball-android/src/com/dozingcatsoftware/bouncy/BouncyAndroid.java
  33. +11 −10 demos/vector-pinball/gdx-vectorpinball-html5/.classpath
  34. +2 −2 demos/vector-pinball/gdx-vectorpinball/src/com/dozingcatsoftware/bouncy/Bouncy.java
  35. +1 −1 demos/vector-pinball/gdx-vectorpinball/src/com/dozingcatsoftware/bouncy/BouncyDesktop.java
  36. +0 −1 ...angry-robots-android/src/com/badlydrawngames/veryangryrobots/android/VeryAngryRobotsActivity.java
  37. +1 −1 ...s/very-angry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/DesktopStarter.java
  38. +5 −4 ...s/very-angry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/MainMenuScreen.java
  39. +5 −4 demos/very-angry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/ScoresScreen.java
  40. +2 −3 ...s/very-angry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/WorldPresenter.java
  41. +9 −8 demos/very-angry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/WorldView.java
  42. +1 −1 extensions/gdx-remote/src/com/badlogic/gdx/remote/UxAndroid.java
  43. +0 −1 extensions/gdx-tiled-preprocessor/src/com/badlogic/gdx/tiledmappacker/TiledMapPacker.java
  44. +1 −1 extensions/gdx-tools/src/com/badlogic/gdx/tools/hiero/Hiero.java
  45. +1 −1 extensions/gdx-tools/src/com/badlogic/gdx/tools/hiero/Hiero4.java
  46. +0 −91 extensions/gdx-tools/src/com/badlogic/gdx/tools/hiero/unicodefont/UnicodeFontTest.java
  47. +4 −4 extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java
  48. +3 −3 extensions/gdx-tools/src/com/badlogic/gdx/tools/texturepacker/TexturePackerTest.java
  49. +0 −1 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/Daydream.java
  50. +0 −1 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/GdxTestActivity.java
  51. +0 −8 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/LiveWallpaper.java
  52. +0 −5 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/MatrixTest.java
  53. +3 −3 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/WindowedTest.java
  54. +2 −2 tests/gdx-tests-iosrobovm/src/com/badlogic/gdx/tests/BasicBulletTest.java
  55. +0 −1 tests/gdx-tests-jglfw/src/com/badlogic/gdx/jglfw/tests/JglfwDebugStarter.java
  56. +11 −13 tests/gdx-tests-jglfw/src/com/badlogic/gdx/jglfw/tests/JglfwTestStarter.java
  57. +0 −78 tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LocalLwjglTest.java
  58. +2 −2 tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglAppletTest.java
  59. +9 −18 tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglCanvasTest.java
  60. +0 −7 tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
  61. +0 −1 tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglTestStarter.java
  62. +4 −4 tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/SwingLwjglTest.java
  63. +2 −0 tests/gdx-tests/.settings/org.eclipse.core.resources.prefs
  64. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/AccelerometerTest.java
  65. +6 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/ActionSequenceTest.java
  66. +5 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/ActionTest.java
  67. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/AlphaTest.java
  68. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/AnimationTest.java
  69. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/AssetManagerTest.java
  70. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/AtlasIssueTest.java
  71. +0 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/AudioDeviceTest.java
  72. +2 −19 tests/gdx-tests/src/com/badlogic/gdx/tests/AudioRecorderTest.java
  73. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontAlignmentTest.java
  74. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontDistanceFieldTest.java
  75. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontFlipTest.java
  76. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontMetricsTest.java
  77. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontTest.java
  78. +3 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/BlitTest.java
  79. +0 −133 tests/gdx-tests/src/com/badlogic/gdx/tests/BobTest.java
  80. +2 −4 tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DCharacterControllerTest.java
  81. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java
  82. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java
  83. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/BufferUtilsTest.java
  84. +2 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/BulletTestCollection.java
  85. +0 −90 tests/gdx-tests/src/com/badlogic/gdx/tests/CompassTest.java
  86. +9 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/ComplexActionTest.java
  87. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/ContainerTest.java
  88. +3 −13 tests/gdx-tests/src/com/badlogic/gdx/tests/CullTest.java
  89. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/CustomShaderSpriteBatchTest.java
  90. +4 −4 tests/gdx-tests/src/com/badlogic/gdx/tests/DecalTest.java
  91. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/DelaunayTriangulatorTest.java
  92. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/DeltaTimeTest.java
  93. +0 −4 tests/gdx-tests/src/com/badlogic/gdx/tests/DeviceInfoTest.java
  94. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/DirtyRenderingTest.java
  95. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/DragAndDropTest.java
  96. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/ETC1Test.java
  97. +351 −350 tests/gdx-tests/src/com/badlogic/gdx/tests/EarClippingTriangulatorTest.java
  98. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/EdgeDetectionTest.java
  99. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/ExitTest.java
  100. +1 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/FilesTest.java
  101. +0 −135 tests/gdx-tests/src/com/badlogic/gdx/tests/FillrateTest.java
  102. +6 −10 tests/gdx-tests/src/com/badlogic/gdx/tests/FilterPerformanceTest.java
  103. +0 −131 tests/gdx-tests/src/com/badlogic/gdx/tests/FloatTest.java
  104. +0 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/FloatTextureTest.java
  105. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/FrameBufferTest.java
  106. +6 −14 tests/gdx-tests/src/com/badlogic/gdx/tests/FramebufferToTextureTest.java
  107. +0 −177 tests/gdx-tests/src/com/badlogic/gdx/tests/FrustumTest.java
  108. +2 −17 tests/gdx-tests/src/com/badlogic/gdx/tests/FullscreenTest.java
  109. +2 −3 tests/gdx-tests/src/com/badlogic/gdx/tests/GamepadTest.java
  110. +3 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/Gdx2DTest.java
  111. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/GestureDetectorTest.java
  112. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/GroupCullingTest.java
  113. +7 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/GroupFadeTest.java
  114. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/GroupTest.java
  115. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/HexagonalTiledMapTest.java
  116. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/ImageScaleTest.java
  117. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/ImageTest.java
  118. +0 −91 tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererAlphaTest.java
  119. +4 −14 tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererTest.java
  120. +0 −82 tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectClassTest.java
  121. +4 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectShaderTest.java
  122. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/InputTest.java
  123. +4 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/IntegerBitmapFontTest.java
  124. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/InverseKinematicsTest.java
  125. +4 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/IsometricTileTest.java
  126. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/KinematicBodyTest.java
  127. +2 −12 tests/gdx-tests/src/com/badlogic/gdx/tests/LabelScaleTest.java
  128. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/LabelTest.java
  129. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/LetterBoxTest1.java
  130. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/LetterBoxTest2.java
  131. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/LetterBoxTest3.java
  132. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/LifeCycleTest.java
  133. +0 −84 tests/gdx-tests/src/com/badlogic/gdx/tests/LineDrawingTest.java
  134. +0 −60 tests/gdx-tests/src/com/badlogic/gdx/tests/ManagedTest.java
  135. +0 −88 tests/gdx-tests/src/com/badlogic/gdx/tests/ManualBindTest.java
  136. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/MatrixJNITest.java
  137. +0 −71 tests/gdx-tests/src/com/badlogic/gdx/tests/MeshMultitextureTest.java
  138. +3 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/MeshShaderTest.java
  139. +0 −72 tests/gdx-tests/src/com/badlogic/gdx/tests/MeshTest.java
  140. +4 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/MipMapTest.java
  141. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/MultitouchTest.java
  142. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/MusicTest.java
  143. +0 −74 tests/gdx-tests/src/com/badlogic/gdx/tests/MyFirstTriangle.java
  144. +2 −10 tests/gdx-tests/src/com/badlogic/gdx/tests/NinePatchTest.java
  145. +0 −147 tests/gdx-tests/src/com/badlogic/gdx/tests/ObjTest.java
  146. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/OnscreenKeyboardTest.java
  147. +0 −83 tests/gdx-tests/src/com/badlogic/gdx/tests/OrthoCamBorderTest.java
  148. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/ParallaxTest.java
  149. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterTest.java
  150. +0 −153 tests/gdx-tests/src/com/badlogic/gdx/tests/PathTest.java
  151. +0 −138 tests/gdx-tests/src/com/badlogic/gdx/tests/PickingTest.java
  152. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/PixelsPerInchTest.java
  153. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/PixmapBlendingTest.java
  154. +0 −3 tests/gdx-tests/src/com/badlogic/gdx/tests/PixmapPackerTest.java
  155. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/PixmapTest.java
  156. +3 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/PolygonRegionTest.java
  157. +3 −10 tests/gdx-tests/src/com/badlogic/gdx/tests/PolygonSpriteTest.java
  158. +0 −262 tests/gdx-tests/src/com/badlogic/gdx/tests/Pong.java
  159. +0 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/PreferencesTest.java
  160. +4 −10 tests/gdx-tests/src/com/badlogic/gdx/tests/ProjectTest.java
  161. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/ProjectiveTextureTest.java
  162. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/ReflectionTest.java
  163. +0 −131 tests/gdx-tests/src/com/badlogic/gdx/tests/RemoteTest.java
  164. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/RotationTest.java
  165. +0 −4 tests/gdx-tests/src/com/badlogic/gdx/tests/RunnablePostTest.java
  166. +6 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/Scene2dTest.java
  167. +0 −142 tests/gdx-tests/src/com/badlogic/gdx/tests/ScreenCaptureTest.java
  168. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/ScrollPane2Test.java
  169. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/ScrollPaneScrollBarsTest.java
  170. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/ScrollPaneTest.java
  171. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/ShaderMultitextureTest.java
  172. +4 −4 tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererAlphaTest.java
  173. +1 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererTest.java
  174. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleAnimationTest.java
  175. +3 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleDecalTest.java
  176. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleStageCullingTest.java
  177. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/SoftKeyboardTest.java
  178. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/SortedSpriteTest.java
  179. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/SoundTest.java
  180. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchOriginScaleTest.java
  181. +2 −33 tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchRotationTest.java
  182. +0 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchShaderTest.java
  183. +5 −12 tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchTest.java
  184. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheOffsetTest.java
  185. +3 −3 tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheTest.java
  186. +0 −234 tests/gdx-tests/src/com/badlogic/gdx/tests/SpritePerformanceTest.java
  187. +0 −90 tests/gdx-tests/src/com/badlogic/gdx/tests/SpritePerformanceTest2.java
  188. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/StagePerformanceTest.java
  189. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/StageTest.java
  190. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/TableLayoutTest.java
  191. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/TableTest.java
  192. +0 −271 tests/gdx-tests/src/com/badlogic/gdx/tests/TerrainTest.java
  193. +2 −3 tests/gdx-tests/src/com/badlogic/gdx/tests/TextAreaTest.java
  194. +2 −3 tests/gdx-tests/src/com/badlogic/gdx/tests/TextButtonTest.java
  195. +0 −24 tests/gdx-tests/src/com/badlogic/gdx/tests/TextButtonTestGL2.java
  196. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/TextInputDialogTest.java
  197. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/TextureAtlasTest.java
  198. +0 −115 tests/gdx-tests/src/com/badlogic/gdx/tests/TextureBindTest.java
  199. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/TextureDownloadTest.java
  200. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/TextureFormatTest.java
  201. +0 −172 tests/gdx-tests/src/com/badlogic/gdx/tests/TextureRenderTest.java
  202. +14 −21 tests/gdx-tests/src/com/badlogic/gdx/tests/TideMapAssetManagerTest.java
  203. +12 −17 tests/gdx-tests/src/com/badlogic/gdx/tests/TideMapDirectLoaderTest.java
  204. +4 −10 tests/gdx-tests/src/com/badlogic/gdx/tests/TileTest.java
  205. +14 −19 tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAssetManagerTest.java
  206. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAtlasAssetManagerTest.java
  207. +12 −18 tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAtlasDirectLoaderTest.java
  208. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapDirectLoaderTest.java
  209. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/TouchpadTest.java
  210. +0 −223 tests/gdx-tests/src/com/badlogic/gdx/tests/TransformationTest.java
  211. +2 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/TreeTest.java
  212. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/UISimpleTest.java
  213. +2 −4 tests/gdx-tests/src/com/badlogic/gdx/tests/UITest.java
  214. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/UtfFontTest.java
  215. +0 −170 tests/gdx-tests/src/com/badlogic/gdx/tests/VBOVATest.java
  216. +2 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/Vector2dTest.java
  217. +0 −80 tests/gdx-tests/src/com/badlogic/gdx/tests/VertexArrayClassTest.java
  218. +0 −76 tests/gdx-tests/src/com/badlogic/gdx/tests/VertexArrayTest.java
  219. +0 −85 tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectClassTest.java
  220. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectShaderTest.java
  221. +0 −102 tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectTest.java
  222. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/VibratorTest.java
  223. +0 −272 tests/gdx-tests/src/com/badlogic/gdx/tests/WaterRipples.java
  224. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/YDownTest.java
  225. +18 −18 tests/gdx-tests/src/com/badlogic/gdx/tests/bench/TiledMapBench.java
  226. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/box2d/Box2DTest.java
  227. +5 −16 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/BaseBulletTest.java
  228. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/BaseWorld.java
  229. +2 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/BasicBulletTest.java
  230. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/BasicShapesTest.java
  231. +0 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/ConstraintsTest.java
  232. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/ConvexHullDistanceTest.java
  233. +0 −1 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/ConvexHullTest.java
  234. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/FrustumCullingTest.java
  235. +0 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/RayPickRagdollTest.java
  236. +2 −4 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/SoftBodyTest.java
  237. +0 −10 tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/SoftMeshTest.java
  238. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/examples/MoveSpriteExample.java
  239. +2 −8 tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/FreeTypePackTest.java
  240. +4 −9 tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/FreeTypeTest.java
  241. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/InternationalFontsTest.java
  242. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/JpegTest.java
  243. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/Mpg123Test.java
  244. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/SoundTouchTest.java
  245. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/VorbisTest.java
  246. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/extensions/WavTest.java
  247. +24 −35 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/Animation3DTest.java
  248. +4 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/BaseG3dTest.java
  249. +16 −19 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/Basic3DSceneTest.java
  250. +18 −20 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/Basic3DTest.java
  251. +18 −19 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/FogTest.java
  252. +4 −12 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/MaterialTest.java
  253. +10 −17 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/ModelLoaderTest.java
  254. +16 −29 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/ModelTest.java
  255. +31 −45 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/ShaderCollectionTest.java
  256. +21 −25 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/ShaderTest.java
  257. +2 −20 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/ShadowMappingTest.java
  258. +20 −26 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/SkeletonTest.java
  259. +5 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/shaders/MultiPassShader.java
  260. +15 −34 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/voxel/VoxelTest.java
  261. +11 −13 tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/voxel/VoxelWorld.java
  262. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/gles2/HelloTriangle.java
  263. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/gles2/MipMap2D.java
  264. +0 −5 tests/gdx-tests/src/com/badlogic/gdx/tests/gles2/SimpleVertexShader.java
  265. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/gwt/GwtBinaryTest.java
  266. +2 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/gwt/GwtInputTest.java
  267. +1 −6 tests/gdx-tests/src/com/badlogic/gdx/tests/gwt/GwtTest.java
  268. +1 −7 tests/gdx-tests/src/com/badlogic/gdx/tests/gwt/GwtTestWrapper.java
  269. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/net/NetAPITest.java
  270. +2 −2 tests/gdx-tests/src/com/badlogic/gdx/tests/superkoalio/SuperKoalio.java
  271. +0 −4 tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTest.java
  272. +9 −41 tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
View
1 demos/cuboc/cuboc-android/src/com/badlogic/cuboc/Cuboc.java
@@ -16,7 +16,6 @@ public void onCreate (Bundle savedInstanceState) {
config.useAccelerometer = false;
config.useCompass = false;
config.useWakelock = true;
- config.useGL20 = true;
initialize(new Cubocy(), config);
}
}
View
2 demos/cuboc/cuboc/src/com/badlogic/cubocy/CubocDesktop.java
@@ -7,7 +7,7 @@
public class CubocDesktop {
public static void main (String[] argv) {
- new LwjglApplication(new Cubocy(), "Cubocy", 480, 320, true);
+ new LwjglApplication(new Cubocy(), "Cubocy", 480, 320);
// After creating the Application instance we can set the log level to
// show the output of calls to Gdx.app.debug
View
6 demos/cuboc/cuboc/src/com/badlogic/cubocy/MapRenderer.java
@@ -3,7 +3,7 @@
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.FPSLogger;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Animation;
@@ -124,7 +124,7 @@ public void render (float deltaTime) {
renderLaserBeams();
cache.setProjectionMatrix(cam.combined);
- Gdx.gl.glDisable(GL10.GL_BLEND);
+ Gdx.gl.glDisable(GL20.GL_BLEND);
cache.begin();
int b = 0;
for (int blockY = 0; blockY < 4; blockY++) {
@@ -226,7 +226,7 @@ private void renderLasers () {
private void renderLaserBeams () {
cam.update(false);
- renderer.begin(cam.combined, GL10.GL_LINES);
+ renderer.begin(cam.combined, GL20.GL_LINES);
for (int i = 0; i < map.lasers.size; i++) {
Laser laser = map.lasers.get(i);
float sx = laser.startPoint.x, sy = laser.startPoint.y;
View
4 demos/cuboc/cuboc/src/com/badlogic/cubocy/screens/GameOverScreen.java
@@ -4,7 +4,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -27,7 +27,7 @@ public void show () {
@Override
public void render (float delta) {
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
batch.begin();
batch.draw(intro, 0, 0);
batch.end();
View
4 demos/cuboc/cuboc/src/com/badlogic/cubocy/screens/GameScreen.java
@@ -7,7 +7,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
public class GameScreen extends CubocScreen {
Map map;
@@ -30,7 +30,7 @@ public void render (float delta) {
delta = Math.min(0.06f, Gdx.graphics.getDeltaTime());
map.update(delta);
Gdx.gl.glClearColor(0.1f, 0.1f, 0.1f, 1);
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
renderer.render(delta);
controlRenderer.render();
View
4 demos/cuboc/cuboc/src/com/badlogic/cubocy/screens/IntroScreen.java
@@ -4,7 +4,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -27,7 +27,7 @@ public void show () {
@Override
public void render (float delta) {
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
batch.begin();
batch.draw(intro, 0, 0);
batch.end();
View
4 demos/cuboc/cuboc/src/com/badlogic/cubocy/screens/MainMenu.java
@@ -4,7 +4,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -27,7 +27,7 @@ public void show () {
@Override
public void render (float delta) {
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
batch.begin();
batch.draw(title, 0, 0);
batch.end();
View
1 demos/invaders/gdx-invaders-android/src/com/badlogic/gdxinvaders/GdxInvadersAndroid.java
@@ -15,7 +15,6 @@ public void onCreate (Bundle savedInstanceState) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
config.useWakelock = true;
- config.useGL20 = true;
initialize(new GdxInvaders(), config);
}
}
View
25 demos/invaders/gdx-invaders-html5/.classpath
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/gdx-backends-gwt"/>
- <classpathentry combineaccessrules="false" kind="src" path="/gdx"/>
- <classpathentry combineaccessrules="false" kind="src" path="/gdx-invaders"/>
- <classpathentry combineaccessrules="false" kind="src" path="/gdx-controllers"/>
- <classpathentry combineaccessrules="false" kind="src" path="/gdx-controllers-gwt"/>
- <classpathentry kind="output" path="war/WEB-INF/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/gdx-backends-gwt"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/gdx"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/gdx-invaders"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/gdx-controllers"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/gdx-controllers-gwt"/>
+ <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT"/>
+ <classpathentry kind="output" path="war/WEB-INF/classes"/>
+</classpath>
View
1 demos/invaders/gdx-invaders-html5/.settings/com.google.gwt.eclipse.core.prefs
@@ -1,3 +1,4 @@
eclipse.preferences.version=1
+entryPointModules=
filesCopiedToWebInfLib=gwt-servlet.jar
gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBW11dPjwvZXh0cmEtYXJncz48dm0tYXJncz48IVtDREFUQVstWG14NTEybV1dPjwvdm0tYXJncz48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5iYWRsb2dpYy5nZHhpbnZhZGVycy5HZHhJbnZhZGVyc0d3dDwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+
View
1 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/GdxInvadersDesktop.java
@@ -23,7 +23,6 @@ public static void main (String[] argv) {
LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
config.title = "Gdx Invaders";
config.vSyncEnabled = true;
- config.useGL20 = true;
new LwjglApplication(new GdxInvaders(), config);
}
}
View
12 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/Renderer.java
@@ -15,7 +15,7 @@
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.PerspectiveCamera;
import com.badlogic.gdx.graphics.Pixmap.Format;
@@ -89,10 +89,10 @@ public void render (Simulation simulation, float delta) {
// We explicitly require GL10, otherwise we could've used the GLCommon
// interface via Gdx.gl
GLCommon gl = Gdx.gl;
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT | GL10.GL_DEPTH_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT | GL20.GL_DEPTH_BUFFER_BIT);
renderBackground();
- gl.glEnable(GL10.GL_DEPTH_TEST);
- gl.glEnable(GL10.GL_CULL_FACE);
+ gl.glEnable(GL20.GL_DEPTH_TEST);
+ gl.glEnable(GL20.GL_CULL_FACE);
setProjectionAndCamera(simulation.ship);
modelBatch.begin(camera);
@@ -104,8 +104,8 @@ public void render (Simulation simulation, float delta) {
modelBatch.render(simulation.shots);
modelBatch.end();
- gl.glDisable(GL10.GL_CULL_FACE);
- gl.glDisable(GL10.GL_DEPTH_TEST);
+ gl.glDisable(GL20.GL_CULL_FACE);
+ gl.glDisable(GL20.GL_DEPTH_TEST);
spriteBatch.setProjectionMatrix(viewMatrix);
spriteBatch.begin();
View
6 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/GameOver.java
@@ -15,7 +15,7 @@
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.Texture.TextureFilter;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
@@ -82,7 +82,7 @@ public boolean isDone () {
@Override
public void draw (float delta) {
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
viewMatrix.setToOrtho2D(0, 0, 480, 320);
spriteBatch.setProjectionMatrix(viewMatrix);
@@ -95,7 +95,7 @@ public void draw (float delta) {
spriteBatch.draw(logo, 0, 320 - 128, 480, 128, 0, 256, 512, 256, false, false);
String text = "It is the end my friend.\nTouch to continue!";
TextBounds bounds = font.getMultiLineBounds(text);
- spriteBatch.setBlendFunction(GL10.GL_ONE, GL10.GL_ONE_MINUS_SRC_ALPHA);
+ spriteBatch.setBlendFunction(GL20.GL_ONE, GL20.GL_ONE_MINUS_SRC_ALPHA);
font.drawMultiLine(spriteBatch, text, 0, 160 + bounds.height / 2, 480, HAlignment.CENTER);
spriteBatch.end();
}
View
7 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/screens/MainMenu.java
@@ -16,13 +16,12 @@
import com.badlogic.gdx.Application.ApplicationType;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.Texture.TextureFilter;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.Matrix4;
-import com.badlogic.gdx.math.Vector3;
/** The main menu screen showing a background, the logo of the game and a label telling the user to touch the screen to start the
* game. Waits for the touch and returns isDone() == true when it's done so that the ochestrating GdxInvaders class can switch to
@@ -83,7 +82,7 @@ public void update (float delta) {
@Override
public void draw (float delta) {
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
viewMatrix.setToOrtho2D(0, 0, 480, 320);
spriteBatch.setProjectionMatrix(viewMatrix);
@@ -94,7 +93,7 @@ public void draw (float delta) {
spriteBatch.draw(background, 0, 0, 480, 320, 0, 0, 512, 512, false, false);
spriteBatch.enableBlending();
spriteBatch.draw(logo, 0, 320 - 128, 480, 128, 0, 0, 512, 256, false, false);
- spriteBatch.setBlendFunction(GL10.GL_ONE, GL10.GL_ONE_MINUS_SRC_ALPHA);
+ spriteBatch.setBlendFunction(GL20.GL_ONE, GL20.GL_ONE_MINUS_SRC_ALPHA);
String text = "Touch screen to start!";
float width = font.getBounds(text).width;
font.draw(spriteBatch, text, 240 - width / 2, 128);
View
8 demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Simulation.java
@@ -16,7 +16,7 @@
import java.util.ArrayList;
import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Mesh;
import com.badlogic.gdx.graphics.Pixmap.Format;
import com.badlogic.gdx.graphics.Texture;
@@ -81,7 +81,7 @@ private void populate () {
invaderModel.materials.get(0).set(TextureAttribute.createDiffuse(invaderTexture));
((ColorAttribute)blockModel.materials.get(0).get(ColorAttribute.Diffuse)).color.set(0, 0, 1, 0.5f);
- blockModel.materials.get(0).set(new BlendingAttribute(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA));
+ blockModel.materials.get(0).set(new BlendingAttribute(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA));
shotModel.materials.get(0).set(ColorAttribute.createDiffuse(1, 1, 0, 1f));
@@ -134,8 +134,8 @@ private void populate () {
explosionMesh.setVertices(vertices);
explosionMesh.setIndices(indices);
- explosionModel = ModelBuilder.createFromMesh(explosionMesh, GL10.GL_TRIANGLES,
- new Material(new BlendingAttribute(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA),
+ explosionModel = ModelBuilder.createFromMesh(explosionMesh, GL20.GL_TRIANGLES,
+ new Material(new BlendingAttribute(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA),
TextureAttribute.createDiffuse(explosionTexture)));
ship = new Ship(shipModel);
View
2 demos/metagun/metagun-android/src/com/badlogic/metagun/MetagunAndroid.java
@@ -11,6 +11,6 @@
@Override
public void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- initialize(new Metagun(), false);
+ initialize(new Metagun());
}
}
View
4 demos/metagun/metagun-desktop/src/com/mojang/metagun/Metagun.java
@@ -3,7 +3,7 @@
import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.mojang.metagun.screen.Screen;
import com.mojang.metagun.screen.TitleScreen;
@@ -47,7 +47,7 @@ public void setScreen (Screen newScreen) {
@Override
public void render () {
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
accum += Gdx.graphics.getDeltaTime();
while (accum > 1.0f / 60.0f) {
screen.tick(input);
View
2 demos/metagun/metagun-desktop/src/com/mojang/metagun/MetagunDesktop.java
@@ -5,6 +5,6 @@
public class MetagunDesktop {
public static void main (String[] argv) {
- new LwjglApplication(new Metagun(), "Metagun", 320, 240, false);
+ new LwjglApplication(new Metagun(), "Metagun", 320, 240);
}
}
View
3 demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/PaxBritannicaDesktop.java
@@ -4,7 +4,6 @@
public class PaxBritannicaDesktop {
public static void main(String[] args) {
- new LwjglApplication(new PaxBritannica(),
- "Pax Britannica", 1024, 550,false);
+ new LwjglApplication(new PaxBritannica(), "Pax Britannica", 1024, 550);
}
}
View
4 demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/help/Help.java
@@ -4,7 +4,7 @@
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputProcessor;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture.TextureFilter;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
@@ -91,7 +91,7 @@ public void show() {
@Override
public void render(float delta) {
Gdx.gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
time += delta;
View
4 demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/mainmenu/MainMenu.java
@@ -1,15 +1,13 @@
package de.swagner.paxbritannica.mainmenu;
import java.io.IOException;
-import java.util.ArrayList;
+import com.badlogic.gdx.Application.ApplicationType;
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.Preferences;
-import com.badlogic.gdx.Application.ApplicationType;
-import com.badlogic.gdx.graphics.GL10;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
View
2 ...superjumper/superjumper-android/src/com/badlogicgames/superjumper/SuperJumperAndroid.java
@@ -25,6 +25,6 @@
@Override
public void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- initialize(new SuperJumper(), false);
+ initialize(new SuperJumper());
}
}
View
6 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/GameScreen.java
@@ -16,12 +16,12 @@
package com.badlogicgames.superjumper;
+import com.badlogic.gdx.Application.ApplicationType;
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Application.ApplicationType;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.Screen;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -192,7 +192,7 @@ private void updateGameOver () {
public void draw () {
GLCommon gl = Gdx.gl;
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
renderer.render();
View
6 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen.java
@@ -19,7 +19,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
@@ -63,7 +63,7 @@ public void update () {
public void draw () {
GLCommon gl = Gdx.gl;
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
guiCam.update();
batcher.setProjectionMatrix(guiCam.combined);
@@ -77,7 +77,7 @@ public void draw () {
batcher.draw(Assets.arrow, 320, 0, -64, 64);
batcher.end();
- gl.glDisable(GL10.GL_BLEND);
+ gl.glDisable(GL20.GL_BLEND);
}
@Override
View
6 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen2.java
@@ -19,7 +19,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
@@ -63,7 +63,7 @@ public void update () {
public void draw () {
GLCommon gl = Gdx.gl;
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
guiCam.update();
batcher.setProjectionMatrix(guiCam.combined);
@@ -77,7 +77,7 @@ public void draw () {
batcher.draw(Assets.arrow, 320, 0, -64, 64);
batcher.end();
- gl.glDisable(GL10.GL_BLEND);
+ gl.glDisable(GL20.GL_BLEND);
}
@Override
View
6 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen3.java
@@ -19,7 +19,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
@@ -63,7 +63,7 @@ public void update () {
public void draw () {
GLCommon gl = Gdx.gl;
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
guiCam.update();
batcher.setProjectionMatrix(guiCam.combined);
@@ -77,7 +77,7 @@ public void draw () {
batcher.draw(Assets.arrow, 320, 0, -64, 64);
batcher.end();
- gl.glDisable(GL10.GL_BLEND);
+ gl.glDisable(GL20.GL_BLEND);
}
@Override
View
6 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen4.java
@@ -19,7 +19,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
@@ -63,7 +63,7 @@ public void update () {
public void draw () {
GLCommon gl = Gdx.gl;
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
guiCam.update();
batcher.setProjectionMatrix(guiCam.combined);
@@ -77,7 +77,7 @@ public void draw () {
batcher.draw(Assets.arrow, 320, 0, -64, 64);
batcher.end();
- gl.glDisable(GL10.GL_BLEND);
+ gl.glDisable(GL20.GL_BLEND);
}
@Override
View
6 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HelpScreen5.java
@@ -19,7 +19,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
@@ -63,7 +63,7 @@ public void update () {
public void draw () {
GLCommon gl = Gdx.gl;
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
guiCam.update();
batcher.setProjectionMatrix(guiCam.combined);
@@ -77,7 +77,7 @@ public void draw () {
batcher.draw(Assets.arrow, 320, 0, -64, 64);
batcher.end();
- gl.glDisable(GL10.GL_BLEND);
+ gl.glDisable(GL20.GL_BLEND);
}
@Override
View
4 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/HighscoresScreen.java
@@ -19,7 +19,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -66,7 +66,7 @@ public void update () {
public void draw () {
GLCommon gl = Gdx.gl;
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
guiCam.update();
batcher.setProjectionMatrix(guiCam.combined);
View
4 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/MainMenuScreen.java
@@ -19,7 +19,7 @@
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -86,7 +86,7 @@ public void update () {
public void draw () {
GLCommon gl = Gdx.gl;
gl.glClearColor(1, 0, 0, 1);
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
guiCam.update();
batcher.setProjectionMatrix(guiCam.combined);
View
2 demos/superjumper/superjumper/src/com/badlogicgames/superjumper/SuperJumperDesktop.java
@@ -20,6 +20,6 @@
public class SuperJumperDesktop {
public static void main (String[] argv) {
- new LwjglApplication(new SuperJumper(), "Super Jumper", 320, 480, false);
+ new LwjglApplication(new SuperJumper(), "Super Jumper", 320, 480);
}
}
View
2 ...tor-pinball/gdx-vectorpinball-android/src/com/dozingcatsoftware/bouncy/BouncyAndroid.java
@@ -10,6 +10,6 @@
@Override
public void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- initialize(new Bouncy(), false);
+ initialize(new Bouncy());
}
}
View
21 demos/vector-pinball/gdx-vectorpinball-html5/.classpath
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/gdx"/>
- <classpathentry combineaccessrules="false" kind="src" path="/gdx-backends-gwt"/>
- <classpathentry combineaccessrules="false" kind="src" path="/gdx-vectorpinball"/>
- <classpathentry kind="output" path="war/WEB-INF/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/gdx"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/gdx-backends-gwt"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/gdx-vectorpinball"/>
+ <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT"/>
+ <classpathentry kind="output" path="war/WEB-INF/classes"/>
+</classpath>
View
4 demos/vector-pinball/gdx-vectorpinball/src/com/dozingcatsoftware/bouncy/Bouncy.java
@@ -4,7 +4,7 @@
import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputAdapter;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GLCommon;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.math.WindowedMean;
@@ -42,7 +42,7 @@ public void render () {
field.tick((long)(Gdx.graphics.getDeltaTime() * 3000), 4);
physicsMean.addValue((TimeUtils.nanoTime() - startPhysics) / 1000000000.0f);
- gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
cam.viewportWidth = field.getWidth();
cam.viewportHeight = field.getHeight();
cam.position.set(field.getWidth() / 2, field.getHeight() / 2, 0);
View
2 demos/vector-pinball/gdx-vectorpinball/src/com/dozingcatsoftware/bouncy/BouncyDesktop.java
@@ -5,6 +5,6 @@
public class BouncyDesktop {
public static void main (String[] argv) {
- new LwjglApplication(new Bouncy(), "Bouncy", 320, 480, true);
+ new LwjglApplication(new Bouncy(), "Bouncy", 320, 480);
}
}
View
1 ...bots-android/src/com/badlydrawngames/veryangryrobots/android/VeryAngryRobotsActivity.java
@@ -15,7 +15,6 @@ public void onCreate (Bundle savedInstanceState) {
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
config.useCompass = false;
config.useAccelerometer = false;
- config.useGL20 = false;
VeryAngryRobotsGame game = new VeryAngryRobotsGame();
initialize(game, config);
}
View
2 ...ngry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/DesktopStarter.java
@@ -21,6 +21,6 @@
private final static int WINDOW_HEIGHT = 480;
public static void main (String[] args) {
- new LwjglApplication(new VeryAngryRobotsGame(), "Very Angry Robots", WINDOW_WIDTH, WINDOW_HEIGHT, false);
+ new LwjglApplication(new VeryAngryRobotsGame(), "Very Angry Robots", WINDOW_WIDTH, WINDOW_HEIGHT);
}
}
View
9 ...ngry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/MainMenuScreen.java
@@ -13,10 +13,13 @@
package com.badlydrawngames.veryangryrobots;
+import static com.badlydrawngames.veryangryrobots.Assets.VIRTUAL_HEIGHT;
+import static com.badlydrawngames.veryangryrobots.Assets.VIRTUAL_WIDTH;
+
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -26,8 +29,6 @@
import com.badlydrawngames.general.GameScreen;
import com.badlydrawngames.general.SimpleButton;
-import static com.badlydrawngames.veryangryrobots.Assets.*;
-
public class MainMenuScreen extends GameScreen<VeryAngryRobotsGame> {
final String TITLE = "VERY ANGRY ROBOTS";
@@ -86,7 +87,7 @@ public void render (float delta) {
showScores();
} else {
Gdx.gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
spriteBatch.begin();
Assets.scoreFont.setColor(Color.WHITE);
float y = VIRTUAL_HEIGHT - Assets.scoreFont.getCapHeight() / 2.0f;
View
9 ...-angry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/ScoresScreen.java
@@ -13,10 +13,13 @@
package com.badlydrawngames.veryangryrobots;
+import static com.badlydrawngames.veryangryrobots.Assets.VIRTUAL_HEIGHT;
+import static com.badlydrawngames.veryangryrobots.Assets.VIRTUAL_WIDTH;
+
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Preferences;
import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
@@ -26,8 +29,6 @@
import com.badlydrawngames.general.GameScreen;
import com.badlydrawngames.general.ScoreString;
-import static com.badlydrawngames.veryangryrobots.Assets.*;
-
public class ScoresScreen extends GameScreen<VeryAngryRobotsGame> {
private static final String LAST_SCORE = "Score:";
@@ -78,7 +79,7 @@ public void render (float delta) {
game.setScreen(game.mainMenuScreen);
} else {
Gdx.gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
spriteBatch.begin();
Assets.scoreFont.setColor(Color.WHITE);
TextBounds b = Assets.scoreFont.getBounds(LAST_SCORE);
View
5 ...ngry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/WorldPresenter.java
@@ -15,8 +15,7 @@
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
-import com.badlogic.gdx.graphics.GL10;
-
+import com.badlogic.gdx.graphics.GL20;
import com.badlydrawngames.general.GameScreen;
import com.badlydrawngames.veryangryrobots.WorldView.Presenter;
import com.badlydrawngames.veryangryrobots.mobiles.Player;
@@ -111,7 +110,7 @@ public void render (float delta) {
// Clear the screen and draw the views.
Gdx.gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
worldView.render(delta);
statusView.render(delta);
View
17 ...ery-angry-robots/very-angry-robots/src/com/badlydrawngames/veryangryrobots/WorldView.java
@@ -13,9 +13,13 @@
package com.badlydrawngames.veryangryrobots;
+import static com.badlydrawngames.general.MathUtils.min;
+import static com.badlydrawngames.veryangryrobots.Assets.VIRTUAL_HEIGHT;
+import static com.badlydrawngames.veryangryrobots.Assets.VIRTUAL_WIDTH;
+
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.Animation;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
@@ -39,9 +43,6 @@
import com.badlydrawngames.veryangryrobots.mobiles.PlayerShot;
import com.badlydrawngames.veryangryrobots.mobiles.Robot;
-import static com.badlydrawngames.general.MathUtils.*;
-import static com.badlydrawngames.veryangryrobots.Assets.*;
-
/** The <code>WorldView</code> displays the {@link World} on screen. It also provides the means by which the player can control the
* game.
*
@@ -393,27 +394,27 @@ private void drawClipped (GameObject go, TextureRegion region) {
}
private void drawParticles () {
- spriteBatch.setBlendFunction(GL10.GL_SRC_ALPHA, GL10.GL_ONE);
+ spriteBatch.setBlendFunction(GL20.GL_SRC_ALPHA, GL20.GL_ONE);
for (Particle particle : particleManager.getParticles()) {
if (particle.active) {
spriteBatch.setColor(particle.color);
spriteBatch.draw(Assets.pureWhiteTextureRegion, particle.x, particle.y, particle.size, particle.size);
}
}
- spriteBatch.setBlendFunction(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA);
+ spriteBatch.setBlendFunction(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
}
private void drawFlyups () {
BitmapFont font = Assets.flyupFont;
float scale = font.getScaleX();
font.setScale(1.0f / Assets.pixelDensity);
- spriteBatch.setBlendFunction(GL10.GL_SRC_ALPHA, GL10.GL_ONE);
+ spriteBatch.setBlendFunction(GL20.GL_SRC_ALPHA, GL20.GL_ONE);
for (Flyup flyup : flyupManager.flyups) {
if (flyup.active) {
font.draw(spriteBatch, flyup.scoreString, flyup.x, flyup.y);
}
}
- spriteBatch.setBlendFunction(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA);
+ spriteBatch.setBlendFunction(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
font.setScale(scale);
}
View
2 extensions/gdx-remote/src/com/badlogic/gdx/remote/UxAndroid.java
@@ -106,6 +106,6 @@ public void pause () {
public void dispose () {
}
- }, false);
+ });
}
}
View
1 extensions/gdx-tiled-preprocessor/src/com/badlogic/gdx/tiledmappacker/TiledMapPacker.java
@@ -502,7 +502,6 @@ public static void main (String[] args) {
config.forceExit = false;
config.width = 100;
config.height = 50;
- config.useGL20 = true;
config.title = "TiledMapPacker";
new LwjglApplication(new ApplicationListener() {
View
2 extensions/gdx-tools/src/com/badlogic/gdx/tools/hiero/Hiero.java
@@ -169,7 +169,7 @@ public Hiero () {
initialize();
splash.close();
- gamePanel.add(new LwjglCanvas(new Renderer(), false).getCanvas());
+ gamePanel.add(new LwjglCanvas(new Renderer()).getCanvas());
prefs = Preferences.userNodeForPackage(Hiero.class);
java.awt.Color backgroundColor = EffectUtil.fromString(prefs.get("background", "000000"));
View
2 extensions/gdx-tools/src/com/badlogic/gdx/tools/hiero/Hiero4.java
@@ -165,7 +165,7 @@ public Hiero4 () {
initialize();
splash.close();
- gamePanel.add(new LwjglCanvas(renderer = new Renderer(), false).getCanvas());
+ gamePanel.add(new LwjglCanvas(renderer = new Renderer()).getCanvas());
prefs = Preferences.userNodeForPackage(Hiero4.class);
java.awt.Color backgroundColor = EffectUtil.fromString(prefs.get("background", "000000"));
View
91 extensions/gdx-tools/src/com/badlogic/gdx/tools/hiero/unicodefont/UnicodeFontTest.java
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright 2011 See AUTHORS file.
- *
- * 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.
- ******************************************************************************/
-
-package com.badlogic.gdx.tools.hiero.unicodefont;
-
-import org.lwjgl.opengl.GL11;
-
-import com.badlogic.gdx.ApplicationListener;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import com.badlogic.gdx.tools.hiero.unicodefont.effects.ColorEffect;
-
-import static org.lwjgl.opengl.GL11.*;
-
-public class UnicodeFontTest implements ApplicationListener {
- private UnicodeFont unicodeFont;
-
- @Override
- public void create () {
- unicodeFont = new UnicodeFont("c:/windows/fonts/arial.ttf", 48, false, false);
- unicodeFont.getEffects().add(new ColorEffect(java.awt.Color.white));
- }
-
- @Override
- public void resize (int width, int height) {
- glViewport(0, 0, width, height);
- glScissor(0, 0, width, height);
- glEnable(GL_SCISSOR_TEST);
-
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glOrtho(0, width, height, 0, 1, -1);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
-
- glEnable(GL_TEXTURE_2D);
- glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glEnableClientState(GL_VERTEX_ARRAY);
-
- glClearColor(0, 0, 0, 0);
- glClearDepth(1);
-
- glDisable(GL_LIGHTING);
-
- glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- }
-
- @Override
- public void render () {
- GL11.glClear(GL_COLOR_BUFFER_BIT);
-
- unicodeFont.loadGlyphs(1);
-
- String text = "This is UnicodeFont!\nIt rockz. Kerning: T,";
- unicodeFont.drawString(10, 33, text);
- unicodeFont.drawString(10, 330, text);
-
- unicodeFont.addGlyphs("~!@!#!#$%___--");
- // Cypriot Syllabary glyphs (Everson Mono font):
- // \uD802\uDC02\uD802\uDC03\uD802\uDC12 == 0x10802, 0x10803, s0x10812
- }
-
- public static void main (String[] args) {
- new LwjglApplication(new UnicodeFontTest(), "UnicodeFont Test", 800, 600, false);
- }
-
- @Override
- public void dispose () {
- }
-
- @Override
- public void pause () {
- }
-
- @Override
- public void resume () {
- }
-}
View
8 extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java
@@ -49,7 +49,7 @@
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.backends.lwjgl.LwjglCanvas;
import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
@@ -85,7 +85,7 @@
public ParticleEditor () {
super("Particle Editor");
- lwjglCanvas = new LwjglCanvas(new Renderer(), false);
+ lwjglCanvas = new LwjglCanvas(new Renderer());
addWindowListener(new WindowAdapter() {
public void windowClosed (WindowEvent event) {
System.exit(0);
@@ -367,7 +367,7 @@ public void render () {
float[] colors = backgroundColor.getColors();
Gdx.gl.glClearColor(colors[0], colors[1], colors[2], 1.0f);
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
if ((pixelsPerMeter.getValue() != pixelsPerMeterPrev) || (zoomLevel.getValue() != zoomLevelPrev)) {
if (pixelsPerMeter.getValue() <= 0) {
@@ -386,7 +386,7 @@ public void render () {
spriteBatch.begin();
spriteBatch.enableBlending();
- spriteBatch.setBlendFunction(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA);
+ spriteBatch.setBlendFunction(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
if (bgImage != null) {
bgImage.setPosition(viewWidth / 2 - bgImage.getWidth() / 2, viewHeight / 2 - bgImage.getHeight() / 2);
View
6 extensions/gdx-tools/src/com/badlogic/gdx/tools/texturepacker/TexturePackerTest.java
@@ -21,7 +21,7 @@
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
import com.badlogic.gdx.math.Matrix4;
@@ -40,7 +40,7 @@ public void create () {
}
public void render () {
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
Settings settings = new Settings();
settings.fast = false;
@@ -107,6 +107,6 @@ public void resize (int width, int height) {
}
public static void main (String[] args) throws Exception {
- new LwjglApplication(new TexturePackerTest(), "", 640, 480, false);
+ new LwjglApplication(new TexturePackerTest(), "", 640, 480);
}
}
View
1 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/Daydream.java
@@ -32,7 +32,6 @@ public void onAttachedToWindow() {
Log.i("Andrew", "hi");
AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
- cfg.useGL20 = true;
setInteractive(false);
View
1 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/GdxTestActivity.java
@@ -33,7 +33,6 @@ public void onCreate (Bundle bundle) {
GdxTest test = GdxTests.newTest(testName);
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
- config.useGL20 = test.needsGL20();
config.useImmersiveMode = true;
initialize(test, config);
}
View
8 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/LiveWallpaper.java
@@ -17,18 +17,11 @@
import android.util.Log;
-import com.badlogic.gdx.ApplicationAdapter;
import com.badlogic.gdx.ApplicationListener;
-import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import com.badlogic.gdx.backends.android.AndroidLiveWallpaperService;
import com.badlogic.gdx.backends.android.AndroidWallpaperListener;
-import com.badlogic.gdx.graphics.GL10;
-import com.badlogic.gdx.math.MathUtils;
-import com.badlogic.gdx.tests.Box2DTest;
import com.badlogic.gdx.tests.MeshShaderTest;
-import com.badlogic.gdx.tests.SpritePerformanceTest2;
-import com.badlogic.gdx.tests.WaterRipples;
public class LiveWallpaper extends AndroidLiveWallpaperService {
@@ -37,7 +30,6 @@ public void onCreateApplication () {
super.onCreateApplication();
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
- config.useGL20 = true;
ApplicationListener listener = new MyLiveWallpaperListener();
initialize(listener, config);
View
5 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/MatrixTest.java
@@ -28,11 +28,6 @@
public class MatrixTest extends GdxTest {
- @Override
- public boolean needsGL20 () {
- return false;
- }
-
BitmapFont font;
SpriteBatch batch;
String results = "no results";
View
6 tests/gdx-tests-android/src/com/badlogic/gdx/tests/android/WindowedTest.java
@@ -44,7 +44,7 @@ public void onCreate (Bundle bundle) {
Button b2 = new Button(this);
b2.setText("New Window");
b2.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
- View view = initializeForView(this, false);
+ View view = initializeForView(this);
LinearLayout layout = new LinearLayout(this);
layout.setOrientation(LinearLayout.VERTICAL);
@@ -89,8 +89,8 @@ public void create () {
@Override
public void render () {
- Gdx.graphics.getGL10().glClearColor(color.r, color.g, color.g, color.a);
- Gdx.graphics.getGL10().glClear(GL10.GL_COLOR_BUFFER_BIT);
+ Gdx.gl.glClearColor(color.r, color.g, color.g, color.a);
+ Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
}
View
4 tests/gdx-tests-iosrobovm/src/com/badlogic/gdx/tests/BasicBulletTest.java
@@ -18,7 +18,7 @@
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL10;
+import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.PerspectiveCamera;
import com.badlogic.gdx.graphics.VertexAttributes.Usage;
import com.badlogic.gdx.graphics.g3d.Environment;
@@ -153,7 +153,7 @@ public void create () {
@Override
public void render () {
Gdx.gl.glViewport(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
- Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT | GL10.GL_DEPTH_BUFFER_BIT);
+ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT | GL20.GL_DEPTH_BUFFER_BIT);
fpsCounter.put(Gdx.graphics.getFramesPerSecond());
View
1 tests/gdx-tests-jglfw/src/com/badlogic/gdx/jglfw/tests/JglfwDebugStarter.java
@@ -35,7 +35,6 @@ public static void main (String[] argv) {
GdxTest test = new SuperKoalio();
JglfwApplicationConfiguration config = new JglfwApplicationConfiguration();
config.vSync = true;
- config.useGL20 = test.needsGL20();
new JglfwApplication(test, config);
}
}
View
24 tests/gdx-tests-jglfw/src/com/badlogic/gdx/jglfw/tests/JglfwTestStarter.java
@@ -16,19 +16,7 @@
package com.badlogic.gdx.jglfw.tests;
-import com.badlogic.gdx.LifecycleListener;
-import com.badlogic.gdx.Preferences;
-import com.badlogic.gdx.backends.jglfw.JglfwApplication;
-import com.badlogic.gdx.backends.jglfw.JglfwApplicationConfiguration;
-import com.badlogic.gdx.backends.jglfw.JglfwFiles;
-import com.badlogic.gdx.backends.jglfw.JglfwPreferences;
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.tests.utils.GdxTest;
-import com.badlogic.gdx.tests.utils.GdxTests;
-import com.badlogic.gdx.utils.GdxRuntimeException;
-
import java.awt.BorderLayout;
-import java.awt.EventQueue;
import java.awt.HeadlessException;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -46,6 +34,17 @@
import javax.swing.ListSelectionModel;
import javax.swing.UIManager;
+import com.badlogic.gdx.LifecycleListener;
+import com.badlogic.gdx.Preferences;
+import com.badlogic.gdx.backends.jglfw.JglfwApplication;
+import com.badlogic.gdx.backends.jglfw.JglfwApplicationConfiguration;
+import com.badlogic.gdx.backends.jglfw.JglfwFiles;
+import com.badlogic.gdx.backends.jglfw.JglfwPreferences;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.tests.utils.GdxTest;
+import com.badlogic.gdx.tests.utils.GdxTests;
+import com.badlogic.gdx.utils.GdxRuntimeException;
+
public class JglfwTestStarter extends JFrame {