add some more objects

2025-05-29 22:45:35 +02:00
parent 157f10302f
commit dc905f9c07
12 changed files with 290 additions and 184 deletions
--- a/assets/graphics/objects.atlas
+++ b/assets/graphics/objects.atlas
@@ -1,341 +1,362 @@

 objects.png
-size: 256, 256
+size: 512, 256
 format: RGBA8888
 filter: Nearest, Nearest
 repeat: none
-player/idle_down
-  rotate: false
-  xy: 2, 218
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 0
-player/idle_down
-  rotate: false
-  xy: 2, 182
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 1
-player/idle_down
-  rotate: false
-  xy: 38, 218
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 2
-player/idle_down
-  rotate: false
-  xy: 2, 146
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 3
-player/idle_down
-  rotate: false
-  xy: 38, 182
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 4
-player/idle_down
-  rotate: false
-  xy: 74, 218
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 5
-player/idle_left
-  rotate: false
-  xy: 2, 110
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 0
-player/idle_left
-  rotate: false
-  xy: 38, 146
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 1
-player/idle_left
-  rotate: false
-  xy: 74, 182
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 2
-player/idle_left
-  rotate: false
-  xy: 110, 218
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 3
-player/idle_left
-  rotate: false
-  xy: 2, 74
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 4
-player/idle_left
-  rotate: false
-  xy: 38, 110
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 5
-player/idle_right
-  rotate: false
-  xy: 74, 146
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 0
-player/idle_right
-  rotate: false
-  xy: 110, 182
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 1
-player/idle_right
-  rotate: false
-  xy: 146, 218
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 2
-player/idle_right
-  rotate: false
-  xy: 2, 38
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 3
-player/idle_right
-  rotate: false
-  xy: 38, 74
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 4
-player/idle_right
-  rotate: false
-  xy: 74, 110
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 5
-player/idle_up
-  rotate: false
-  xy: 110, 146
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 0
-player/idle_up
-  rotate: false
-  xy: 146, 182
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 1
-player/idle_up
-  rotate: false
-  xy: 182, 218
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: 2
-player/idle_up
+chest/chest
  rotate: false
  xy: 2, 2
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+house/house
+  rotate: false
+  xy: 2, 142
+  size: 80, 112
+  orig: 80, 112
+  offset: 0, 0
+  index: -1
+oak_tree/oak_tree
+  rotate: false
+  xy: 2, 58
+  size: 64, 80
+  orig: 64, 80
+  offset: 0, 0
+  index: -1
+player/idle_down
+  rotate: false
+  xy: 86, 222
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 0
+player/idle_down
+  rotate: false
+  xy: 2, 22
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+player/idle_down
+  rotate: false
+  xy: 86, 186
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+player/idle_down
+  rotate: false
+  xy: 122, 222
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+player/idle_down
+  rotate: false
+  xy: 86, 150
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 4
+player/idle_down
+  rotate: false
+  xy: 122, 186
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 5
+player/idle_left
+  rotate: false
+  xy: 158, 222
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 0
+player/idle_left
+  rotate: false
+  xy: 122, 150
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+player/idle_left
+  rotate: false
+  xy: 158, 186
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+player/idle_left
+  rotate: false
+  xy: 194, 222
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+player/idle_left
+  rotate: false
+  xy: 158, 150
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 4
+player/idle_left
+  rotate: false
+  xy: 194, 186
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 5
+player/idle_right
+  rotate: false
+  xy: 230, 222
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 0
+player/idle_right
+  rotate: false
+  xy: 194, 150
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+player/idle_right
+  rotate: false
+  xy: 230, 186
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+player/idle_right
+  rotate: false
+  xy: 266, 222
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 3
+player/idle_right
+  rotate: false
+  xy: 230, 150
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 4
+player/idle_right
+  rotate: false
+  xy: 266, 186
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 5
+player/idle_up
+  rotate: false
+  xy: 302, 222
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 0
+player/idle_up
+  rotate: false
+  xy: 266, 150
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 1
+player/idle_up
+  rotate: false
+  xy: 302, 186
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: 2
+player/idle_up
+  rotate: false
+  xy: 338, 222
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 3
 player/idle_up
  rotate: false
-  xy: 38, 38
+  xy: 302, 150
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 4
 player/idle_up
  rotate: false
-  xy: 74, 74
+  xy: 338, 186
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 5
 player/walk_down
  rotate: false
-  xy: 110, 110
+  xy: 374, 222
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 0
 player/walk_down
  rotate: false
-  xy: 146, 146
+  xy: 338, 150
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 1
 player/walk_down
  rotate: false
-  xy: 182, 182
+  xy: 374, 186
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 2
 player/walk_down
  rotate: false
-  xy: 218, 218
+  xy: 410, 222
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 3
 player/walk_down
  rotate: false
-  xy: 38, 2
+  xy: 374, 150
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 4
 player/walk_down
  rotate: false
-  xy: 74, 38
+  xy: 410, 186
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 5
 player/walk_left
  rotate: false
-  xy: 110, 74
+  xy: 446, 222
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 0
 player/walk_left
  rotate: false
-  xy: 146, 110
+  xy: 410, 150
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 1
 player/walk_left
  rotate: false
-  xy: 182, 146
+  xy: 446, 186
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 2
 player/walk_left
  rotate: false
-  xy: 218, 182
+  xy: 446, 150
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 3
 player/walk_left
  rotate: false
-  xy: 74, 2
+  xy: 38, 22
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 4
 player/walk_left
  rotate: false
-  xy: 110, 38
+  xy: 70, 106
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 5
 player/walk_right
  rotate: false
-  xy: 146, 74
+  xy: 70, 70
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 0
 player/walk_right
  rotate: false
-  xy: 182, 110
+  xy: 106, 114
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 1
 player/walk_right
  rotate: false
-  xy: 218, 146
+  xy: 106, 78
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 2
 player/walk_right
  rotate: false
-  xy: 110, 2
+  xy: 142, 114
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 3
 player/walk_right
  rotate: false
-  xy: 146, 38
+  xy: 142, 78
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 4
 player/walk_right
  rotate: false
-  xy: 182, 74
+  xy: 178, 114
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 5
 player/walk_up
  rotate: false
-  xy: 218, 110
+  xy: 178, 78
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 0
 player/walk_up
  rotate: false
-  xy: 146, 2
+  xy: 214, 114
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 1
 player/walk_up
  rotate: false
-  xy: 182, 38
+  xy: 214, 78
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 2
 player/walk_up
  rotate: false
-  xy: 218, 74
+  xy: 250, 114
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 3
 player/walk_up
  rotate: false
-  xy: 182, 2
+  xy: 250, 78
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
  index: 4
 player/walk_up
  rotate: false
-  xy: 218, 38
+  xy: 286, 114
  size: 32, 32
  orig: 32, 32
  offset: 0, 0
--- a/assets/graphics/objects.png
+++ b/assets/graphics/objects.png
--- a/assets/maps/mainmap.tmx
+++ b/assets/maps/mainmap.tmx
@@ -1,10 +1,10 @@
 <?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="5">
+<map version="1.11" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="18" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="11">
 <tileset firstgid="1" source="objects.tsx"/>
- <tileset firstgid="3" source="tileset.tsx"/>
+ <tileset firstgid="6" source="tileset.tsx"/>
 <layer id="1" name="ground" width="18" height="16">
  <data encoding="base64" compression="zlib">
-   eJylkjsPwjAMhLPwkCoeEjDBxkgzARPqBEywla2w9lfkx3OVYulkuSHA8Elt5DvH5wTn3BosDTYgfMHEOCtBEb/34KA4GpotGBjnRfR4gJZ4girW7AwN/3ezrsApam/gQlyNvp3nIubhySOQT2XocuGZ2MdnaiVL8WhA3ZOtoPegM2Vqo16Qflwvmd4Tnry7Vu2Ad+EpY6uHJpWV+LzI55e9neNsfAfr3eR6sbb8UK/f978MwUgx7qlN3W0KZop5Rv83sodpJA==
+   eJylkjsPwjAMhDPykCoeEjDBxkgzARPqBEywla2w9lfkr3OVYulkuSHA8Elt5DvH5wTn3BosDTYgfMHEOCtBEb/34KA4GpotGBjnRfR4gJZ4girW7AwN/3ezrsApam/gQlyNvp3nIubhySOQT2XocuGZ2MdnaiVL8WhA3ZOtoPegM2Vqo16Qflwvmd4Tnry7Vu2Ad+EpY6uHJpWV+LzI55e9neNsfAfr3eR6sbb8UK/f978MwUgx7qlN3W0KZop5Rv83Ub9shA==
  </data>
 </layer>
 <layer id="3" name="water" width="18" height="16">
@@ -24,7 +24,12 @@
 </layer>
 <objectgroup id="6" name="trigger"/>
 <objectgroup id="5" name="objects">
-  <object id="4" gid="2" x="24" y="214" width="32" height="32">
+  <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>
    <property name="controller" type="bool" value="true"/>
   </properties>
--- a/assets/maps/mystic.tiled-project
+++ b/assets/maps/mystic.tiled-project
@@ -10,5 +10,65 @@
    "properties": [
    ],
    "propertyTypes": [
+        {
+            "id": 2,
+            "name": "AtlasAsset",
+            "storageType": "string",
+            "type": "enum",
+            "values": [
+                "OBJECTS"
+            ],
+            "valuesAsFlags": false
+        },
+        {
+            "color": "#ffa0a0a4",
+            "drawFill": true,
+            "id": 3,
+            "members": [
+                {
+                    "name": "animation",
+                    "type": "string",
+                    "value": ""
+                },
+                {
+                    "name": "atlasAsset",
+                    "propertyType": "AtlasAsset",
+                    "type": "string",
+                    "value": "OBJECTS"
+                },
+                {
+                    "name": "speed",
+                    "type": "float",
+                    "value": 0
+                }
+            ],
+            "name": "Object",
+            "type": "class",
+            "useAs": [
+                "property",
+                "tile",
+                "project"
+            ]
+        },
+        {
+            "color": "#ffa0a0a4",
+            "drawFill": true,
+            "id": 1,
+            "members": [
+                {
+                    "name": "atlasAsset",
+                    "propertyType": "AtlasAsset",
+                    "type": "string",
+                    "value": "OBJECTS"
+                }
+            ],
+            "name": "Prop",
+            "type": "class",
+            "useAs": [
+                "property",
+                "tile",
+                "project"
+            ]
+        }
    ]
 }
--- a/assets/maps/objects.tsx
+++ b/assets/maps/objects.tsx
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.10" tiledversion="1.11.0" name="objects" tilewidth="32" tileheight="32" tilecount="1" columns="0">
+<tileset version="1.10" tiledversion="1.11.0" name="objects" tilewidth="80" tileheight="112" tilecount="4" columns="0">
 <grid orientation="orthogonal" width="1" height="1"/>
- <tile id="1">
+ <tile id="1" type="Object">
  <properties>
   <property name="animation" value="IDLE"/>
-   <property name="atlasAsset" value="OBJECTS"/>
   <property name="speed" type="float" value="2"/>
  </properties>
  <image source="objects/player.png" width="32" height="32"/>
@@ -14,4 +13,24 @@
   </object>
  </objectgroup>
 </tile>
+ <tile id="2" type="Prop">
+  <image source="objects/house.png" width="80" height="112"/>
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="7" y="82" width="67" height="26"/>
+  </objectgroup>
+ </tile>
+ <tile id="3" type="Prop">
+  <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>
 </tileset>
--- a/assets/maps/objects/chest.png
+++ b/assets/maps/objects/chest.png
--- a/assets/maps/objects/house.png
+++ b/assets/maps/objects/house.png
--- a/assets/maps/objects/oak_tree.png
+++ b/assets/maps/objects/oak_tree.png
--- a/assets_raw/objects/chest/chest.png
+++ b/assets_raw/objects/chest/chest.png
--- a/assets_raw/objects/house/house.png
+++ b/assets_raw/objects/house/house.png
--- a/assets_raw/objects/oak_tree/oak_tree.png
+++ b/assets_raw/objects/oak_tree/oak_tree.png
--- a/core/src/main/java/io/github/com/quillraven/tiled/TiledAshleySpawner.java
+++ b/core/src/main/java/io/github/com/quillraven/tiled/TiledAshleySpawner.java
@@ -115,6 +115,7 @@ public class TiledAshleySpawner {
        Entity entity = this.engine.createEntity();
        TiledMapTile tile = tileMapObject.getTile();
        TextureRegion textureRegion = tile.getTextureRegion();
+        String classType = tile.getProperties().get("type", "", String.class);

        addEntityTransform(
            tileMapObject.getX(), tileMapObject.getY(),
@@ -123,7 +124,7 @@ public class TiledAshleySpawner {
            entity);
        addEntityPhysic(
            tile.getObjects(),
-            BodyType.DynamicBody,
+            "Prop".equals(classType) ? BodyType.StaticBody : BodyType.DynamicBody,
            Vector2.Zero,
            entity);
        addEntityAnimation(tile, entity);
@@ -157,7 +158,7 @@ public class TiledAshleySpawner {
        }
        AnimationType animationType = AnimationType.valueOf(animationStr);

-        String atlasAssetStr = tile.getProperties().get("atlasAsset", "", String.class);
+        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();