From 7e88aa42fde3bda971fd0896da849cd4aee13ec8 Mon Sep 17 00:00:00 2001 From: fgnm Date: Sun, 12 Dec 2021 15:41:32 +0100 Subject: [PATCH] [Editor only] allow to use legacy libGDX format --- CHANGES | 2 +- build.gradle | 43 +------------------ hyperlap2d-common-api | 2 +- .../editor/proxy/ProjectManager.java | 3 +- .../ui/settings/ProjectExportSettings.java | 5 +++ 5 files changed, 10 insertions(+), 45 deletions(-) diff --git a/CHANGES b/CHANGES index 6e45231c..10b03811 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ - [BREAK CHANGE] Rework runtime code, replaced Ashley ECS with Artemis-odb - [BREAK CHANGE] Update Spine support to `4.0.18.1` - [BREAK CHANGE] Update Talos VFX support to `1.4.0` -- [BREAK CHANGE] Use new libGDX atlas packing format +- [BREAK CHANGE] Use new libGDX atlas packing format by default - Update libGDX to 1.10.1-SNAPSHOT - Support mono space fonts - Support Circle shapes for physics bodies diff --git a/build.gradle b/build.gradle index 1e37c325..2ee2d6ef 100644 --- a/build.gradle +++ b/build.gradle @@ -89,53 +89,12 @@ dependencies { implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion" - implementation "org.lwjgl:lwjgl:$lwjgl3Version" - implementation "org.lwjgl:lwjgl:$lwjgl3Version:natives-linux" - implementation "org.lwjgl:lwjgl:$lwjgl3Version:natives-linux-arm32" - implementation "org.lwjgl:lwjgl:$lwjgl3Version:natives-linux-arm64" - implementation "org.lwjgl:lwjgl:$lwjgl3Version:natives-macos" - //implementation "org.lwjgl:lwjgl:$lwjgl3Version:natives-macos-arm64" - implementation "org.lwjgl:lwjgl:$lwjgl3Version:natives-windows" - implementation "org.lwjgl:lwjgl:$lwjgl3Version:natives-windows-x86" - implementation "org.lwjgl:lwjgl-glfw:$lwjgl3Version" - implementation "org.lwjgl:lwjgl-glfw:$lwjgl3Version:natives-linux" - implementation "org.lwjgl:lwjgl-glfw:$lwjgl3Version:natives-linux-arm32" - implementation "org.lwjgl:lwjgl-glfw:$lwjgl3Version:natives-linux-arm64" - implementation "org.lwjgl:lwjgl-glfw:$lwjgl3Version:natives-macos" - //implementation "org.lwjgl:lwjgl-glfw:$lwjgl3Version:natives-macos-arm64" - implementation "org.lwjgl:lwjgl-glfw:$lwjgl3Version:natives-windows" - implementation "org.lwjgl:lwjgl-glfw:$lwjgl3Version:natives-windows-x86" - implementation "org.lwjgl:lwjgl-jemalloc:$lwjgl3Version" - implementation "org.lwjgl:lwjgl-jemalloc:$lwjgl3Version:natives-linux" - implementation "org.lwjgl:lwjgl-jemalloc:$lwjgl3Version:natives-linux-arm32" - implementation "org.lwjgl:lwjgl-jemalloc:$lwjgl3Version:natives-linux-arm64" - implementation "org.lwjgl:lwjgl-jemalloc:$lwjgl3Version:natives-macos" - //implementation "org.lwjgl:lwjgl-jemalloc:$lwjgl3Version:natives-macos-arm64" - implementation "org.lwjgl:lwjgl-jemalloc:$lwjgl3Version:natives-windows" - implementation "org.lwjgl:lwjgl-jemalloc:$lwjgl3Version:natives-windows-x86" - implementation "org.lwjgl:lwjgl-opengl:$lwjgl3Version" - implementation "org.lwjgl:lwjgl-opengl:$lwjgl3Version:natives-linux" - implementation "org.lwjgl:lwjgl-opengl:$lwjgl3Version:natives-linux-arm32" - implementation "org.lwjgl:lwjgl-opengl:$lwjgl3Version:natives-linux-arm64" - implementation "org.lwjgl:lwjgl-opengl:$lwjgl3Version:natives-macos" - //implementation "org.lwjgl:lwjgl-opengl:$lwjgl3Version:natives-macos-arm64" - implementation "org.lwjgl:lwjgl-opengl:$lwjgl3Version:natives-windows" - implementation "org.lwjgl:lwjgl-opengl:$lwjgl3Version:natives-windows-x86" - implementation "org.lwjgl:lwjgl-openal:$lwjgl3Version" - implementation "org.lwjgl:lwjgl-openal:$lwjgl3Version:natives-linux" - implementation "org.lwjgl:lwjgl-openal:$lwjgl3Version:natives-linux-arm32" - implementation "org.lwjgl:lwjgl-openal:$lwjgl3Version:natives-linux-arm64" - implementation "org.lwjgl:lwjgl-openal:$lwjgl3Version:natives-macos" - //implementation "org.lwjgl:lwjgl-openal:$lwjgl3Version:natives-macos-arm64" - implementation "org.lwjgl:lwjgl-openal:$lwjgl3Version:natives-windows" - implementation "org.lwjgl:lwjgl-openal:$lwjgl3Version:natives-windows-x86" - implementation "org.lwjgl:lwjgl-tinyfd:$lwjgl3Version" implementation "org.lwjgl:lwjgl-tinyfd:$lwjgl3Version:natives-linux" implementation "org.lwjgl:lwjgl-tinyfd:$lwjgl3Version:natives-linux-arm32" implementation "org.lwjgl:lwjgl-tinyfd:$lwjgl3Version:natives-linux-arm64" implementation "org.lwjgl:lwjgl-tinyfd:$lwjgl3Version:natives-macos" - //implementation "org.lwjgl:lwjgl-tinyfd:$lwjgl3Version:natives-macos-arm64" + implementation "org.lwjgl:lwjgl-tinyfd:$lwjgl3Version:natives-macos-arm64" implementation "org.lwjgl:lwjgl-tinyfd:$lwjgl3Version:natives-windows" implementation "org.lwjgl:lwjgl-tinyfd:$lwjgl3Version:natives-windows-x86" diff --git a/hyperlap2d-common-api b/hyperlap2d-common-api index 8d92d919..25457b5d 160000 --- a/hyperlap2d-common-api +++ b/hyperlap2d-common-api @@ -1 +1 @@ -Subproject commit 8d92d919a4c3f99b3e1d2bce7955fc3c8e1c2022 +Subproject commit 25457b5d12521e09903275ccf90a8f962226433f diff --git a/src/main/java/games/rednblack/editor/proxy/ProjectManager.java b/src/main/java/games/rednblack/editor/proxy/ProjectManager.java index bad189bb..50b32ad3 100755 --- a/src/main/java/games/rednblack/editor/proxy/ProjectManager.java +++ b/src/main/java/games/rednblack/editor/proxy/ProjectManager.java @@ -578,6 +578,7 @@ public class ProjectManager extends Proxy { vo.maxHeight = texturePackerVO.maxHeight; vo.maxWidth = texturePackerVO.maxWidth; vo.square = texturePackerVO.square; + vo.legacy = texturePackerVO.legacy; } public Settings getTexturePackerSettings() { @@ -590,7 +591,7 @@ public class ProjectManager extends Proxy { settings.filterMin = TexturePackerVO.filterMap.get(vo.filterMin); settings.square = vo.square; settings.flattenPaths = true; - settings.legacyOutput = false; + settings.legacyOutput = vo.legacy; return settings; } diff --git a/src/main/java/games/rednblack/editor/view/ui/settings/ProjectExportSettings.java b/src/main/java/games/rednblack/editor/view/ui/settings/ProjectExportSettings.java index 0c20883b..9cdfb737 100644 --- a/src/main/java/games/rednblack/editor/view/ui/settings/ProjectExportSettings.java +++ b/src/main/java/games/rednblack/editor/view/ui/settings/ProjectExportSettings.java @@ -22,6 +22,7 @@ public class ProjectExportSettings extends SettingsNodeValue { private final InputFileWidget exportSettingsInputFileWidget; private final VisCheckBox duplicateCheckBox; private final VisCheckBox forceSquareCheckBox; + private final VisCheckBox legacyCheckBox; private final VisSelectBox widthSelectBox; private final VisSelectBox heightSelectBox; private final VisSelectBox filterMagSelectBox; @@ -31,6 +32,7 @@ public class ProjectExportSettings extends SettingsNodeValue { super("Project Export", HyperLap2DFacade.getInstance()); duplicateCheckBox = StandardWidgetsFactory.createCheckBox("Duplicate edge pixels in atlas"); forceSquareCheckBox = StandardWidgetsFactory.createCheckBox("Force Square"); + legacyCheckBox = StandardWidgetsFactory.createCheckBox("Legacy libGDX format"); exportSettingsInputFileWidget = new InputFileWidget(FileChooser.Mode.OPEN, FileChooser.SelectionMode.DIRECTORIES, false); widthSelectBox = StandardWidgetsFactory.createSelectBox(Integer.class); heightSelectBox = StandardWidgetsFactory.createSelectBox(Integer.class); @@ -53,6 +55,7 @@ public class ProjectExportSettings extends SettingsNodeValue { texturePackerTable.add(getFilterTable()).padTop(10).left(); texturePackerTable.row().padTop(10); texturePackerTable.add(duplicateCheckBox).left().colspan(2).row(); + texturePackerTable.add(legacyCheckBox).left().colspan(2).row(); texturePackerTable.add(forceSquareCheckBox).left().row(); texturePackerTable.row().padTop(23); @@ -103,6 +106,7 @@ public class ProjectExportSettings extends SettingsNodeValue { heightSelectBox.setSelected(Integer.parseInt(vo.maxHeight)); duplicateCheckBox.setChecked(vo.duplicate); + legacyCheckBox.setChecked(vo.legacy); forceSquareCheckBox.setChecked(vo.square); filterMagSelectBox.setSelected(vo.filterMag); @@ -118,6 +122,7 @@ public class ProjectExportSettings extends SettingsNodeValue { vo.maxWidth = String.valueOf(widthSelectBox.getSelected()); vo.maxHeight = String.valueOf(heightSelectBox.getSelected()); vo.duplicate = duplicateCheckBox.isChecked(); + vo.legacy = legacyCheckBox.isChecked(); vo.square = forceSquareCheckBox.isChecked(); vo.filterMag = filterMagSelectBox.getSelected(); vo.filterMin = filterMinSelectBox.getSelected();