From 10e47a6ad4b07bf2a9cd8caf322f344170f84890 Mon Sep 17 00:00:00 2001
From: Klemen Plestenjak <plestenjak.klemen@gmail.com>
Date: Sat, 11 Nov 2023 09:35:05 +0100
Subject: [PATCH] Fixed tile objects rendering

---
 assets/entities.tsj     | 21 +++++++++++++++++++++
 assets/maps/test.tmj    |  4 ++--
 engine/breeze/map/map.c |  2 +-
 tiled/entities.tsx      |  8 ++++++++
 tiled/test.tmx          |  2 +-
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/assets/entities.tsj b/assets/entities.tsj
index 18fb954..b4c46eb 100644
--- a/assets/entities.tsj
+++ b/assets/entities.tsj
@@ -8,6 +8,27 @@
  "tilecount":4096,
  "tiledversion":"1.10.2",
  "tileheight":16,
+ "tiles":[
+        {
+         "id":0,
+         "type":"worker"
+        }, 
+        {
+         "id":1,
+         "type":"worker"
+        }, 
+        {
+         "id":2,
+         "type":"worker"
+        }, 
+        {
+         "id":3,
+         "type":"worker"
+        }, 
+        {
+         "id":64,
+         "type":"axe"
+        }],
  "tilewidth":16,
  "type":"tileset",
  "version":"1.10"
diff --git a/assets/maps/test.tmj b/assets/maps/test.tmj
index 096d0bd..0363fcc 100644
--- a/assets/maps/test.tmj
+++ b/assets/maps/test.tmj
@@ -384,8 +384,8 @@
                  "type":"",
                  "visible":true,
                  "width":10,
-                 "x":1095.25,
-                 "y":405.75
+                 "x":1155.52083333333,
+                 "y":473.416666666667
                 }],
          "opacity":1,
          "type":"objectgroup",
diff --git a/engine/breeze/map/map.c b/engine/breeze/map/map.c
index 8e9ba77..b775544 100644
--- a/engine/breeze/map/map.c
+++ b/engine/breeze/map/map.c
@@ -347,7 +347,7 @@ static void drawObjectLayer(BzTileObjectGroup *objectLayer, BzTileset *tileset)
             case BZ_TILE_SHAPE_RECT:
                 if (object.gid) {
                     Rectangle rec = bzTilesetGetTileRegion(tileset, object.gid);
-                    Rectangle dest = {shape.x, shape.y, shape.sizeX, shape.sizeY};
+                    Rectangle dest = {shape.x, shape.y - shape.sizeY, shape.sizeX, shape.sizeY};
                     DrawTexturePro(tileset->tiles, rec, dest, (Vector2) {0.0f, 0.0f}, 0.0f, WHITE);
                 } else {
                     DrawRectangle(shape.x, shape.y, shape.sizeX, shape.sizeY, color);
diff --git a/tiled/entities.tsx b/tiled/entities.tsx
index 1d02d28..c0043ef 100644
--- a/tiled/entities.tsx
+++ b/tiled/entities.tsx
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.10" tiledversion="1.10.2" name="entities" tilewidth="16" tileheight="16" tilecount="4096" columns="64">
+ <editorsettings>
+  <export target="../assets/entities.tsj" format="json"/>
+ </editorsettings>
  <image source="../assets/entities.png" width="1024" height="1024"/>
+ <tile id="0" type="worker"/>
+ <tile id="1" type="worker"/>
+ <tile id="2" type="worker"/>
+ <tile id="3" type="worker"/>
+ <tile id="64" type="axe"/>
 </tileset>
diff --git a/tiled/test.tmx b/tiled/test.tmx
index e4d242e..35303c8 100644
--- a/tiled/test.tmx
+++ b/tiled/test.tmx
@@ -331,7 +331,7 @@
 </data>
  </layer>
  <objectgroup id="31" name="Entities">
-  <object id="19728" gid="1322" x="1095.25" y="405.75" width="10" height="10"/>
+  <object id="19728" gid="1322" x="1155.52" y="473.417" width="10" height="10"/>
  </objectgroup>
  <objectgroup id="28" name="Game">
   <object id="19726" name="camera" x="1048" y="476">