From faf0d0dd99ad4405440989b9371c5b08468ded41 Mon Sep 17 00:00:00 2001
From: Wolfgang Schramm <wolfgang.schramm@gmail.com>
Date: Fri, 11 Nov 2022 16:52:29 +0100
Subject: [PATCH] [VTM] Fixed Java version: 7 -> 8 [VTM] Fixed libGDX API
 changes [VTM] Fixed libGDX API changes

---
 build.gradle                                              | 8 ++++----
 .../src/org/oscim/gdx/poi3d/GdxModelRenderer.java         | 2 +-
 vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java  | 2 +-
 vtm-gdx/src/org/oscim/gdx/InputHandler.java               | 5 +++--
 vtm-gdx/src/org/oscim/gdx/MotionHandler.java              | 2 +-
 .../oscim/theme/comparator/vtm/MapApplicationAdapter.java | 6 +++---
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index a3b7ddc6..5f046ae2 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.11.0"
     ext.gwtVersion = "2.8.2"
     ext.slf4jVersion = "1.7.28"
 
@@ -32,12 +32,12 @@ def versionName() { return version }
 
 subprojects {
     tasks.withType(JavaCompile) {
-        sourceCompatibility = JavaVersion.VERSION_1_7
-        targetCompatibility = JavaVersion.VERSION_1_7
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
         options.encoding = 'UTF-8'
         if (JavaVersion.current().isJava9Compatible()) {
             if (!project.properties.containsKey('android')) {
-                options.compilerArgs.addAll(['--release', '7'])
+                options.compilerArgs.addAll(['--release', '8'])
             }
         }
     }
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-gdx/src/org/oscim/gdx/InputHandler.java b/vtm-gdx/src/org/oscim/gdx/InputHandler.java
index 76441ae1..2360068b 100644
--- a/vtm-gdx/src/org/oscim/gdx/InputHandler.java
+++ b/vtm-gdx/src/org/oscim/gdx/InputHandler.java
@@ -255,10 +255,10 @@ public class InputHandler implements InputProcessor {
     }
 
     @Override
-    public boolean scrolled(int amount) {
+    public boolean scrolled(float amountX, float amountY) {
         float fx = mPosX - mMap.getWidth() / 2;
         float fy = mPosY - mMap.getHeight() / 2;
-        mMap.animator().animateZoom(250, amount > 0 ? 0.75f : 1.333f, fx, fy, Easing.Type.LINEAR);
+        mMap.animator().animateZoom(250, amountY > 0 ? 0.75f : 1.333f, fx, fy, Easing.Type.LINEAR);
         mMap.updateMap(false);
         return true;
     }
@@ -276,4 +276,5 @@ public class InputHandler implements InputProcessor {
         }
         return false;
     }
+
 }
diff --git a/vtm-gdx/src/org/oscim/gdx/MotionHandler.java b/vtm-gdx/src/org/oscim/gdx/MotionHandler.java
index a4d23f3f..8002f727 100644
--- a/vtm-gdx/src/org/oscim/gdx/MotionHandler.java
+++ b/vtm-gdx/src/org/oscim/gdx/MotionHandler.java
@@ -211,7 +211,7 @@ public class MotionHandler extends MotionEvent implements InputProcessor {
     }
 
     @Override
-    public boolean scrolled(int amount) {
+    public boolean scrolled(float amountX, float amountY) {
         mTime = Gdx.input.getCurrentEventTime();
 
         return false;
diff --git a/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapApplicationAdapter.java b/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapApplicationAdapter.java
index 883caf1b..b0755285 100644
--- a/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapApplicationAdapter.java
+++ b/vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapApplicationAdapter.java
@@ -135,10 +135,10 @@ public class MapApplicationAdapter extends ApplicationAdapter {
         InputMultiplexer mux = new InputMultiplexer();
         mux.addProcessor(new MotionHandler(map) {
             @Override
-            public boolean scrolled(int amount) {
-                super.scrolled(amount);
+            public boolean scrolled(float amountX, float amountY) {
+                super.scrolled(amountX, amountY);
                 MapPosition mapPosition = map.getMapPosition();
-                int zoomLevel = mapPosition.getZoomLevel() - amount;
+                int zoomLevel = (int) (mapPosition.getZoomLevel() - amountY);
                 mapPosition.setZoomLevel(zoomLevel);
                 map.setMapPosition(mapPosition);
                 bothMapPositionHandler.mapPositionChangedFromVtmMap(mapPosition);