update to LibGDX 1.13.6-SNAPSHOT
This commit is contained in:
@@ -7,6 +7,7 @@ buildscript {
|
|||||||
google()
|
google()
|
||||||
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
|
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
|
||||||
maven { url 'https://s01.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 {
|
dependencies {
|
||||||
|
|
||||||
@@ -67,6 +68,7 @@ subprojects {
|
|||||||
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
|
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
|
||||||
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
|
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
|
||||||
maven { url 'https://jitpack.io' }
|
maven { url 'https://jitpack.io' }
|
||||||
|
maven { url 'https://central.sonatype.com/repository/maven-snapshots/' }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
package io.github.com.quillraven.asset;
|
package io.github.com.quillraven.asset;
|
||||||
|
|
||||||
import com.badlogic.gdx.assets.AssetDescriptor;
|
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.TiledMap;
|
||||||
|
import com.badlogic.gdx.maps.tiled.TmxMapLoader;
|
||||||
|
|
||||||
public enum MapAsset implements Asset<TiledMap> {
|
public enum MapAsset implements Asset<TiledMap> {
|
||||||
MAIN("mainmap.tmx");
|
MAIN("mainmap.tmx");
|
||||||
@@ -9,7 +11,9 @@ public enum MapAsset implements Asset<TiledMap> {
|
|||||||
private final AssetDescriptor<TiledMap> descriptor;
|
private final AssetDescriptor<TiledMap> descriptor;
|
||||||
|
|
||||||
MapAsset(String mapName) {
|
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
|
@Override
|
||||||
|
|||||||
@@ -8,13 +8,15 @@ import com.badlogic.gdx.graphics.OrthographicCamera;
|
|||||||
import com.badlogic.gdx.graphics.g2d.Batch;
|
import com.badlogic.gdx.graphics.g2d.Batch;
|
||||||
import com.badlogic.gdx.maps.MapLayer;
|
import com.badlogic.gdx.maps.MapLayer;
|
||||||
import com.badlogic.gdx.maps.tiled.TiledMap;
|
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.maps.tiled.tiles.AnimatedTiledMapTile;
|
||||||
import com.badlogic.gdx.math.Vector2;
|
import com.badlogic.gdx.math.Vector2;
|
||||||
import com.badlogic.gdx.utils.Disposable;
|
import com.badlogic.gdx.utils.Disposable;
|
||||||
import com.badlogic.gdx.utils.viewport.Viewport;
|
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.Graphic;
|
||||||
import io.github.com.quillraven.component.Transform;
|
import io.github.com.quillraven.component.Transform;
|
||||||
import io.github.com.quillraven.tiled.TiledRenderer;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
@@ -25,7 +27,7 @@ public class RenderSystem extends SortedIteratingSystem implements Disposable {
|
|||||||
private final OrthographicCamera camera;
|
private final OrthographicCamera camera;
|
||||||
private final Viewport viewport;
|
private final Viewport viewport;
|
||||||
|
|
||||||
private final TiledRenderer tiledRenderer;
|
private final BatchTiledMapRenderer tiledRenderer;
|
||||||
private final List<MapLayer> fgdLayers;
|
private final List<MapLayer> fgdLayers;
|
||||||
private final List<MapLayer> bgdLayers;
|
private final List<MapLayer> bgdLayers;
|
||||||
|
|
||||||
@@ -38,7 +40,7 @@ public class RenderSystem extends SortedIteratingSystem implements Disposable {
|
|||||||
this.batch = batch;
|
this.batch = batch;
|
||||||
this.viewport = viewport;
|
this.viewport = viewport;
|
||||||
this.camera = camera;
|
this.camera = camera;
|
||||||
this.tiledRenderer = new TiledRenderer(batch);
|
this.tiledRenderer = new OrthogonalTiledMapRenderer(null, GdxGame.UNIT_SCALE, batch);
|
||||||
this.fgdLayers = new ArrayList<>();
|
this.fgdLayers = new ArrayList<>();
|
||||||
this.bgdLayers = new ArrayList<>();
|
this.bgdLayers = new ArrayList<>();
|
||||||
}
|
}
|
||||||
@@ -54,13 +56,13 @@ public class RenderSystem extends SortedIteratingSystem implements Disposable {
|
|||||||
batch.begin();
|
batch.begin();
|
||||||
batch.setColor(Color.WHITE);
|
batch.setColor(Color.WHITE);
|
||||||
this.tiledRenderer.setView(camera);
|
this.tiledRenderer.setView(camera);
|
||||||
this.tiledRenderer.renderLayers(bgdLayers);
|
bgdLayers.forEach(tiledRenderer::renderMapLayer);
|
||||||
|
|
||||||
forceSort();
|
forceSort();
|
||||||
super.update(deltaTime);
|
super.update(deltaTime);
|
||||||
|
|
||||||
batch.setColor(Color.WHITE);
|
batch.setColor(Color.WHITE);
|
||||||
this.tiledRenderer.renderLayers(fgdLayers);
|
fgdLayers.forEach(tiledRenderer::renderMapLayer);
|
||||||
batch.end();
|
batch.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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<MapLayer> layers) {
|
|
||||||
for (MapLayer layer : layers) {
|
|
||||||
this.renderMapLayer(layer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,7 @@ ashleyVersion=1.7.4
|
|||||||
box2dlightsVersion=1.5
|
box2dlightsVersion=1.5
|
||||||
enableGraalNative=false
|
enableGraalNative=false
|
||||||
graalHelperVersion=2.0.1
|
graalHelperVersion=2.0.1
|
||||||
gdxVersion=1.13.5
|
gdxVersion=1.13.6-SNAPSHOT
|
||||||
projectVersion=1.0.0
|
projectVersion=1.0.0
|
||||||
stripeVersion=2.0.0
|
stripeVersion=2.0.0
|
||||||
tenPatchVersion=5.2.3
|
tenPatchVersion=5.2.3
|
||||||
|
|||||||
Reference in New Issue
Block a user