libGDX 1.9.10, fix #731
This commit is contained in:
@@ -15,8 +15,8 @@ allprojects {
|
|||||||
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
|
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
|
||||||
|
|
||||||
ext.androidBuildVersionTools = "29.0.1"
|
ext.androidBuildVersionTools = "29.0.1"
|
||||||
ext.gdxVersion = "1.9.9"
|
ext.gdxVersion = "1.9.10"
|
||||||
ext.gwtVersion = "2.8.0"
|
ext.gwtVersion = "2.8.2"
|
||||||
ext.slf4jVersion = "1.7.25"
|
ext.slf4jVersion = "1.7.25"
|
||||||
|
|
||||||
if (JavaVersion.current().isJava8Compatible()) {
|
if (JavaVersion.current().isJava8Compatible()) {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
- vtm-desktop-lwjgl3 module [#717](https://github.com/mapsforge/vtm/pull/717)
|
- vtm-desktop-lwjgl3 module [#717](https://github.com/mapsforge/vtm/pull/717)
|
||||||
- Fix marker touch events [#723](https://github.com/mapsforge/vtm/issues/723)
|
- Fix marker touch events [#723](https://github.com/mapsforge/vtm/issues/723)
|
||||||
- Android 10 compatibility [#728](https://github.com/mapsforge/vtm/issues/728)
|
- Android 10 compatibility [#728](https://github.com/mapsforge/vtm/issues/728)
|
||||||
|
- libGDX 1.9.10 [#731](https://github.com/mapsforge/vtm/issues/731)
|
||||||
- Many other minor improvements and bug fixes
|
- Many other minor improvements and bug fixes
|
||||||
- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.12.0)
|
- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.12.0)
|
||||||
|
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi-
|
|||||||
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-arm64-v8a'
|
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-arm64-v8a'
|
||||||
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86'
|
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86'
|
||||||
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86_64'
|
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86_64'
|
||||||
implementation 'com.badlogicgames.gdx:gdx:1.9.9'
|
implementation 'com.badlogicgames.gdx:gdx:1.9.10'
|
||||||
implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.9'
|
implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.10'
|
||||||
implementation 'com.caverock:androidsvg:1.3'
|
implementation 'com.caverock:androidsvg:1.3'
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -57,9 +57,9 @@ implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-linux'
|
|||||||
implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-osx'
|
implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-osx'
|
||||||
implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-windows'
|
implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-windows'
|
||||||
implementation 'org.mapsforge:vtm-desktop-lwjgl:[CURRENT-VERSION]'
|
implementation 'org.mapsforge:vtm-desktop-lwjgl:[CURRENT-VERSION]'
|
||||||
implementation 'com.badlogicgames.gdx:gdx:1.9.9'
|
implementation 'com.badlogicgames.gdx:gdx:1.9.10'
|
||||||
implementation 'com.badlogicgames.gdx:gdx-platform:1.9.9:natives-desktop'
|
implementation 'com.badlogicgames.gdx:gdx-platform:1.9.10:natives-desktop'
|
||||||
implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.9'
|
implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10'
|
||||||
implementation 'com.github.blackears:svgSalamander:v1.1.1'
|
implementation 'com.github.blackears:svgSalamander:v1.1.1'
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -3,7 +3,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.5'
|
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ sourceSets.main.java.srcDirs = ["src/"]
|
|||||||
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
|
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
roboVMVersion = "2.3.5"
|
roboVMVersion = "2.3.7"
|
||||||
}
|
}
|
||||||
|
|
||||||
launchIPhoneSimulator.dependsOn build
|
launchIPhoneSimulator.dependsOn build
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.5'
|
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@ sourceSets.main.java.srcDirs = ["src/"]
|
|||||||
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
|
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
roboVMVersion = "2.3.5"
|
roboVMVersion = "2.3.7"
|
||||||
}
|
}
|
||||||
|
|
||||||
launchIPhoneSimulator.dependsOn build
|
launchIPhoneSimulator.dependsOn build
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'org.wisepersist:gwt-gradle-plugin:1.0.8'
|
classpath 'org.wisepersist:gwt-gradle-plugin:1.0.13'
|
||||||
classpath 'org.akhikhl.gretty:gretty:2.0.0'
|
classpath 'org.akhikhl.gretty:gretty:2.0.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'org.wisepersist:gwt-gradle-plugin:1.0.8'
|
classpath 'org.wisepersist:gwt-gradle-plugin:1.0.13'
|
||||||
classpath 'org.akhikhl.gretty:gretty:2.0.0'
|
classpath 'org.akhikhl.gretty:gretty:2.0.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ buildscript {
|
|||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'org.wisepersist:gwt-gradle-plugin:1.0.8'
|
classpath 'org.wisepersist:gwt-gradle-plugin:1.0.13'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ public class GwtInput implements Input {
|
|||||||
boolean[] pressedKeys = new boolean[256];
|
boolean[] pressedKeys = new boolean[256];
|
||||||
boolean keyJustPressed = false;
|
boolean keyJustPressed = false;
|
||||||
boolean[] justPressedKeys = new boolean[256];
|
boolean[] justPressedKeys = new boolean[256];
|
||||||
|
boolean[] justPressedButtons = new boolean[5];
|
||||||
InputProcessor processor;
|
InputProcessor processor;
|
||||||
char lastKeyCharPressed;
|
char lastKeyCharPressed;
|
||||||
float keyRepeatTimer;
|
float keyRepeatTimer;
|
||||||
@@ -58,7 +59,12 @@ public class GwtInput implements Input {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void reset() {
|
void reset() {
|
||||||
justTouched = false;
|
if (justTouched) {
|
||||||
|
justTouched = false;
|
||||||
|
for (int i = 0; i < justPressedButtons.length; i++) {
|
||||||
|
justPressedButtons[i] = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (keyJustPressed) {
|
if (keyJustPressed) {
|
||||||
keyJustPressed = false;
|
keyJustPressed = false;
|
||||||
for (int i = 0; i < justPressedKeys.length; i++) {
|
for (int i = 0; i < justPressedKeys.length; i++) {
|
||||||
@@ -100,6 +106,11 @@ public class GwtInput implements Input {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaxPointers() {
|
||||||
|
return MAX_TOUCHES;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getX() {
|
public int getX() {
|
||||||
return touchX[0];
|
return touchX[0];
|
||||||
@@ -175,6 +186,12 @@ public class GwtInput implements Input {
|
|||||||
return pressedButtons.contains(button) && touched[0];
|
return pressedButtons.contains(button) && touched[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isButtonJustPressed(int button) {
|
||||||
|
if (button < 0 || button >= justPressedButtons.length) return false;
|
||||||
|
return justPressedButtons[button];
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isKeyPressed(int key) {
|
public boolean isKeyPressed(int key) {
|
||||||
if (key == Keys.ANY_KEY) {
|
if (key == Keys.ANY_KEY) {
|
||||||
@@ -276,6 +293,15 @@ public class GwtInput implements Input {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCatchKey(int keycode, boolean catchKey) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isCatchKey(int keycode) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setInputProcessor(InputProcessor processor) {
|
public void setInputProcessor(InputProcessor processor) {
|
||||||
this.processor = processor;
|
this.processor = processor;
|
||||||
@@ -542,6 +568,7 @@ public class GwtInput implements Input {
|
|||||||
this.justTouched = true;
|
this.justTouched = true;
|
||||||
this.touched[0] = true;
|
this.touched[0] = true;
|
||||||
this.pressedButtons.add(getButton(e.getButton()));
|
this.pressedButtons.add(getButton(e.getButton()));
|
||||||
|
justPressedButtons[e.getButton()] = true;
|
||||||
this.deltaX[0] = 0;
|
this.deltaX[0] = 0;
|
||||||
this.deltaY[0] = 0;
|
this.deltaY[0] = 0;
|
||||||
if (isCursorCatched()) {
|
if (isCursorCatched()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user