libGDX 1.9.10, fix #731

This commit is contained in:
Emux 2019-07-25 11:57:52 +03:00
parent 71bf1390f6
commit 0c050c7405
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
14 changed files with 43 additions and 15 deletions

View File

@ -15,8 +15,8 @@ allprojects {
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
ext.androidBuildVersionTools = "29.0.1"
ext.gdxVersion = "1.9.9"
ext.gwtVersion = "2.8.0"
ext.gdxVersion = "1.9.10"
ext.gwtVersion = "2.8.2"
ext.slf4jVersion = "1.7.25"
if (JavaVersion.current().isJava8Compatible()) {

View File

@ -6,6 +6,7 @@
- vtm-desktop-lwjgl3 module [#717](https://github.com/mapsforge/vtm/pull/717)
- Fix marker touch events [#723](https://github.com/mapsforge/vtm/issues/723)
- 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
- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.12.0)

View File

@ -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-x86'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86_64'
implementation 'com.badlogicgames.gdx:gdx:1.9.9'
implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.9'
implementation 'com.badlogicgames.gdx:gdx:1.9.10'
implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.10'
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-windows'
implementation 'org.mapsforge:vtm-desktop-lwjgl:[CURRENT-VERSION]'
implementation 'com.badlogicgames.gdx:gdx:1.9.9'
implementation 'com.badlogicgames.gdx:gdx-platform:1.9.9:natives-desktop'
implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.9'
implementation 'com.badlogicgames.gdx:gdx:1.9.10'
implementation 'com.badlogicgames.gdx:gdx-platform:1.9.10:natives-desktop'
implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10'
implementation 'com.github.blackears:svgSalamander:v1.1.1'
```

View File

@ -3,7 +3,7 @@ buildscript {
jcenter()
}
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'
ext {
roboVMVersion = "2.3.5"
roboVMVersion = "2.3.7"
}
launchIPhoneSimulator.dependsOn build

View File

@ -3,7 +3,7 @@ buildscript {
jcenter()
}
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'
ext {
roboVMVersion = "2.3.5"
roboVMVersion = "2.3.7"
}
launchIPhoneSimulator.dependsOn build

View File

@ -3,7 +3,7 @@ buildscript {
jcenter()
}
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'
}
}

View File

@ -3,7 +3,7 @@ buildscript {
jcenter()
}
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'
}
}

View File

@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'org.wisepersist:gwt-gradle-plugin:1.0.8'
classpath 'org.wisepersist:gwt-gradle-plugin:1.0.13'
}
}

View File

@ -45,6 +45,7 @@ public class GwtInput implements Input {
boolean[] pressedKeys = new boolean[256];
boolean keyJustPressed = false;
boolean[] justPressedKeys = new boolean[256];
boolean[] justPressedButtons = new boolean[5];
InputProcessor processor;
char lastKeyCharPressed;
float keyRepeatTimer;
@ -58,7 +59,12 @@ public class GwtInput implements Input {
}
void reset() {
justTouched = false;
if (justTouched) {
justTouched = false;
for (int i = 0; i < justPressedButtons.length; i++) {
justPressedButtons[i] = false;
}
}
if (keyJustPressed) {
keyJustPressed = false;
for (int i = 0; i < justPressedKeys.length; i++) {
@ -100,6 +106,11 @@ public class GwtInput implements Input {
return 0;
}
@Override
public int getMaxPointers() {
return MAX_TOUCHES;
}
@Override
public int getX() {
return touchX[0];
@ -175,6 +186,12 @@ public class GwtInput implements Input {
return pressedButtons.contains(button) && touched[0];
}
@Override
public boolean isButtonJustPressed(int button) {
if (button < 0 || button >= justPressedButtons.length) return false;
return justPressedButtons[button];
}
@Override
public boolean isKeyPressed(int key) {
if (key == Keys.ANY_KEY) {
@ -276,6 +293,15 @@ public class GwtInput implements Input {
return false;
}
@Override
public void setCatchKey(int keycode, boolean catchKey) {
}
@Override
public boolean isCatchKey(int keycode) {
return false;
}
@Override
public void setInputProcessor(InputProcessor processor) {
this.processor = processor;
@ -542,6 +568,7 @@ public class GwtInput implements Input {
this.justTouched = true;
this.touched[0] = true;
this.pressedButtons.add(getButton(e.getButton()));
justPressedButtons[e.getButton()] = true;
this.deltaX[0] = 0;
this.deltaY[0] = 0;
if (isCursorCatched()) {