refactor addEntityTransform and addEntityPhysic

assets/maps/mainmap.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.1-99-gec89c545" orientation="orthogonal" renderorder="right-down" width="18" height="16" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="3">
+<map version="1.10" tiledversion="1.11.1-99-gec89c545" orientation="orthogonal" renderorder="right-down" width="18" height="16" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="4">
  <tileset firstgid="1" source="tileset.tsx"/>
  <tileset firstgid="99" source="objects.tsx"/>
  <layer id="1" name="ground" width="18" height="16">
@@ -22,6 +22,9 @@
    eJyzZmBgsIRiKyQ2DFszEAcsCcjbEGmOFZQ2p9AcQu4h1l+E1FkRkIcBbO7RR8LEugebfcjmEPI3Me7BJU+sOaTIwwAtwxkELAjIk2ofuemHEY1PrXCmJP2QIo+sDlY+4GITAwB37wxQ
   </data>
  </layer>
+ <objectgroup id="6" name="trigger">
+  <object id="3" x="57.4441" y="351.747" width="38.9518" height="37.378"/>
+ </objectgroup>
  <objectgroup id="5" name="objects">
   <object id="1" gid="99" x="50.0586" y="458.934" width="32" height="32"/>
   <object id="2" gid="99" x="112.269" y="470.818" width="64" height="64"/>

core/src/main/java/io/github/com/quillraven/tiled/TiledAshleySpawner.java

@@ -26,10 +26,14 @@ import io.github.com.quillraven.component.Transform;
 public class TiledAshleySpawner {
     private final Engine engine;
     private final World physicWorld;
+    private final MapObjects tmpMapObjects;
+    private final Vector2 tmpVec2;
 
     public TiledAshleySpawner(Engine engine, World physicWorld) {
         this.engine = engine;
         this.physicWorld = physicWorld;
+        this.tmpMapObjects = new MapObjects();
+        this.tmpVec2 = new Vector2();
     }
 
     public void loadMapObjects(TiledMap tiledMap) {
@@ -48,8 +52,17 @@ public class TiledAshleySpawner {
         for (MapObject mapObject : triggerLayer.getObjects()) {
             if (mapObject instanceof RectangleMapObject rectMapObj) {
                 Entity entity = this.engine.createEntity();
-                addEntityTransform(rectMapObj, entity);
+                Rectangle rect = rectMapObj.getRectangle();
-                addEntityPhysic(rectMapObj, entity);
+                addEntityTransform(
+                    rect.getX(), rect.getY(),
+                    rect.getWidth(), rect.getHeight(),
+                    1f, 1f,
+                    entity);
+                addEntityPhysic(
+                    rectMapObj,
+                    BodyDef.BodyType.StaticBody,
+                    tmpVec2.set(rect.getX(), rect.getY()).scl(GdxGame.UNIT_SCALE),
+                    entity);
                 this.engine.addEntity(entity);
             } else {
                 throw new GdxRuntimeException("Unsupported trigger: " + mapObject.getClass().getSimpleName());
@@ -73,42 +86,42 @@ public class TiledAshleySpawner {
     private void spawnEntityOf(TiledMapTileMapObject tileMapObject) {
         Entity entity = this.engine.createEntity();
 
-        addEntityTransform(tileMapObject, entity);
+        TextureRegion textureRegion = tileMapObject.getTile().getTextureRegion();
-        addEntityPhysic(tileMapObject.getTile().getObjects(), entity);
+        addEntityTransform(
-        entity.add(new Graphic(tileMapObject.getTile().getTextureRegion(), Color.WHITE.cpy()));
+            tileMapObject.getX(), tileMapObject.getY(),
+            textureRegion.getRegionWidth(), textureRegion.getRegionHeight(),
+            tileMapObject.getScaleX(), tileMapObject.getScaleY(),
+            entity);
+        addEntityPhysic(
+            tileMapObject.getTile().getObjects(),
+            BodyDef.BodyType.DynamicBody,
+            Vector2.Zero,
+            entity);
+        entity.add(new Graphic(textureRegion, Color.WHITE.cpy()));
 
         this.engine.addEntity(entity);
     }
 
-    private void addEntityPhysic(RectangleMapObject rectMapObj, Entity entity) {
+    private void addEntityPhysic(MapObject mapObject, BodyDef.BodyType bodyType, Vector2 relativeTo, Entity entity) {
-        BodyDef bodyDef = new BodyDef();
+        if (tmpMapObjects.getCount() > 0) tmpMapObjects.remove(0);
-        bodyDef.type = BodyDef.BodyType.StaticBody;
-        Transform transform = entity.getComponent(Transform.class);
-        bodyDef.position.set(transform.position());
-        bodyDef.fixedRotation = true;
 
-        Body body = this.physicWorld.createBody(bodyDef);
+        tmpMapObjects.add(mapObject);
-        body.setUserData(entity);
+        addEntityPhysic(tmpMapObjects, bodyType, relativeTo, entity);
-        FixtureDef fixtureDef = TiledPhysics.fixtureDefOfMapObject(rectMapObj, transform.scaling(), new Vector2(transform.position()));
-        body.createFixture(fixtureDef);
-        fixtureDef.shape.dispose();
-
-        entity.add(new Physic(body, new Vector2(body.getPosition())));
     }
 
-    private void addEntityPhysic(MapObjects objects, Entity entity) {
+    private void addEntityPhysic(MapObjects mapObjects, BodyDef.BodyType bodyType, Vector2 relativeTo, Entity entity) {
-        if (objects.getCount() == 0) return;
+        if (mapObjects.getCount() == 0) return;
 
         BodyDef bodyDef = new BodyDef();
-        bodyDef.type = BodyDef.BodyType.DynamicBody;
+        bodyDef.type = bodyType;
         Transform transform = entity.getComponent(Transform.class);
         bodyDef.position.set(transform.position());
         bodyDef.fixedRotation = true;
 
         Body body = this.physicWorld.createBody(bodyDef);
         body.setUserData(entity);
-        for (MapObject object : objects) {
+        for (MapObject object : mapObjects) {
-            FixtureDef fixtureDef = TiledPhysics.fixtureDefOfMapObject(object, transform.scaling(), Vector2.Zero);
+            FixtureDef fixtureDef = TiledPhysics.fixtureDefOfMapObject(object, transform.scaling(), relativeTo);
             body.createFixture(fixtureDef);
             fixtureDef.shape.dispose();
         }
@@ -116,11 +129,15 @@ public class TiledAshleySpawner {
         entity.add(new Physic(body, new Vector2(body.getPosition())));
     }
 
-    private static void addEntityTransform(TiledMapTileMapObject tileMapObject, Entity entity) {
+    private static void addEntityTransform(
-        Vector2 position = new Vector2(tileMapObject.getX(), tileMapObject.getY());
+        float x, float y,
-        TextureRegion textureRegion = tileMapObject.getTile().getTextureRegion();
+        float w, float h,
-        Vector2 size = new Vector2(textureRegion.getRegionWidth(), textureRegion.getRegionHeight());
+        float scaleX, float scaleY,
-        Vector2 scaling = new Vector2(tileMapObject.getScaleX(), tileMapObject.getScaleY());
+        Entity entity
+    ) {
+        Vector2 position = new Vector2(x, y);
+        Vector2 size = new Vector2(w, h);
+        Vector2 scaling = new Vector2(scaleX, scaleY);
 
         position.scl(GdxGame.UNIT_SCALE);
         size.scl(GdxGame.UNIT_SCALE);
@@ -128,14 +145,4 @@ public class TiledAshleySpawner {
         entity.add(new Transform(position, 0, size, scaling, 0f));
     }
 
-    private void addEntityTransform(RectangleMapObject rectMapObj, Entity entity) {
-        Rectangle rect = rectMapObj.getRectangle();
-        Vector2 position = new Vector2(rect.getX(), rect.getY());
-        Vector2 size = new Vector2(rect.getWidth(), rect.getHeight());
-
-        position.scl(GdxGame.UNIT_SCALE);
-        size.scl(GdxGame.UNIT_SCALE);
-
-        entity.add(new Transform(position, 0, size, new Vector2(1f, 1f), 0f));
-    }
 }