Tidy up

Author: GregHib

engine/src/main/kotlin/world/gregs/voidps/engine/data/definition/MapDefinitions.kt

@@ -2,15 +2,25 @@ package world.gregs.voidps.engine.data.definition
 
 import com.github.michaelbull.logging.InlineLogger
 import world.gregs.voidps.cache.Cache
+import world.gregs.voidps.cache.FileCache
 import world.gregs.voidps.cache.Index
 import world.gregs.voidps.cache.definition.decoder.MapTileDecoder
+import world.gregs.voidps.cache.definition.decoder.ObjectDecoder
 import world.gregs.voidps.engine.client.ui.chat.plural
+import world.gregs.voidps.engine.client.update.batch.ZoneBatchUpdates
+import world.gregs.voidps.engine.data.Settings
 import world.gregs.voidps.engine.entity.obj.GameObjects
 import world.gregs.voidps.engine.map.collision.CollisionDecoder
+import world.gregs.voidps.engine.map.collision.Collisions
+import world.gregs.voidps.engine.map.collision.GameObjectCollisionAdd
+import world.gregs.voidps.engine.map.collision.GameObjectCollisionRemove
 import world.gregs.voidps.engine.map.obj.MapObjectsDecoder
 import world.gregs.voidps.engine.map.obj.MapObjectsRotatedDecoder
 import world.gregs.voidps.type.Region
 import world.gregs.voidps.type.Zone
+import world.gregs.yaml.Yaml
+import java.io.File
+import kotlin.time.measureTimedValue
 
 /**
  * Loads map collision and objects fast and direct
@@ -80,4 +90,18 @@ class MapDefinitions(
         return settings
     }
 
+    companion object {
+        @JvmStatic
+        fun main(args: Array<String>) {
+            val properties = Settings.load(File("./game/src/main/resources/game.properties").inputStream())
+//            properties["storage.cache.path"] = "./data/cache-old/"
+            val (cache, duration) = measureTimedValue { FileCache.load(properties) }
+            println("Loaded cache in ${duration.inWholeMilliseconds}ms")
+            val definitions = ObjectDefinitions(ObjectDecoder(member = true, lowDetail = false).load(cache)).load(Yaml(), "./data/definitions/objects.yml")
+            val collisions = Collisions()
+            val add = GameObjectCollisionAdd(collisions)
+            val remove = GameObjectCollisionRemove(collisions)
+            val defs = MapDefinitions(CollisionDecoder(collisions), definitions, GameObjects(add, remove, ZoneBatchUpdates(), definitions, storeUnused = true), cache).loadCache()
+        }
+    }
 }

engine/src/main/kotlin/world/gregs/voidps/engine/map/collision/CollisionDecoder.kt

@@ -28,7 +28,6 @@ class CollisionDecoder(private val collisions: Collisions) {
                         if (--height < 0) {
                             continue
                         }
-                        collisions.allocateIfAbsent(x + localX, y + localY, height)
                     }
                     collisions.setUnsafe(x + localX, y + localY, height, CollisionFlag.FLOOR)
                 }
@@ -65,9 +64,7 @@ class CollisionDecoder(private val collisions: Collisions) {
                     }
                     val rotX = rotateX(localX, localY, zoneRotation)
                     val rotY = rotateY(localX, localY, zoneRotation)
-                    val tiles = collisions.flags[Zone.tileIndex(targetX + rotX, targetY + rotY, height)]!!
-                    val tileIndex = Tile.index(targetX + rotX, targetY + rotY)
-                    tiles[tileIndex] = tiles[tileIndex] or CollisionFlag.FLOOR
+                    collisions.setUnsafe(targetX + rotX, targetY + rotY, height, CollisionFlag.FLOOR)
                 }
             }
         }