From 9b0a4623aaa80bad4a6c919fd477bf0504058a4c Mon Sep 17 00:00:00 2001 From: fgnm Date: Thu, 10 Mar 2022 16:18:05 +0100 Subject: [PATCH] Implement `TextureArrayCpuPolygonSpriteBatch` and `TextureArrayPolygonSpriteBatch` --- hyperlap2d-runtime-libgdx | 2 +- .../java/games/rednblack/editor/live/LivePreviewScreen.java | 3 ++- src/main/java/games/rednblack/editor/view/stage/Sandbox.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hyperlap2d-runtime-libgdx b/hyperlap2d-runtime-libgdx index 1aed3c11..f2ea2d95 160000 --- a/hyperlap2d-runtime-libgdx +++ b/hyperlap2d-runtime-libgdx @@ -1 +1 @@ -Subproject commit 1aed3c112d47c2f743029ff60a0729c5b07e1a53 +Subproject commit f2ea2d956c7338aa2702b117372d3f4331998da5 diff --git a/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java b/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java index 92ec7d17..96b6ab9a 100644 --- a/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java +++ b/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java @@ -19,6 +19,7 @@ import games.rednblack.editor.renderer.ExternalTypesConfiguration; import games.rednblack.editor.renderer.SceneConfiguration; import games.rednblack.editor.renderer.SceneLoader; import games.rednblack.editor.renderer.components.additional.ButtonComponent; +import games.rednblack.editor.renderer.utils.TextureArrayCpuPolygonSpriteBatch; import games.rednblack.editor.view.stage.Sandbox; import games.rednblack.h2d.extension.talos.TalosItemType; import games.rednblack.h2d.extension.typinglabel.TypingLabelItemType; @@ -61,7 +62,7 @@ public class LivePreviewScreen extends ScreenAdapter implements GestureDetector. externalItemTypes.addExternalItemType(new TalosItemType()); externalItemTypes.addExternalItemType(new TypingLabelItemType()); - SceneConfiguration config = new SceneConfiguration(); + SceneConfiguration config = new SceneConfiguration(new TextureArrayCpuPolygonSpriteBatch()); config.setResourceRetriever(resourceManager); config.setExternalItemTypes(externalItemTypes); diff --git a/src/main/java/games/rednblack/editor/view/stage/Sandbox.java b/src/main/java/games/rednblack/editor/view/stage/Sandbox.java index 5257aa91..ee2a0e9f 100644 --- a/src/main/java/games/rednblack/editor/view/stage/Sandbox.java +++ b/src/main/java/games/rednblack/editor/view/stage/Sandbox.java @@ -47,6 +47,7 @@ import games.rednblack.editor.renderer.systems.LightSystem; import games.rednblack.editor.renderer.systems.ParticleSystem; import games.rednblack.editor.renderer.systems.PhysicsSystem; import games.rednblack.editor.renderer.utils.HyperJson; +import games.rednblack.editor.renderer.utils.TextureArrayCpuPolygonSpriteBatch; import games.rednblack.editor.system.ParticleContinuousSystem; import games.rednblack.editor.system.PhysicsAdjustSystem; import games.rednblack.editor.system.TalosContinuousSystem; @@ -142,7 +143,7 @@ public class Sandbox { externalItemTypes.addExternalItemType(new TalosItemType()); externalItemTypes.addExternalItemType(new TypingLabelItemType()); - SceneConfiguration config = new SceneConfiguration(); + SceneConfiguration config = new SceneConfiguration(new TextureArrayCpuPolygonSpriteBatch()); config.setResourceRetriever(resourceManager); config.setExternalItemTypes(externalItemTypes);