refactor track creation

Quillraven · Mar 24, 2024 · 1d62642 · 1d62642
1 parent 246d80b
commit 1d62642
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 31 deletions.
diff --git a/assets/maps/objects.tsx b/assets/maps/objects.tsx
@@ -45,8 +45,9 @@
    <property name="GameObject" propertytype="GameObject" value="SAW"/>
    <property name="bodyType" propertytype="BodyType" value="KinematicBody"/>
    <property name="damage" type="int" value="1"/>
-   <property name="entityTags" propertytype="EntityTag" value="FOLLOW_TRACK"/>
+   <property name="entityTags" propertytype="EntityTag" value=""/>
    <property name="hasAnimation" type="bool" value="true"/>
+   <property name="hasTrack" type="bool" value="true"/>
    <property name="speed" type="float" value="3"/>
   </properties>
   <image width="38" height="38" source="../graphics/object/saw.png"/>

diff --git a/assets/maps/test.tmx b/assets/maps/test.tmx
@@ -23,6 +23,7 @@
   <object id="13" gid="244" x="158" y="63" width="38" height="38">
    <properties>
     <property name="entityTags" propertytype="EntityTag" value=""/>
+    <property name="hasTrack" type="bool" value="false"/>
    </properties>
   </object>
  </objectgroup>

diff --git a/core/src/main/kotlin/com/quillraven/github/quillyjumper/component/EntityTag.kt b/core/src/main/kotlin/com/quillraven/github/quillyjumper/component/EntityTag.kt
@@ -4,5 +4,5 @@ import com.github.quillraven.fleks.EntityTags
 import com.github.quillraven.fleks.entityTagOf
 
 enum class EntityTag : EntityTags by entityTagOf() {
-    PLAYER, CAMERA_FOCUS, FOLLOW_TRACK
+    PLAYER, CAMERA_FOCUS
 }
diff --git a/core/src/main/kotlin/com/quillraven/github/quillyjumper/component/Tiled.kt b/core/src/main/kotlin/com/quillraven/github/quillyjumper/component/Tiled.kt
@@ -1,14 +1,12 @@
 package com.quillraven.github.quillyjumper.component
 
-import com.badlogic.gdx.math.Rectangle
 import com.github.quillraven.fleks.Component
 import com.github.quillraven.fleks.ComponentType
 import com.quillraven.github.quillyjumper.GameObject
 
 data class Tiled(
     val gameObject: GameObject,
     val mapObjectID: Int,
-    val mapObjectBoundary: Rectangle, // units are in Tiled units (=pixels instead of world units)
 ) : Component<Tiled> {
     override fun type() = Tiled
 

diff --git a/core/src/main/kotlin/com/quillraven/github/quillyjumper/tiled/TiledService.kt b/core/src/main/kotlin/com/quillraven/github/quillyjumper/tiled/TiledService.kt
@@ -13,7 +13,6 @@ import com.badlogic.gdx.maps.tiled.TiledMapTileLayer.Cell
 import com.badlogic.gdx.maps.tiled.objects.TiledMapTileMapObject
 import com.badlogic.gdx.math.Intersector
 import com.badlogic.gdx.math.MathUtils
-import com.badlogic.gdx.math.Rectangle
 import com.badlogic.gdx.math.Vector2
 import com.badlogic.gdx.physics.box2d.BodyDef.BodyType
 import com.badlogic.gdx.physics.box2d.ChainShape
@@ -83,31 +82,24 @@ class TiledService(
         }
 
         // 2) spawn dynamic/kinematic game object bodies
-        map.layer("objects").objects.forEach { spawnGameObjectEntity(it) }
-
-        // 3) link entities that follow a track to its related track in Tiled
-        world.family { all(EntityTag.FOLLOW_TRACK) }.forEach { entity ->
-            val (_, mapObjectID, mapObjectBoundary) = entity[Tiled]
-            val rectVertices = GdxFloatArray(
-                floatArrayOf(
-                    mapObjectBoundary.x, mapObjectBoundary.y,
-                    mapObjectBoundary.x + mapObjectBoundary.width, mapObjectBoundary.y,
-                    mapObjectBoundary.x + mapObjectBoundary.width, mapObjectBoundary.y + mapObjectBoundary.height,
-                    mapObjectBoundary.x, mapObjectBoundary.y + mapObjectBoundary.height
-                )
-            )
-            val trackCmp = map.layer("tracks").trackCmpOfBoundary(mapObjectID, rectVertices)
-            entity.configure { it += trackCmp }
-        }
+        map.layer("objects").objects.forEach { spawnGameObjectEntity(map, it) }
     }
 
-    private fun MapLayer.trackCmpOfBoundary(mapObjectId: Int, rectVertices: GdxFloatArray): Track {
+    private fun MapLayer.trackCmpOfBoundary(mapObject: MapObject): Track {
         objects.forEach { layerObject ->
             val lineVertices = when (layerObject) {
                 is PolylineMapObject -> GdxFloatArray(layerObject.polyline.transformedVertices)
                 is PolygonMapObject -> GdxFloatArray(layerObject.polygon.transformedVertices)
-                else -> gdxError("Only Polyline map objects are supported for tracks: $layerObject")
+                else -> gdxError("Only Polyline and Polygon map objects are supported for tracks: $layerObject")
             }
+            val rectVertices = GdxFloatArray(
+                floatArrayOf(
+                    mapObject.x, mapObject.y,
+                    mapObject.x + mapObject.width, mapObject.y,
+                    mapObject.x + mapObject.width, mapObject.y + mapObject.height,
+                    mapObject.x, mapObject.y + mapObject.height
+                )
+            )
 
             if (Intersector.intersectPolygons(lineVertices, rectVertices)) {
                 // found related track -> convert track vertices to world unit vertices
@@ -121,10 +113,10 @@ class TiledService(
             }
         }
 
-        gdxError("There is no related track for MapObject $mapObjectId")
+        gdxError("There is no related track for MapObject ${mapObject.id}")
     }
 
-    private fun spawnGameObjectEntity(mapObject: MapObject) {
+    private fun spawnGameObjectEntity(map: TiledMap, mapObject: MapObject) {
         if (mapObject !is TiledMapTileMapObject) {
             gdxError("Unsupported mapObject $mapObject")
         }
@@ -150,8 +142,7 @@ class TiledService(
         // spawn entity
         world.entity {
             body.userData = it
-            val mapObjectBoundary = Rectangle(mapObject.x, mapObject.y, mapObject.width, mapObject.height)
-            it += Tiled(gameObject, mapObject.id, mapObjectBoundary)
+            it += Tiled(gameObject, mapObject.id)
             it += Physic(body)
             // IMPORTANT: to make a sprite flip it must have a region already. Otherwise,
             // the flipX information of the sprite will always be false.
@@ -160,7 +151,7 @@ class TiledService(
             it += Graphic(sprite(gameObject, AnimationType.IDLE.atlasKey, body.position))
 
             // EntityTags
-            val tagsStr = mapObject.propertyOrNull<String>("entityTags") ?: tile.property<String>("entityTags", "")
+            val tagsStr = tile.property<String>("entityTags", "")
             if (tagsStr.isNotBlank()) {
                 val tags = tagsStr.split(",").map(EntityTag::valueOf)
                 it += tags
@@ -196,6 +187,12 @@ class TiledService(
             if (damage > 0) {
                 it += Damage(damage)
             }
+            // Track
+            val hasTrack = mapObject.propertyOrNull<Boolean>("hasTrack") ?: tile.property<Boolean>("hasTrack", false)
+            if (hasTrack) {
+                val trackCmp = map.layer("tracks").trackCmpOfBoundary(mapObject)
+                it += trackCmp
+            }
 
             log.debug {
                 """Spawning entity with:

diff --git a/tiled-project.tiled-project b/tiled-project.tiled-project
@@ -60,6 +60,11 @@
                     "type": "bool",
                     "value": false
                 },
+                {
+                    "name": "hasTrack",
+                    "type": "bool",
+                    "value": false
+                },
                 {
                     "name": "jumpHeight",
                     "type": "float",
@@ -96,8 +101,7 @@
             "type": "enum",
             "values": [
                 "PLAYER",
-                "CAMERA_FOCUS",
-                "FOLLOW_TRACK"
+                "CAMERA_FOCUS"
             ],
             "valuesAsFlags": true
         },

diff --git a/tiled-project.tiled-session b/tiled-project.tiled-session
@@ -68,7 +68,7 @@
         "assets/maps/objects.tsx"
     ],
     "project": "tiled-project.tiled-project",
-    "property.type": "int",
+    "property.type": "bool",
     "recentFiles": [
         "assets/maps/objects.tmx",
         "assets/maps/objects.tsx",