From 3c8254c6f626e358dad3c2ece4574cef90dd1209 Mon Sep 17 00:00:00 2001
From: Klemen Plestenjak <plestenjak.klemen@gmail.com>
Date: Sat, 11 Nov 2023 09:21:59 +0100
Subject: [PATCH] Add support for objects with tiles

---
 assets/entities.png     | Bin 0 -> 19549 bytes
 assets/entities.tsj     |  14 +++++++++++
 assets/maps/test.tmj    |  20 ++++++++++++++--
 engine/breeze/map/map.c |  50 +++++++++++++++++++++++++++++++---------
 engine/breeze/map/map.h |  20 +++++++++-------
 game/main.c             |  11 +++++++--
 rawAssets/entities.kra  | Bin 0 -> 102994 bytes
 rawAssets/entities.png  | Bin 0 -> 19549 bytes
 tiled/entities.tsx      |   4 ++++
 tiled/test.tmx          |   7 ++++--
 10 files changed, 101 insertions(+), 25 deletions(-)
 create mode 100644 assets/entities.png
 create mode 100644 assets/entities.tsj
 create mode 100644 rawAssets/entities.kra
 create mode 100644 rawAssets/entities.png
 create mode 100644 tiled/entities.tsx

diff --git a/assets/entities.png b/assets/entities.png
new file mode 100644
index 0000000000000000000000000000000000000000..1961067b29d699671e68dd687e3d7c2d8905f211
GIT binary patch
literal 19549
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

literal 0
HcmV?d00001

diff --git a/assets/entities.tsj b/assets/entities.tsj
new file mode 100644
index 0000000..18fb954
--- /dev/null
+++ b/assets/entities.tsj
@@ -0,0 +1,14 @@
+{ "columns":64,
+ "image":"entities.png",
+ "imageheight":1024,
+ "imagewidth":1024,
+ "margin":0,
+ "name":"entities",
+ "spacing":0,
+ "tilecount":4096,
+ "tiledversion":"1.10.2",
+ "tileheight":16,
+ "tilewidth":16,
+ "type":"tileset",
+ "version":"1.10"
+}
\ No newline at end of file
diff --git a/assets/maps/test.tmj b/assets/maps/test.tmj
index 6d6b698..096d0bd 100644
--- a/assets/maps/test.tmj
+++ b/assets/maps/test.tmj
@@ -374,7 +374,19 @@
          "draworder":"topdown",
          "id":31,
          "name":"Entities",
-         "objects":[],
+         "objects":[
+                {
+                 "gid":1322,
+                 "height":10,
+                 "id":19728,
+                 "name":"",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":10,
+                 "x":1095.25,
+                 "y":405.75
+                }],
          "opacity":1,
          "type":"objectgroup",
          "visible":true,
@@ -405,7 +417,7 @@
          "y":0
         }],
  "nextlayerid":33,
- "nextobjectid":19728,
+ "nextobjectid":19729,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.10.2",
@@ -418,6 +430,10 @@
         {
          "firstgid":298,
          "source":"..\/..\/tiled\/buildings.tsx"
+        }, 
+        {
+         "firstgid":1322,
+         "source":"..\/..\/tiled\/entities.tsx"
         }],
  "tilewidth":16,
  "type":"map",
diff --git a/engine/breeze/map/map.c b/engine/breeze/map/map.c
index ee93c85..8e9ba77 100644
--- a/engine/breeze/map/map.c
+++ b/engine/breeze/map/map.c
@@ -88,6 +88,11 @@ static void handleTileObjectLayer(BzTileObjectGroup *layer, cute_tiled_layer_t *
     object = cuteLayer->objects;
     for (i32 i = 0; i < layer->objectCount; i++) {
         layer->objects[i].id = hashFunc(object->name.ptr);
+
+        layer->objects[i].gid = object->gid;
+        if (layer->minGID > object->gid) layer->minGID = object->gid;
+        else if (layer->maxGID < object->gid) layer->maxGID = object->gid;
+
         layer->objects[i].shape = bzCuteObjectToTileShape(object);
         object = object->next;
     }
@@ -142,7 +147,7 @@ static void createColliders(BzTileMap *map) {
 BzTileMap bzTileMapCreate(const BzTileMapDesc *desc) {
     BzTileMap map = {};
     // Auto detect tileset count.
-    for (i32 i = 0; i < BZ_MAX_MAP_TILESETS; i++) {
+    for (i32 i = 0; i < BZ_MAP_MAX_TILESETS; i++) {
         if (!desc->tilesets[i].isValid)
             break;
         map.tilesetCount++;
@@ -162,12 +167,12 @@ BzTileMap bzTileMapCreate(const BzTileMapDesc *desc) {
 
     cute_tiled_layer_t *cuteLayer = cuteMap->layers;
     while (cuteLayer) {
-        BZ_ASSERT(map.layerCount < BZ_MAX_MAP_LAYERS);
-        BZ_ASSERT(map.objectGroupCount < BZ_MAX_MAP_LAYERS);
+        BZ_ASSERT(map.layerCount < BZ_MAP_MAX_LAYERS);
+        BZ_ASSERT(map.objectGroupCount < BZ_MAP_MAX_LAYERS);
 
         // Find slot
         i32 slot = -1;
-        for (i32 i = 0; i < BZ_MAX_MAP_LAYERS; i++) {
+        for (i32 i = 0; i < BZ_MAP_MAX_LAYERS; i++) {
             const BzTileLayerDesc *layerDesc = desc->layers + i;
             const BzTileObjectsDesc *objectsDesc = desc->objectGroups + i;
             if (layerDesc->name && strcmp(layerDesc->name, cuteLayer->name.ptr) == 0 ||
@@ -216,17 +221,29 @@ BzTileMap bzTileMapCreate(const BzTileMapDesc *desc) {
     }
 
     // Assign tilesets to layers
-    for (i32 i = 0; i < map.layerCount; i++) {
+    for (i32 i = 0; i < BZ_MAP_MAX_LAYERS; i++) {
         BzTileLayer *layer = map.layers + i;
         layer->tilesetIdx = -1;
+        BzTileObjectGroup *objects = map.objectGroups + i;
+        objects->tilesetIdx = -1;
+
+        bool hasLayer = i < map.layerCount;
+        bool hasObjects = i < map.objectGroupCount;
+
         for (i32 j = map.tilesetCount - 1; j  >= 0; j--) {
             BzTileset *tileset = map.tilesets + j;
 
-            if (tileset->startID >= layer->minData &&
+            if (hasLayer && tileset->startID >= layer->minData &&
                 tileset->startID <= layer->maxData) {
                 layer->tilesetIdx = j;
-                break;
+                hasLayer = false;
             }
+            if (hasObjects && tileset->startID >= objects->minGID &&
+                tileset->startID <= objects->maxGID) {
+                objects->tilesetIdx = j;
+                hasObjects = false;
+            }
+            if (!hasLayer && !hasObjects) break;
         }
     }
     cute_tiled_free_map(cuteMap);
@@ -316,10 +333,11 @@ static void drawLayer(BzTileLayer *layer, BzTileset *tileset) {
 
 }
 
-static void drawObjectLayer(BzTileObjectGroup *objectLayer) {
+static void drawObjectLayer(BzTileObjectGroup *objectLayer, BzTileset *tileset) {
     Color color = ORANGE;
     for (int i = 0; i < objectLayer->objectCount; i++) {
-        BzTileShape shape = objectLayer->objects[i].shape;
+        BzTileObject object = objectLayer->objects[i];
+        BzTileShape shape = object.shape;
         switch (shape.type) {
             case BZ_TILE_SHAPE_NONE:
                 break;
@@ -327,7 +345,13 @@ static void drawObjectLayer(BzTileObjectGroup *objectLayer) {
                 DrawCircle(shape.x, shape.y, 2.0f, color);
                 break;
             case BZ_TILE_SHAPE_RECT:
-                DrawRectangle(shape.x, shape.y, shape.sizeX, shape.sizeY, color);
+                if (object.gid) {
+                    Rectangle rec = bzTilesetGetTileRegion(tileset, object.gid);
+                    Rectangle dest = {shape.x, shape.y, 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);
+                }
                 break;
             case BZ_TILE_SHAPE_ELLIPSE:
                 DrawEllipse(shape.x, shape.y, shape.sizeX, shape.sizeY, color);
@@ -358,8 +382,12 @@ void bzTileMapDraw(BzTileMap *map) {
 
     for (i32 i = 0; i < map->objectGroupCount; i++) {
         BzTileObjectGroup *objectLayer = map->objectGroups + i;
+        BzTileset *tileset = NULL;
+        if (objectLayer->tilesetIdx != -1) {
+            tileset = map->tilesets + objectLayer->tilesetIdx;
+        }
         if (!objectLayer->objects) continue;
-        drawObjectLayer(objectLayer);
+        drawObjectLayer(objectLayer, tileset);
     }
 }
 
diff --git a/engine/breeze/map/map.h b/engine/breeze/map/map.h
index 04c35ea..0d38ec7 100644
--- a/engine/breeze/map/map.h
+++ b/engine/breeze/map/map.h
@@ -4,8 +4,8 @@
 #include "tileset.h"
 #include "../utils/string.h"
 
-#define BZ_MAX_MAP_LAYERS 8
-#define BZ_MAX_MAP_TILESETS 8
+#define BZ_MAP_MAX_LAYERS 8
+#define BZ_MAP_MAX_TILESETS 8
 #define BZ_MAP_COLLIDER_DEPTH 2
 
 typedef struct BzTileLayer BzTileLayer;
@@ -30,10 +30,10 @@ typedef struct BzTileObjectsDesc {
 
 typedef struct BzTileMapDesc {
     const char *path;
-    BzTileset tilesets[BZ_MAX_MAP_TILESETS];
+    BzTileset tilesets[BZ_MAP_MAX_TILESETS];
 
-    BzTileLayerDesc layers[BZ_MAX_MAP_LAYERS];
-    BzTileObjectsDesc objectGroups[BZ_MAX_MAP_LAYERS];
+    BzTileLayerDesc layers[BZ_MAP_MAX_LAYERS];
+    BzTileObjectsDesc objectGroups[BZ_MAP_MAX_LAYERS];
 } BzTileMapDesc;
 
 typedef struct BzTileLayer {
@@ -59,12 +59,16 @@ typedef struct BzTileLayer {
 
 typedef struct BzTileObject {
     u32 id;
+    BzTile gid;
     BzTileShape shape;
 } BzTileObject;
 
 typedef struct BzTileObjectGroup {
     BzTileObject *objects;
     i32 objectCount;
+    BzTile minGID;
+    BzTile maxGID;
+    i32 tilesetIdx;
 
     BzTileObjectsDesc desc;
     bool hasOwnership;
@@ -86,13 +90,13 @@ typedef struct BzTileMap {
     BzTileCollider *colliderMap;
     i32 collidersCount;
 
-    BzTileLayer layers[BZ_MAX_MAP_LAYERS];
+    BzTileLayer layers[BZ_MAP_MAX_LAYERS];
     i32 layerCount;
 
-    BzTileObjectGroup objectGroups[BZ_MAX_MAP_LAYERS];
+    BzTileObjectGroup objectGroups[BZ_MAP_MAX_LAYERS];
     i32 objectGroupCount;
 
-    BzTileset tilesets[BZ_MAX_MAP_TILESETS];
+    BzTileset tilesets[BZ_MAP_MAX_TILESETS];
     i32 tilesetCount;
 
     bool isValid;
diff --git a/game/main.c b/game/main.c
index f9a516f..c247464 100644
--- a/game/main.c
+++ b/game/main.c
@@ -27,6 +27,7 @@ typedef struct Game {
     Camera2D camera;
     BzTileset terrainTileset;
     BzTileset buildingsTileset;
+    BzTileset entitiesTileset;
     BzTileMap map;
 } Game;
 
@@ -204,11 +205,16 @@ bool init(Game *game) {
         .path="assets/buildings.tsj",
         .texturePath="assets/buildings.png"
     });
+    game->entitiesTileset = bzTilesetCreate(&(BzTilesetDesc) {
+        .path="assets/entities.tsj",
+        .texturePath="assets/entities.png"
+    });
 
     game->map = bzTileMapCreate(&(BzTileMapDesc) {
         .path="assets/maps/test.tmj",
         .tilesets[0]=game->terrainTileset,
         .tilesets[1]=game->buildingsTileset,
+        .tilesets[2]=game->entitiesTileset,
 
         .layers[LAYER_TERRAIN]=(BzTileLayerDesc) {"Terrain"},
         .layers[LAYER_FOLIAGE]=(BzTileLayerDesc) {"Foliage"},
@@ -224,15 +230,16 @@ bool init(Game *game) {
     bzTileMapOverrideLayer(&game->map, LAYER_BUILDING_OWNER, prepareBuildings);
 
     bzTileMapOverrideObjectGroup(&game->map, OBJECTS_GAME, handleGameObjects);
-    bzTileMapOverrideObjectGroup(&game->map, OBJECTS_ENTITIES, BZ_TILE_OBJECTS_CLEAR);
+    //bzTileMapOverrideObjectGroup(&game->map, OBJECTS_ENTITIES, BZ_TILE_OBJECTS_CLEAR);
 
 
     return true;
 }
 void deinit(Game *game) {
+    bzTileMapDestroy(&game->map);
     bzTilesetDestroy(&game->terrainTileset);
     bzTilesetDestroy(&game->buildingsTileset);
-    bzTileMapDestroy(&game->map);
+    bzTilesetDestroy(&game->entitiesTileset);
     rlImGuiShutdown();
 }
 
diff --git a/rawAssets/entities.kra b/rawAssets/entities.kra
new file mode 100644
index 0000000000000000000000000000000000000000..5c20fff612a568723403ce1d5f9ddb0ef3bf3053
GIT binary patch
literal 102994
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

literal 0
HcmV?d00001

diff --git a/rawAssets/entities.png b/rawAssets/entities.png
new file mode 100644
index 0000000000000000000000000000000000000000..1961067b29d699671e68dd687e3d7c2d8905f211
GIT binary patch
literal 19549
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

literal 0
HcmV?d00001

diff --git a/tiled/entities.tsx b/tiled/entities.tsx
new file mode 100644
index 0000000..1d02d28
--- /dev/null
+++ b/tiled/entities.tsx
@@ -0,0 +1,4 @@
+<?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">
+ <image source="../assets/entities.png" width="1024" height="1024"/>
+</tileset>
diff --git a/tiled/test.tmx b/tiled/test.tmx
index 6249f7f..e4d242e 100644
--- a/tiled/test.tmx
+++ b/tiled/test.tmx
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="80" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="33" nextobjectid="19728">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="80" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="33" nextobjectid="19729">
  <editorsettings>
   <export target="../assets/maps/test.tmj" format="json"/>
  </editorsettings>
  <tileset firstgid="1" source="terrain.tsx"/>
  <tileset firstgid="298" source="buildings.tsx"/>
+ <tileset firstgid="1322" source="entities.tsx"/>
  <layer id="1" name="Terrain" width="80" height="50">
   <data encoding="csv">
 1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,
@@ -329,7 +330,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup id="31" name="Entities"/>
+ <objectgroup id="31" name="Entities">
+  <object id="19728" gid="1322" x="1095.25" y="405.75" width="10" height="10"/>
+ </objectgroup>
  <objectgroup id="28" name="Game">
   <object id="19726" name="camera" x="1048" y="476">
    <point/>