konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.2.2: updated libGDX to 1.13.6-SNAPSHOT

Browse Source
This commit is contained in:
Evan Debenham
2025-08-17 12:17:19 -04:00
parent 45c8eb3e70
commit 00c6c6a8ef
4 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SPD-classes/src/main/java/com/watabou/noosa/TextInput.java
View File

@@ -23,8 +23,10 @@ package com.watabou.noosa;
import com.badlogic.gdx.Files; import com.badlogic.gdx.Files;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Mesh;
import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.scenes.scene2d.ui.Container; import com.badlogic.gdx.scenes.scene2d.ui.Container;
@@ -64,6 +66,9 @@ public class TextInput extends Component {
viewport.setWorldSize(Game.width, Game.height); viewport.setWorldSize(Game.width, Game.height);
viewport.setScreenBounds(0, Game.bottomInset, Game.width, Game.height); viewport.setScreenBounds(0, Game.bottomInset, Game.width, Game.height);
viewport.setCamera(new OrthographicCamera()); viewport.setCamera(new OrthographicCamera());
//TODO this is needed for the moment as Spritebatch switched to using VAOs in libGDX v1.13.1
// This results in HARD crashes atm, whereas old vertex arrays work fine
SpriteBatch.overrideVertexType = Mesh.VertexDataType.VertexArray;
stage = new Stage(viewport); stage = new Stage(viewport);
Game.inputHandler.addInputProcessor(stage); Game.inputHandler.addInputProcessor(stage);

19
android/build.gradle
View File

@@ -59,19 +59,16 @@ configurations { natives }
dependencies { dependencies {
implementation project(':core') implementation project(':core')
// We are using the natives from 1.11.0 to maintain compatibility with Android 4.0-4.3 for now
// The 1.12.0+ natives are compiled with a version of the NDK which drops 4.3- support
// YES, THIS IS VERY DANGEROUS! 1.11.0 natives may only incidentally work with later libGDX versions
implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
natives "com.badlogicgames.gdx:gdx-platform:1.11.0:natives-armeabi-v7a" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
natives "com.badlogicgames.gdx:gdx-platform:1.11.0:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
natives "com.badlogicgames.gdx:gdx-platform:1.11.0:natives-x86" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-platform:1.11.0:natives-x86_64" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
natives "com.badlogicgames.gdx:gdx-freetype-platform:1.11.0:natives-armeabi-v7a" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
natives "com.badlogicgames.gdx:gdx-freetype-platform:1.11.0:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-freetype-platform:1.11.0:natives-x86" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
natives "com.badlogicgames.gdx:gdx-freetype-platform:1.11.0:natives-x86_64" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
implementation "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion" implementation "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion"
} }

2
build.gradle
View File

@@ -25,7 +25,7 @@ allprojects {
//will do this at the same time as dropping support for Android 4.4- (later in 2025) //will do this at the same time as dropping support for Android 4.4- (later in 2025)
appAndroidTargetSDK = 34 //Android 14 appAndroidTargetSDK = 34 //Android 14
gdxVersion = '1.12.1' gdxVersion = '1.13.6-SNAPSHOT' //using snapshot as 1.13.5 has issues with Android R8
gdxControllersVersion = '2.2.4' gdxControllersVersion = '2.2.4'
robovmVersion = '2.3.23' robovmVersion = '2.3.23'
} }

14
ios/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ios/IOSPlatformSupport.java
View File

@@ -35,11 +35,9 @@ import com.watabou.noosa.Game;
import com.watabou.utils.PlatformSupport; import com.watabou.utils.PlatformSupport;
import org.robovm.apple.audiotoolbox.AudioServices; import org.robovm.apple.audiotoolbox.AudioServices;
import org.robovm.apple.foundation.NSURL;
import org.robovm.apple.systemconfiguration.SCNetworkReachability; import org.robovm.apple.systemconfiguration.SCNetworkReachability;
import org.robovm.apple.systemconfiguration.SCNetworkReachabilityFlags; import org.robovm.apple.systemconfiguration.SCNetworkReachabilityFlags;
import org.robovm.apple.uikit.UIApplication; import org.robovm.apple.uikit.UIApplication;
import org.robovm.apple.uikit.UIApplicationOpenURLOptions;
import java.util.HashMap; import java.util.HashMap;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@@ -47,18 +45,6 @@ import java.util.regex.Pattern;
public class IOSPlatformSupport extends PlatformSupport { public class IOSPlatformSupport extends PlatformSupport {
@Override
public boolean openURI( String uri ){
//backported from libGDX 1.13.1, required for opening URLs on modern iOS
UIApplication uiApp = UIApplication.getSharedApplication();
NSURL url = new NSURL(uri);
if (uiApp.canOpenURL(url)) {
uiApp.openURL(url, new UIApplicationOpenURLOptions(), null);
return true;
}
return false;
}
@Override @Override
public void updateDisplaySize() { public void updateDisplaySize() {
//non-zero safe insets on left/top/right means device has a notch, show status bar //non-zero safe insets on left/top/right means device has a notch, show status bar