Update to libGDX 1.9.12.

crykn · Nov 1, 2020 · e6de328 · e6de328
1 parent fb2ba61
commit e6de328
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 308 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# guacamole
+ guacamole
 
 [![Release](https://jitpack.io/v/crykn/guacamole.svg)](https://jitpack.io/#crykn/guacamole) ![GWT Compatible](https://img.shields.io/badge/GWT-compatible-informational)
 
@@ -77,7 +77,6 @@ dependencies {
 
 **What is added:**
 
-   * [Sync](https://github.com/crykn/guacamole/blob/master/gdx-desktop/src/main/java/de/damios/guacamole/gdx/Sync.java): Adds the commonly used [sync class](http://forum.lwjgl.org/index.php?topic=6582.msg34846#msg34846) (originally from LWJGL2), which helps mitigate the fps issues in LWJGL3; see [here](https://github.com/crykn/guacamole/wiki/Sync-usage) for how to use it
    * [StartOnFirstThreadHelper](https://github.com/crykn/guacamole/blob/master/gdx-desktop/src/main/java/de/damios/guacamole/gdx/StartOnFirstThreadHelper.java): Starts a new JVM if the current one was not started with the `-XstartOnFirstThread` argument on Mac OS
 
 
diff --git a/build.gradle b/build.gradle
@@ -14,11 +14,11 @@ allprojects {
     apply plugin: "eclipse"
     apply plugin: "idea"
 
-    version = "0.2.2"
+    version = "0.2.3"
     ext {
         appName = "guacamole"
         formicVersion = "0.1.4"
-        gdxVersion = "1.9.11"
+        gdxVersion = "1.9.12"
         jsrVersion = "3.0.2"
         junitVersion = "5.6.0"
         mockitoVersion = "3.2.4"

diff --git a/gdx-desktop/src/main/java/de/damios/guacamole/gdx/Sync.java b/gdx-desktop/src/main/java/de/damios/guacamole/gdx/Sync.java
diff --git a/gdx-gwt/src/main/java/gwt/emu/de/damios/guacamole/gdx/graphics/GLUtils.java b/gdx-gwt/src/main/java/gwt/emu/de/damios/guacamole/gdx/graphics/GLUtils.java
diff --git a/gdx/src/main/java/de/damios/guacamole/gdx/DefaultInputProcessor.java b/gdx/src/main/java/de/damios/guacamole/gdx/DefaultInputProcessor.java
@@ -90,7 +90,7 @@ public default boolean mouseMoved(int screenX, int screenY) {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public default boolean scrolled(int amount) {
+	public default boolean scrolled(float amountX, float amountY) {
 		return false;
 	}
 

diff --git a/gdx/src/main/java/de/damios/guacamole/gdx/graphics/GLUtils.java b/gdx/src/main/java/de/damios/guacamole/gdx/graphics/GLUtils.java
@@ -19,10 +19,8 @@
 import java.nio.ByteOrder;
 import java.nio.IntBuffer;
 
-import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.utils.GdxRuntimeException;
 
 /**
  * OpenGL utilities.
@@ -49,15 +47,8 @@ private GLUtils() {
 	 * 
 	 * @return the name of the currently bound framebuffer; the initial value is
 	 *         {@code 0}, indicating the default framebuffer
-	 * 
-	 * @see <a href= "https://github.com/libgdx/libgdx/issues/4688">The libGDX
-	 *      issue detailing the WebGL problems</a>
 	 */
 	public static synchronized int getBoundFboHandle() {
-		if (Gdx.app.getType() == ApplicationType.WebGL)
-			throw new GdxRuntimeException(
-					"This operation is not supported on WebGL without the libgdx-screenmanager-gwt extension!");
-
 		IntBuffer intBuf = USED_INT_BUFF;
 		Gdx.gl.glGetIntegerv(GL20.GL_FRAMEBUFFER_BINDING, intBuf);
 		return intBuf.get(0);

diff --git a/gdx/src/test/java/de/damios/guacamole/gdx/DefaultInputProcessorTest.java b/gdx/src/test/java/de/damios/guacamole/gdx/DefaultInputProcessorTest.java
@@ -18,7 +18,7 @@ public void test() {
 		assertTrue(!in.keyTyped((char) 5));
 		assertTrue(!in.keyUp(3));
 		assertTrue(!in.mouseMoved(8, 5));
-		assertTrue(!in.scrolled(1));
+		assertTrue(!in.scrolled(1F, 1F));
 		assertTrue(!in.touchDown(4, 7, 8, 6));
 		assertTrue(!in.touchDragged(1, 4, 4));
 		assertTrue(!in.touchUp(4, 1, 1, 5));