From 1fa51c9b1463fcf95316da5fea248a7f869c3457 Mon Sep 17 00:00:00 2001
From: Quillraven <quillraven@gmail.com>
Date: Sun, 1 Jun 2025 02:01:27 +0200
Subject: [PATCH] fix prop graphic's region to use the correct atlas region

---
 assets/maps/mainmap.tmx                       |  25 ++++++-----------
 assets/maps/objects.tsx                       |  19 ++++++-------
 assets/maps/objects/oak_tree.png              | Bin 1495 -> 5406 bytes
 .../quillraven/tiled/TiledAshleySpawner.java  |  26 ++++++++++++++++--
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/assets/maps/mainmap.tmx b/assets/maps/mainmap.tmx
index 73f9c89..62fd9df 100644
--- a/assets/maps/mainmap.tmx
+++ b/assets/maps/mainmap.tmx
@@ -1,36 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="18" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="11">
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="18" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="15">
  <properties>
   <property name="music" value="TOWN"/>
  </properties>
  <tileset firstgid="1" source="objects.tsx"/>
- <tileset firstgid="6" source="tileset.tsx"/>
+ <tileset firstgid="7" source="tileset.tsx"/>
  <layer id="1" name="ground" width="18" height="16">
   <data encoding="base64" compression="zlib">
-   eJylkjsPwjAMhDPykCoeEjDBxkgzARPqBEywla2w9lfkr3OVYulkuSHA8Elt5DvH5wTn3BosDTYgfMHEOCtBEb/34KA4GpotGBjnRfR4gJZ4girW7AwN/3ezrsApam/gQlyNvp3nIubhySOQT2XocuGZ2MdnaiVL8WhA3ZOtoPegM2Vqo16Qflwvmd4Tnry7Vu2Ad+EpY6uHJpWV+LzI55e9neNsfAfr3eR6sbb8UK/f978MwUgx7qlN3W0KZop5Rv83Ub9shA==
+   eJylkjsPwjAMhLPykCoeEjDBxkgzARPqBEywla2w9lfkp3OVYumwTAgwfFIb+c7xOcE5twRzgxUIXzAyzkpQxO8t2Cn2hmYNesZ5ET1uoCXuoIo1G0PD/92sC3CI2gs4EWejb+c5i3l48gjkUxm6XHgm9vGZWslSPBpQOztbQe9BZ8rURr0g/bheMr0mPHl3rXvdAe/CU8ZWD00qK/F5kM8vezvG2fgO1rvJ9WJt+aFev+9/6YOBYvimNnW3MZgophn9n9wdbaQ=
   </data>
  </layer>
  <layer id="3" name="water" width="18" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjALKgRES25BIPQAWUABk
-  </data>
- </layer>
- <layer id="4" name="water2" width="18" height="16">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIKBAQAEgAAB
-  </data>
- </layer>
- <layer id="2" name="props" width="18" height="16">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIKBAQAEgAAB
+   eJxjYBgFo2AUjALKgTES24hIPQAWrABm
   </data>
  </layer>
  <objectgroup id="6" name="trigger"/>
  <objectgroup id="5" name="objects">
   <object id="5" gid="3" x="197" y="118" width="80" height="112"/>
-  <object id="6" gid="4" x="58" y="101" width="64" height="80"/>
-  <object id="7" gid="4" x="43" y="215" width="64" height="80"/>
-  <object id="8" gid="4" x="199" y="216" width="64" height="80"/>
   <object id="9" gid="5" x="32" y="32" width="16" height="16"/>
   <object id="10" gid="2" x="25" y="214" width="32" height="32">
    <properties>
@@ -38,5 +25,9 @@
     <property name="controller" type="bool" value="true"/>
    </properties>
   </object>
+  <object id="11" gid="6" x="44" y="200" width="41" height="63"/>
+  <object id="12" gid="6" x="137" y="206" width="41" height="63"/>
+  <object id="13" gid="6" x="72" y="93" width="41" height="63"/>
+  <object id="14" gid="6" x="176" y="123" width="41" height="63"/>
  </objectgroup>
 </map>
diff --git a/assets/maps/objects.tsx b/assets/maps/objects.tsx
index 715e5e1..6425ee0 100644
--- a/assets/maps/objects.tsx
+++ b/assets/maps/objects.tsx
@@ -19,21 +19,18 @@
    <object id="1" x="7" y="82" width="67" height="26"/>
   </objectgroup>
  </tile>
- <tile id="3" type="Prop">
-  <properties>
-   <property name="sortOffsetY" type="int" value="8"/>
-  </properties>
-  <image source="objects/oak_tree.png" width="64" height="80"/>
-  <objectgroup draworder="index" id="2">
-   <object id="2" x="24" y="63">
-    <polygon points="0,0 6,1 11,1 16,-1 16,-2 13,-6 13,-12 3,-12 3,-6 2,-5 1,-3"/>
-   </object>
-  </objectgroup>
- </tile>
  <tile id="4" type="Prop">
   <image source="objects/chest.png" width="16" height="16"/>
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="4" width="16" height="10"/>
   </objectgroup>
  </tile>
+ <tile id="5" type="Prop">
+  <image source="objects/oak_tree.png" width="41" height="63"/>
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="13" y="54">
+    <polygon points="0,0 6,1 11,1 16,-1 16,-2 14,-5 13,-13 3,-13 3,-6 2,-5 1,-3 0,-1"/>
+   </object>
+  </objectgroup>
+ </tile>
 </tileset>
diff --git a/assets/maps/objects/oak_tree.png b/assets/maps/objects/oak_tree.png
index 5dbb903cf3178b51b6c40c3f2743d8882bf25a57..a88b0fccc26f591a1487ea26635eeada9e053921 100644
GIT binary patch
literal 5406
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
BI*<SW

literal 1495
zcmV;|1t|K7P)<h;3K|Lk000e1NJLTq002M$002-31^@s6slRhY00001b5ch_0Itp)
z=>Px)kx4{BRCt{2TTf3LM-=}#HKGPZy|6_JI2R5EBBTZhM>2<8BIO!Kh)>ZkkOL<l
z`U(0aEELX_a)|^;7^#VbV&j7kjX{;Q?txZd(OA%fndR+xcD*z6X6a#n63Xn(?Cg8L
z_h;VBIzWaD88T$ZkRd~cbWvFFZVL<E?L*6vb1^AZY;f-9#P#6Z&x!ukoiYHRS!;lf
zbs<k2@|=?iMTK$z(5yA6vSa=9x>;-7st9ulwigJiHfs%3>lFY%`(y}UWMx_D(po+=
zrnHtv`(zjz+pIO5lkkXR66*4+J7w%`9|E{nvRbbMZF*n6RuSboS6H)KSnzJE^-9Qk
zvVsEblVN0^YRumDVc<=B+lNlPfsFvy5MBlF<_4<}NP8Ju-6>;rr_B0ZV**6d6EWXD
z83qZ>1?14;$_*?@P)>5(P~{FTZ?Gaj6ftxua{)T9SZ2B2WkdjVe_F`_a2g8jlOebh
zu2D9nrK}1r!-0ZhWiVb&C<(NxOG|k<>`dzfs}P_9xLg5L;Cin%0dm%rW1gFcxcR8{
zO`+v7@-~*P&D8z5LLuoqbkn692FA-EU5aEuIrBi22XJ|scG6JAKNkd%D&^?ARQ;w~
zXDts<#eWhc9Y>Xy$rZVV&PBJ;rpusq2vqBpp!m`8fTRUdX)Pbjt2#G`I!iDuiM0vX
zujj@NE#ee2EtBI2ljo||E2!2hMkHtvFgW*f{_a8Oo)A(ctgO5a396(jzk?$Y8YMws
z{9rTg6ezAgDJInerj?+URD}ia*4x^IxAJY`*hyibn?HbPPp~;IGpYmp)>LR0s8S}X
zE{F=1NipxL<TlCy{_X+1txe^aBneS&C(RL2>%R@OJwUjcDhy~sl$E7!Jjt4qh!SYl
z8t}F@;caaiFM}+loKB%5kB@6l+FL|<p$?2z0g(v(*3?Lln55{prV=I1q>$(HTT}3N
z4~&zbu?MJ>m+x^YPv;TDdn@09__z5^V3Y&oVn_%n1XSIZ+fndaQ_5%LXE~GyEY1W)
zTaH6&eHpU1M0twJlT^6u3~}}8$chA`5D=fRXP&<Z2{XHtPi$oh>eg}NE<60kZq^@0
zE;~c`y9bzE%8%Wb5#`=d{g<8L*gRLCj)H$}tq)j!92KE3^ZZ3XfN)Fso=i{_<gqFu
zITRPL@&GD?uvVP%RGFyu>{33`>Mp>-B29`SFC-;G?x!SDP!c#lkF)>afQE%YltOW1
zgu;|i7eA0-`8rG?3mK(+`EfCn(C9Uti!0eh!PyUxqQU|I%8!cxfW|-F&^5i6)=%b~
zeaIsUECWX^;9k*<`RTi^V(6LC{USb|{=PDL4ghfKN=Cpz2;5<r{9$nJuME!p6##hq
ztPmQwF+Uv;Qk+wY6Pk+~+yqP%w6y32if+tLM=5PQzb-gKAhBSjMGt_FZvQ4|1JmgC
zZ*<<p5*l0{pk<ZznXgpVz#FW=L4cMZA3pbj_N$-fQ+>Azu99FZg!S8Je(3rkU`v3u
z1%#U)_pSlldxWO@TggC?ng_gGUT?j7{S?5xvcmGmz3ZU;?)6i=TwZUbC6^5WM$C`0
z{s_gnM}a3C_pU>IX~+Tq-<duLU@qxEVg2@*kH7xD!uu}+Y|KyNhnXDStUtki=K=t*
z-?_k#-~Wp@>rc?VnECmS{-3{U$kW$V07y9rcKbJY|78$dQ;Xk~zv%XF&_4513k91(
z=oATDPgwuM=N^uG*MXwIdaHQmkCE`vth_NUifngW#<3@?`}SD@r9}_F{PvZQqm2h6
z0C2QP(STJ+{2+zU{|Q`&4iDu8)*B+uQ<t<!VA&0FA3LQ*0^2E(t8+J3M6e%^rE&0R
xONP@k!PNh=GA0w^RN)L6GGxe*Awvd%{{Wm9T$?-tmy`ei002ovPDHLkV1lOzzy|;T

diff --git a/core/src/main/java/io/github/com/quillraven/tiled/TiledAshleySpawner.java b/core/src/main/java/io/github/com/quillraven/tiled/TiledAshleySpawner.java
index e10232d..f913175 100644
--- a/core/src/main/java/io/github/com/quillraven/tiled/TiledAshleySpawner.java
+++ b/core/src/main/java/io/github/com/quillraven/tiled/TiledAshleySpawner.java
@@ -4,6 +4,7 @@ import com.badlogic.ashley.core.Engine;
 import com.badlogic.ashley.core.Entity;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.Animation;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.graphics.glutils.FileTextureData;
 import com.badlogic.gdx.maps.MapLayer;
@@ -24,6 +25,7 @@ import com.badlogic.gdx.physics.box2d.PolygonShape;
 import com.badlogic.gdx.physics.box2d.World;
 import com.badlogic.gdx.utils.GdxRuntimeException;
 import io.github.com.quillraven.GdxGame;
+import io.github.com.quillraven.asset.AssetService;
 import io.github.com.quillraven.asset.AtlasAsset;
 import io.github.com.quillraven.component.Animation2D;
 import io.github.com.quillraven.component.Animation2D.AnimationType;
@@ -44,12 +46,14 @@ public class TiledAshleySpawner {
     private final World physicWorld;
     private final MapObjects tmpMapObjects;
     private final Vector2 tmpVec2;
+    private final AssetService assetService;
 
-    public TiledAshleySpawner(Engine engine, World physicWorld) {
+    public TiledAshleySpawner(Engine engine, World physicWorld, AssetService assetService) {
         this.engine = engine;
         this.physicWorld = physicWorld;
         this.tmpMapObjects = new MapObjects();
         this.tmpVec2 = new Vector2();
+        this.assetService = assetService;
     }
 
     public void loadMapObjects(TiledMap tiledMap) {
@@ -159,7 +163,7 @@ public class TiledAshleySpawner {
     private void spawnEntityOf(TiledMapTileMapObject tileMapObject) {
         Entity entity = this.engine.createEntity();
         TiledMapTile tile = tileMapObject.getTile();
-        TextureRegion textureRegion = tile.getTextureRegion();
+        TextureRegion textureRegion = getTextureRegion(tile);
         String classType = tile.getProperties().get("type", "", String.class);
         float sortOffsetY = tile.getProperties().get("sortOffsetY", 0, Integer.class);
         sortOffsetY *= GdxGame.UNIT_SCALE;
@@ -186,6 +190,24 @@ public class TiledAshleySpawner {
         this.engine.addEntity(entity);
     }
 
+    private TextureRegion getTextureRegion(TiledMapTile tile) {
+        String atlasAssetStr = tile.getProperties().get("atlasAsset", "OBJECTS", String.class);
+        AtlasAsset atlasAsset = AtlasAsset.valueOf(atlasAssetStr);
+        FileTextureData textureData = (FileTextureData) tile.getTextureRegion().getTexture().getTextureData();
+        String atlasKey = textureData.getFileHandle().nameWithoutExtension();
+        TextureAtlas textureAtlas = assetService.get(atlasAsset);
+        TextureAtlas.AtlasRegion region = textureAtlas.findRegion(atlasKey + "/" + atlasKey);
+        if (region != null) {
+            return region;
+        }
+
+        // Region not part of an atlas, or the object has an animation.
+        // If it has an animation, then its region is updated in the AnimationSystem.
+        // If it has no region, then we render the region of the Tiled editor to show something, but
+        // that will add one render call due to texture swapping.
+        return tile.getTextureRegion();
+    }
+
     private void addEntityCameraFollow(TiledMapTileMapObject tileMapObject, Entity entity) {
         boolean cameraFollow = tileMapObject.getProperties().get("camFollow", false, Boolean.class);
         if (!cameraFollow) return;