From ee39eab8ebe506ec4ebe8c204b6e804a58865ead Mon Sep 17 00:00:00 2001 From: Quillraven Date: Tue, 24 Jun 2025 20:20:02 +0200 Subject: [PATCH] update to LibGDX 1.13.6-SNAPSHOT --- build.gradle | 2 ++ .../github/com/quillraven/asset/MapAsset.java | 6 +++++- .../com/quillraven/system/RenderSystem.java | 12 ++++++----- .../com/quillraven/tiled/TiledRenderer.java | 20 ------------------- gradle.properties | 2 +- 5 files changed, 15 insertions(+), 27 deletions(-) delete mode 100644 core/src/main/java/io/github/com/quillraven/tiled/TiledRenderer.java diff --git a/build.gradle b/build.gradle index 32d5cfb..9de2adc 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,7 @@ buildscript { google() maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' } + maven { url 'https://central.sonatype.com/repository/maven-snapshots/' } } dependencies { @@ -67,6 +68,7 @@ subprojects { maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' } maven { url 'https://jitpack.io' } + maven { url 'https://central.sonatype.com/repository/maven-snapshots/' } } } diff --git a/core/src/main/java/io/github/com/quillraven/asset/MapAsset.java b/core/src/main/java/io/github/com/quillraven/asset/MapAsset.java index a28737a..e30715c 100644 --- a/core/src/main/java/io/github/com/quillraven/asset/MapAsset.java +++ b/core/src/main/java/io/github/com/quillraven/asset/MapAsset.java @@ -1,7 +1,9 @@ package io.github.com.quillraven.asset; import com.badlogic.gdx.assets.AssetDescriptor; +import com.badlogic.gdx.maps.tiled.BaseTiledMapLoader; import com.badlogic.gdx.maps.tiled.TiledMap; +import com.badlogic.gdx.maps.tiled.TmxMapLoader; public enum MapAsset implements Asset { MAIN("mainmap.tmx"); @@ -9,7 +11,9 @@ public enum MapAsset implements Asset { private final AssetDescriptor descriptor; MapAsset(String mapName) { - this.descriptor = new AssetDescriptor<>("maps/" + mapName, TiledMap.class); + BaseTiledMapLoader.Parameters parameters = new TmxMapLoader.Parameters(); + parameters.projectFilePath = "maps/mystic.tiled-project"; + this.descriptor = new AssetDescriptor<>("maps/" + mapName, TiledMap.class, parameters); } @Override diff --git a/core/src/main/java/io/github/com/quillraven/system/RenderSystem.java b/core/src/main/java/io/github/com/quillraven/system/RenderSystem.java index 50fa8f3..1835ceb 100644 --- a/core/src/main/java/io/github/com/quillraven/system/RenderSystem.java +++ b/core/src/main/java/io/github/com/quillraven/system/RenderSystem.java @@ -8,13 +8,15 @@ import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.maps.MapLayer; import com.badlogic.gdx.maps.tiled.TiledMap; +import com.badlogic.gdx.maps.tiled.renderers.BatchTiledMapRenderer; +import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer; import com.badlogic.gdx.maps.tiled.tiles.AnimatedTiledMapTile; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.utils.viewport.Viewport; +import io.github.com.quillraven.GdxGame; import io.github.com.quillraven.component.Graphic; import io.github.com.quillraven.component.Transform; -import io.github.com.quillraven.tiled.TiledRenderer; import java.util.ArrayList; import java.util.Comparator; @@ -25,7 +27,7 @@ public class RenderSystem extends SortedIteratingSystem implements Disposable { private final OrthographicCamera camera; private final Viewport viewport; - private final TiledRenderer tiledRenderer; + private final BatchTiledMapRenderer tiledRenderer; private final List fgdLayers; private final List bgdLayers; @@ -38,7 +40,7 @@ public class RenderSystem extends SortedIteratingSystem implements Disposable { this.batch = batch; this.viewport = viewport; this.camera = camera; - this.tiledRenderer = new TiledRenderer(batch); + this.tiledRenderer = new OrthogonalTiledMapRenderer(null, GdxGame.UNIT_SCALE, batch); this.fgdLayers = new ArrayList<>(); this.bgdLayers = new ArrayList<>(); } @@ -54,13 +56,13 @@ public class RenderSystem extends SortedIteratingSystem implements Disposable { batch.begin(); batch.setColor(Color.WHITE); this.tiledRenderer.setView(camera); - this.tiledRenderer.renderLayers(bgdLayers); + bgdLayers.forEach(tiledRenderer::renderMapLayer); forceSort(); super.update(deltaTime); batch.setColor(Color.WHITE); - this.tiledRenderer.renderLayers(fgdLayers); + fgdLayers.forEach(tiledRenderer::renderMapLayer); batch.end(); } diff --git a/core/src/main/java/io/github/com/quillraven/tiled/TiledRenderer.java b/core/src/main/java/io/github/com/quillraven/tiled/TiledRenderer.java deleted file mode 100644 index 3d0d73f..0000000 --- a/core/src/main/java/io/github/com/quillraven/tiled/TiledRenderer.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.github.com.quillraven.tiled; - -import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.maps.MapLayer; -import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer; -import io.github.com.quillraven.GdxGame; - -import java.util.List; - -public class TiledRenderer extends OrthogonalTiledMapRenderer { - public TiledRenderer(Batch batch) { - super(null, GdxGame.UNIT_SCALE, batch); - } - - public void renderLayers(List layers) { - for (MapLayer layer : layers) { - this.renderMapLayer(layer); - } - } -} diff --git a/gradle.properties b/gradle.properties index 85bdcdd..321bdd8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ ashleyVersion=1.7.4 box2dlightsVersion=1.5 enableGraalNative=false graalHelperVersion=2.0.1 -gdxVersion=1.13.5 +gdxVersion=1.13.6-SNAPSHOT projectVersion=1.0.0 stripeVersion=2.0.0 tenPatchVersion=5.2.3