From 1d44057198ed230d3ecc2f375d455cc0dfc7e2b7 Mon Sep 17 00:00:00 2001 From: Emux Date: Sun, 29 Oct 2017 15:33:24 +0200 Subject: [PATCH] libGDX 1.9.7, fix #434 --- build.gradle | 2 +- docs/Changelog.md | 9 +++-- docs/Integration.md | 10 +++--- .../natives/arm64-v8a/lib/arm64-v8a/libgdx.so | Bin 301304 -> 301304 bytes .../armeabi-v7a/lib/armeabi-v7a/libgdx.so | Bin 292848 -> 292848 bytes .../natives/armeabi/lib/armeabi/libgdx.so | Bin 305128 -> 305128 bytes vtm-android-gdx/natives/x86/lib/x86/libgdx.so | Bin 337796 -> 337796 bytes .../natives/x86_64/lib/x86_64/libgdx.so | Bin 338440 -> 338440 bytes vtm-ios-example/build.gradle | 2 +- vtm-ios/build.gradle | 2 +- .../gdx/backends/gwt/GwtGraphics.java | 31 ++++++++++++------ 11 files changed, 36 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index d37c5ff7..93a708df 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ allprojects { ext.isReleaseVersion = !version.endsWith("SNAPSHOT") ext.androidBuildVersionTools = "27.0.0" - ext.gdxVersion = "1.9.6" + ext.gdxVersion = "1.9.7" ext.gwtVersion = "2.8.0" ext.slf4jVersion = "1.7.25" diff --git a/docs/Changelog.md b/docs/Changelog.md index 0ed08759..180f1504 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -22,6 +22,7 @@ - vtm-theme-comparator module [#387](https://github.com/mapsforge/vtm/issues/387) - Feature parameters [#403](https://github.com/mapsforge/vtm/issues/403) - Gradle 4 / Android plugin 3 support [#433](https://github.com/mapsforge/vtm/issues/433) +- libGDX 1.9.7 [#434](https://github.com/mapsforge/vtm/issues/434) - Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41) - Many other minor improvements and bug fixes - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.9.0) @@ -45,6 +46,8 @@ - Improve canvas DPI setting [#349](https://github.com/mapsforge/vtm/issues/349) - OSM indoor layer enhancements [#366](https://github.com/mapsforge/vtm/issues/366) - Gretty plugin at web modules [#338](https://github.com/mapsforge/vtm/issues/338) +- libGDX 1.9.6 [#333](https://github.com/mapsforge/vtm/issues/333) +- Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41) - Many other minor improvements and bug fixes - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.8.0) @@ -70,6 +73,7 @@ - Tile grid layer scaling [#238](https://github.com/mapsforge/vtm/issues/238) - Internal render themes new SVG resources [#251](https://github.com/mapsforge/vtm/issues/251) - Fix theme parsing in non-Latin locales [#297](https://github.com/mapsforge/vtm/issues/297) +- libGDX 1.9.5 [#270](https://github.com/mapsforge/vtm/issues/270) - Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41) - Many other minor improvements and bug fixes - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.7.0) @@ -92,9 +96,10 @@ - GeoPoint & BoundingBox improvements [#201](https://github.com/mapsforge/vtm/issues/201) [#200](https://github.com/mapsforge/vtm/issues/200) - vtm-jts module [#53](https://github.com/mapsforge/vtm/issues/53) - vtm-http module [#140](https://github.com/mapsforge/vtm/issues/140) -- Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41) - LWJGL desktop libGDX backend [#129](https://github.com/mapsforge/vtm/issues/129) -- SNAPSHOT builds publish to Sonatype OSSRH [#165](https://github.com/mapsforge/vtm/issues/165) - Available on [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.mapsforge%22) +- SNAPSHOT builds publish to Sonatype OSSRH [#165](https://github.com/mapsforge/vtm/issues/165) +- libGDX 1.9.4 [#164](https://github.com/mapsforge/vtm/issues/164) +- Internal render themes various improvements [#41](https://github.com/mapsforge/vtm/issues/41) - Many other minor improvements and bug fixes - [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.6.0) diff --git a/docs/Integration.md b/docs/Integration.md index 945c599c..e985fc78 100644 --- a/docs/Integration.md +++ b/docs/Integration.md @@ -41,8 +41,8 @@ implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi' implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi-v7a' 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.6' -implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.6' +implementation 'com.badlogicgames.gdx:gdx:1.9.7' +implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.7' implementation 'com.caverock:androidsvg:1.2.2-beta-1' ``` @@ -57,9 +57,9 @@ implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]' 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 'com.badlogicgames.gdx:gdx:1.9.6' -implementation 'com.badlogicgames.gdx:gdx-platform:1.9.6:natives-desktop' -implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.6' +implementation 'com.badlogicgames.gdx:gdx:1.9.7' +implementation 'com.badlogicgames.gdx:gdx-platform:1.9.7:natives-desktop' +implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.7' implementation 'org.lwjgl.lwjgl:lwjgl:2.9.3' implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-linux' implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-osx' diff --git a/vtm-android-gdx/natives/arm64-v8a/lib/arm64-v8a/libgdx.so b/vtm-android-gdx/natives/arm64-v8a/lib/arm64-v8a/libgdx.so index 44b986591c51bf0d8f016b45ce142b10f53710e8..24f4c996e26420cda65910a53f9e913e6dac4882 100644 GIT binary patch delta 51 zcmeydQRv4;p$#_}MK%XUzR^ADRpbP-%=oWVX delta 57 zcmezHUhu!bl0!9#K0%GRv J3m91f$^eZ=6ea)w diff --git a/vtm-android-gdx/natives/armeabi/lib/armeabi/libgdx.so b/vtm-android-gdx/natives/armeabi/lib/armeabi/libgdx.so index 2a0b568b9d941a0db95020d094c04a201010658f..b7fcf3ff88e8ecf9898ac3b4222319351f9d2106 100644 GIT binary patch delta 57 zcmaEHUg*Vnp$!#`qVp_fC`tX@vgTh)m!96VN$*cPACh30-q_C~+`NFXeE}l~GXXL4 K_63YA9?Jj&UKi;A delta 57 zcmaEHUg*Vnp$!#`qEBKD1)oS*S)R^f-tTrG>`T$V^^pwI8~a&=n-?&)FJJ^=CLm_s KzJQU%V;KMmXBZIx diff --git a/vtm-android-gdx/natives/x86/lib/x86/libgdx.so b/vtm-android-gdx/natives/x86/lib/x86/libgdx.so index 1efadc990ada18a8fb78ca7453923aee90bf55ae..f302aaae0f862f2e1eee9d51ab14322ee8a66635 100644 GIT binary patch delta 66 zcmZoUFVb>eWP=N%=*tPGA9>73zGa!Z_tfo|_vajCvhin_?s$krczT06D@$_$V|xK3 S2r~gOGZ3?EFJNR9Q3C+riWv_8 delta 66 zcmZoUFVb>eWP=N%sCT)L^NuZRe>C0ubJkBKVuP|uP#?o|$3rZ_(;L)TS(*zN+Y1;$ Rmc$i`g?uiZ}h&RjQXw&&d0I=79kPrE*OA)`#Q15>*L6C)6VXl5X0 L+3vu^dO{rl{3I4F delta 59 zcmeCUBGPe1WP<>cNZ)%m;p>s>GPw7@&g?zGC(<6;rZssXqfD~{Q@aBbBM^gVW*}zS K?!d%)LLC6LwG<@) diff --git a/vtm-ios-example/build.gradle b/vtm-ios-example/build.gradle index 030137ae..31eaace6 100644 --- a/vtm-ios-example/build.gradle +++ b/vtm-ios-example/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.2' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.3' } } diff --git a/vtm-ios/build.gradle b/vtm-ios/build.gradle index 3b50056e..dc55e7bb 100644 --- a/vtm-ios/build.gradle +++ b/vtm-ios/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.2' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.3' } } 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 bb6df25d..e1538bdd 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 @@ -143,6 +143,27 @@ public class GwtGraphics implements Graphics { return gl; } + @Override + public void setGL20(GL20 gl20) { + this.gl = gl20; + Gdx.gl = gl20; + Gdx.gl20 = gl20; + } + + @Override + public boolean isGL30Available() { + return false; + } + + @Override + public GL30 getGL30() { + return null; + } + + @Override + public void setGL30(GL30 gl30) { + } + @Override public int getWidth() { return canvas.getWidth(); @@ -524,16 +545,6 @@ public class GwtGraphics implements Graphics { return isFullscreenJSNI(); } - @Override - public boolean isGL30Available() { - return false; - } - - @Override - public GL30 getGL30() { - return null; - } - @Override public Cursor newCursor(Pixmap pixmap, int xHotspot, int yHotspot) { return new GwtCursor(pixmap, xHotspot, yHotspot);