From 4dfabfed2257931a6f36140d6a56ebd144fe4beb Mon Sep 17 00:00:00 2001
From: Izumi Kawashima <schedul.xor@gmail.com>
Date: Wed, 23 Nov 2022 19:48:12 +0900
Subject: [PATCH] Support libgdx 1.9.11

---
 build.gradle                                  |  2 +-
 .../org/oscim/gdx/poi3d/GdxModelRenderer.java |  2 +-
 .../org/oscim/gdx/poi3d/GdxRenderer3D.java    |  2 +-
 vtm-web/src/org/oscim/gdx/client/GdxGL.java   |  4 ++--
 .../gdx/backends/gwt/GwtApplication.java      |  2 +-
 .../gdx/backends/gwt/GwtGraphics.java         | 20 +++++++++++++++++++
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 044e358e..ba8b15a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ allprojects {
     group = 'org.mapsforge'
     version = 'master-SNAPSHOT'
 
-    ext.gdxVersion = "1.9.10"
+    ext.gdxVersion = "1.9.11"
     ext.gwtVersion = "2.8.2"
     ext.slf4jVersion = "1.7.28"
 
diff --git a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelRenderer.java b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelRenderer.java
index 10cb8f20..0ab8d7d4 100644
--- a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelRenderer.java
+++ b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelRenderer.java
@@ -60,7 +60,7 @@ public class GdxModelRenderer extends LayerRenderer {
         cam = new MapCamera(mMap);
 
         renderContext =
-                new RenderContext(new DefaultTextureBinder(DefaultTextureBinder.WEIGHTED, 1));
+                new RenderContext(new DefaultTextureBinder(DefaultTextureBinder.LRU, 1));
 
         // shader = new DefaultShader(renderable.material,
         // renderable.mesh.getVertexAttributes(), true, false, 1, 0, 0, 0);
diff --git a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java
index 86b8dda9..52b53f68 100644
--- a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java
+++ b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java
@@ -61,7 +61,7 @@ public class GdxRenderer3D extends LayerRenderer {
         cam = new MapCamera(mMap);
 
         renderContext =
-                new RenderContext(new DefaultTextureBinder(DefaultTextureBinder.WEIGHTED, 1));
+                new RenderContext(new DefaultTextureBinder(DefaultTextureBinder.LRU, 1));
 
         // shader = new DefaultShader(renderable.material,
         // renderable.mesh.getVertexAttributes(), true, false, 1, 0, 0, 0);
diff --git a/vtm-web/src/org/oscim/gdx/client/GdxGL.java b/vtm-web/src/org/oscim/gdx/client/GdxGL.java
index 73931522..d04815ec 100644
--- a/vtm-web/src/org/oscim/gdx/client/GdxGL.java
+++ b/vtm-web/src/org/oscim/gdx/client/GdxGL.java
@@ -580,7 +580,7 @@ public class GdxGL extends GwtGL20 implements GL {
         return glGetActiveAttrib(program,
                 index,
                 size,
-                type);
+                (IntBuffer)type);
     }
 
     @Override
@@ -588,7 +588,7 @@ public class GdxGL extends GwtGL20 implements GL {
         return glGetActiveUniform(program,
                 index,
                 size,
-                type);
+                (IntBuffer)type);
     }
 
     @Override
diff --git a/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtApplication.java b/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtApplication.java
index 950ac8d5..0ec51198 100644
--- a/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtApplication.java
+++ b/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtApplication.java
@@ -179,7 +179,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
         lastWidth = graphics.getWidth();
         lastHeight = graphics.getHeight();
         Gdx.app = this;
-        Gdx.audio = new GwtAudio();
+        Gdx.audio = new DefaultGwtAudio();
         Gdx.graphics = graphics;
         Gdx.gl20 = graphics.getGL20();
         Gdx.gl = Gdx.gl20;
diff --git a/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtGraphics.java b/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtGraphics.java
index e1538bdd..9aa4c6c7 100644
--- a/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtGraphics.java
+++ b/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtGraphics.java
@@ -184,6 +184,26 @@ public class GwtGraphics implements Graphics {
         return canvas.getHeight();
     }
 
+    @Override
+    public int getSafeInsetLeft() {
+        return 0;
+    }
+
+    @Override
+    public int getSafeInsetTop() {
+        return 0;
+    }
+
+    @Override
+    public int getSafeInsetBottom() {
+        return 0;
+    }
+
+    @Override
+    public int getSafeInsetRight() {
+        return 0;
+    }
+
     @Override
     public long getFrameId() {
         return frameId;