Seth/HyperLap2D
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Editor only] allow to use legacy libGDX format

Browse Source
This commit is contained in:
fgnm
2021-12-12 15:41:32 +01:00
parent 67de084a61
commit 7e88aa42fd
5 changed files with 10 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1 -1
View File
@@ -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
build.gradle
+1 -42
View File
@@ -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"
hyperlap2d-common-api
+1 -1
Submodule hyperlap2d-common-api updated: 8d92d919a4...25457b5d12
src/main/java/games/rednblack/editor/proxy/ProjectManager.java
+2 -1
View File
@@ -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;
}
src/main/java/games/rednblack/editor/view/ui/settings/ProjectExportSettings.java
+5
View File
@@ -22,6 +22,7 @@ public class ProjectExportSettings extends SettingsNodeValue<ProjectVO> {
private final InputFileWidget exportSettingsInputFileWidget;
private final VisCheckBox duplicateCheckBox;
private final VisCheckBox forceSquareCheckBox;
private final VisCheckBox legacyCheckBox;
private final VisSelectBox<Integer> widthSelectBox;
private final VisSelectBox<Integer> heightSelectBox;
private final VisSelectBox<String> filterMagSelectBox;
@@ -31,6 +32,7 @@ public class ProjectExportSettings extends SettingsNodeValue<ProjectVO> {
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<ProjectVO> {
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<ProjectVO> {
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<ProjectVO> {
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();