deploy: c32758b

PodeCaradox · Dec 14, 2023 · a500b61 · a500b61
1 parent 49ae110
commit a500b61
Show file tree

Hide file tree

Showing 72 changed files with 3,986 additions and 4,496 deletions.
diff --git a/41f1b32fd9105b3ebdd9.wasm b/41f1b32fd9105b3ebdd9.wasm
diff --git a/assets/brushes/entity_brushes.data b/assets/brushes/entity_brushes.data
@@ -0,0 +1,11 @@
+{
+    "unit_test": {
+        "BrushEntities": [
+            {
+                "Name": "Castlekeep_gatecenter",
+                "RandomFactor": 1
+            }
+        ],
+        "BrushType": "EntitiesBrush"
+    }
+}
diff --git a/assets/entities/animals.data b/assets/entities/animals.data
@@ -0,0 +1,210 @@
+{
+"test_unit":{
+     "ImageName":"deer",
+     "ColorTableImageName":"color_table",
+     "ColorTableStartPos":"0,0",
+     "AnimationData":[
+        {
+           "Animation":"WalkingNorthEast",
+        "Frames":[
+            {
+                    "AtlasCoord": "0,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "64,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "128,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "192,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "256,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "320,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "384,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "448,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "512,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "576,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "640,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "704,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "768,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "832,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "896,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "960,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1024,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1088,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1152,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1216,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1280,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1344,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1408,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1472,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1536,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1600,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1664,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1728,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1792,0,32,45",
+                    "ImageOffset": "0,10"
+                },
+                {
+                    "AtlasCoord": "1856,0,32,45",
+                    "ImageOffset": "0,10"
+                }
+        ]
+        }
+     ]
+  },
+ "deer":{
+    "ImageName":"deer",
+    "ColorTableImageName":"color_table",
+    "ColorTableStartPos":"0,0",
+    "AnimationData":[
+       {
+          "Animation":"WalkingNorthEast",
+        "Frames":[
+            {
+                "AtlasCoord": "0,0,33,51",
+                "ImageOffset": "9,10"
+            },
+            {
+                "AtlasCoord": "464,0,33,51",
+                "ImageOffset": "9,10"
+            },
+            {
+                "AtlasCoord": "932,0,33,49",
+                "ImageOffset": "9,10"
+            },
+            {
+                "AtlasCoord": "1416,0,33,49",
+                "ImageOffset": "9,10"
+            },
+            {
+                "AtlasCoord": "1904,0,33,49",
+                "ImageOffset": "9,10"
+            },
+            {
+                "AtlasCoord": "422,106,31,51",
+                "ImageOffset": "11,10"
+            },
+            {
+                "AtlasCoord": "886,106,31,51",
+                "ImageOffset": "11,10"
+            },
+            {
+                "AtlasCoord": "1358,106,33,51",
+                "ImageOffset": "9,10"
+            },
+            {
+                "AtlasCoord": "1834,106,33,51",
+                "ImageOffset": "9,10"
+            },
+            {
+                "AtlasCoord": "262,216,31,49",
+                "ImageOffset": "7,10"
+            },
+            {
+                "AtlasCoord": "738,216,31,51",
+                "ImageOffset": "11,10"
+            },
+            {
+                "AtlasCoord": "1206,216,33,49",
+                "ImageOffset": "13,10"
+            },
+            {
+                "AtlasCoord": "1682,216,33,49",
+                "ImageOffset": "13,10"
+            },
+            {
+                "AtlasCoord": "174,322,33,49",
+                "ImageOffset": "13,10"
+            },
+            {
+                "AtlasCoord": "650,322,31,49",
+                "ImageOffset": "11,10"
+            },
+            {
+                "AtlasCoord": "1114,322,31,51",
+                "ImageOffset": "11,10"
+            }
+        ]
+       }
+    ]
+ }
+}
diff --git a/assets/images/entities/animals/color_table.png b/assets/images/entities/animals/color_table.png
diff --git a/assets/images/entities/animals/deer.positions b/assets/images/entities/animals/deer.positions
diff --git a/assets/images/entities/animals/swordsman.positions b/assets/images/entities/animals/swordsman.positions
diff --git a/assets/images/images.data b/assets/images/images.data
@@ -44,18 +44,23 @@
    "DataType":"png",
    "CsType":"environment"
  },
- "objects_on_top":{
+ "objects_on_top1":{
    "Path":"images\\world\\buildings\\objects_on_top",
    "DataType":"png",
    "CsType":"environment"
  },
- "objects_tiled":{
-   "Path":"images\\world\\buildings\\objects_tiled",
+ "objects_on_top2":{
+   "Path":"images\\world\\buildings\\objects_on_top",
    "DataType":"png",
    "CsType":"environment"
  },
- "arrow":{
-   "Path":"images\\units",
+ "objects_on_top3":{
+   "Path":"images\\world\\buildings\\objects_on_top",
+   "DataType":"png",
+   "CsType":"environment"
+ },
+ "objects_tiled1":{
+   "Path":"images\\world\\buildings\\objects_tiled",
    "DataType":"png",
    "CsType":"environment"
  },
@@ -64,15 +69,15 @@
     "DataType":"png",
     "CsType":"environment"
   },
- "color_table_1":{
-   "Path":"images\\units",
+ "color_table":{
+   "Path":"images\\entities\\animals",
    "DataType":"png",
    "CsType":"color_table"
  },
- "unit1":{
-    "Path":"images\\units",
-    "DataType":"positions",
-    "CsType":"position_table"
+ "swordsman":{
+   "Path":"images\\entities\\animals",
+   "DataType":"positions",
+   "CsType":"position_table"
  }
 }
 
diff --git a/assets/images/world/buildings/objects_on_top/objects_on_top1.png b/assets/images/world/buildings/objects_on_top/objects_on_top1.png
diff --git a/assets/images/world/buildings/objects_on_top/objects_on_top2.png b/assets/images/world/buildings/objects_on_top/objects_on_top2.png
diff --git a/assets/images/world/buildings/objects_on_top/objects_on_top3.png b/assets/images/world/buildings/objects_on_top/objects_on_top3.png
diff --git a/assets/images/world/buildings/objects_tiled/objects_tiled1.png b/assets/images/world/buildings/objects_tiled/objects_tiled1.png
diff --git a/assets/images/world/elevation/land_elevation.png b/assets/images/world/elevation/land_elevation.png
diff --git a/assets/images/world/elevation/wall_elevation.png b/assets/images/world/elevation/wall_elevation.png
diff --git a/assets/images/world/elevation/water_elevation.png b/assets/images/world/elevation/water_elevation.png
diff --git a/assets/images/world/terrain/land.png b/assets/images/world/terrain/land.png
diff --git a/assets/images/world/terrain/wall.png b/assets/images/world/terrain/wall.png
diff --git a/assets/images/world/terrain/water.png b/assets/images/world/terrain/water.png
diff --git a/assets/keys/keys.png b/assets/keys/keys.png
diff --git a/assets/mipmaps/ui/game_interface_1024.png b/assets/mipmaps/ui/game_interface_1024.png
diff --git a/assets/mipmaps/ui/game_interface_512.png b/assets/mipmaps/ui/game_interface_512.png
diff --git a/assets/mipmaps/world/buildings/objects_on_top/objects_on_top1_1024.png b/assets/mipmaps/world/buildings/objects_on_top/objects_on_top1_1024.png
diff --git a/assets/mipmaps/world/buildings/objects_on_top/objects_on_top1_512.png b/assets/mipmaps/world/buildings/objects_on_top/objects_on_top1_512.png
diff --git a/assets/mipmaps/world/buildings/objects_on_top/objects_on_top2_1024.png b/assets/mipmaps/world/buildings/objects_on_top/objects_on_top2_1024.png
diff --git a/assets/mipmaps/world/buildings/objects_on_top/objects_on_top2_512.png b/assets/mipmaps/world/buildings/objects_on_top/objects_on_top2_512.png
diff --git a/assets/mipmaps/world/buildings/objects_on_top/objects_on_top3_1024.png b/assets/mipmaps/world/buildings/objects_on_top/objects_on_top3_1024.png
diff --git a/assets/mipmaps/world/buildings/objects_on_top/objects_on_top3_512.png b/assets/mipmaps/world/buildings/objects_on_top/objects_on_top3_512.png
diff --git a/assets/mipmaps/world/buildings/objects_on_top/objects_on_top_1024.png b/assets/mipmaps/world/buildings/objects_on_top/objects_on_top_1024.png
diff --git a/assets/mipmaps/world/buildings/objects_on_top/objects_on_top_512.png b/assets/mipmaps/world/buildings/objects_on_top/objects_on_top_512.png
diff --git a/assets/mipmaps/world/buildings/objects_tiled/objects_tiled1_1024.png b/assets/mipmaps/world/buildings/objects_tiled/objects_tiled1_1024.png
diff --git a/assets/mipmaps/world/buildings/objects_tiled/objects_tiled1_512.png b/assets/mipmaps/world/buildings/objects_tiled/objects_tiled1_512.png
diff --git a/assets/mipmaps/world/buildings/objects_tiled/objects_tiled_1024.png b/assets/mipmaps/world/buildings/objects_tiled/objects_tiled_1024.png
diff --git a/assets/mipmaps/world/buildings/objects_tiled/objects_tiled_512.png b/assets/mipmaps/world/buildings/objects_tiled/objects_tiled_512.png
diff --git a/assets/mipmaps/world/debugging/debug_tiles_1024.png b/assets/mipmaps/world/debugging/debug_tiles_1024.png
diff --git a/assets/mipmaps/world/debugging/debug_tiles_512.png b/assets/mipmaps/world/debugging/debug_tiles_512.png
diff --git a/assets/mipmaps/world/effects/world_effects_1024.png b/assets/mipmaps/world/effects/world_effects_1024.png
diff --git a/assets/mipmaps/world/effects/world_effects_512.png b/assets/mipmaps/world/effects/world_effects_512.png
diff --git a/assets/mipmaps/world/elevation/land_elevation_1024.png b/assets/mipmaps/world/elevation/land_elevation_1024.png
diff --git a/assets/mipmaps/world/elevation/land_elevation_512.png b/assets/mipmaps/world/elevation/land_elevation_512.png
diff --git a/assets/mipmaps/world/elevation/wall_elevation_1024.png b/assets/mipmaps/world/elevation/wall_elevation_1024.png
diff --git a/assets/mipmaps/world/elevation/wall_elevation_512.png b/assets/mipmaps/world/elevation/wall_elevation_512.png
diff --git a/assets/mipmaps/world/elevation/water_elevation_1024.png b/assets/mipmaps/world/elevation/water_elevation_1024.png
diff --git a/assets/mipmaps/world/elevation/water_elevation_512.png b/assets/mipmaps/world/elevation/water_elevation_512.png
diff --git a/assets/mipmaps/world/objects/decorative/decorativ_1024.png b/assets/mipmaps/world/objects/decorative/decorativ_1024.png
diff --git a/assets/mipmaps/world/objects/decorative/decorativ_512.png b/assets/mipmaps/world/objects/decorative/decorativ_512.png
diff --git a/assets/mipmaps/world/objects/trees/tree_1024.png b/assets/mipmaps/world/objects/trees/tree_1024.png
diff --git a/assets/mipmaps/world/objects/trees/tree_512.png b/assets/mipmaps/world/objects/trees/tree_512.png
diff --git a/assets/mipmaps/world/terrain/land_1024.png b/assets/mipmaps/world/terrain/land_1024.png
diff --git a/assets/mipmaps/world/terrain/land_512.png b/assets/mipmaps/world/terrain/land_512.png
diff --git a/assets/mipmaps/world/terrain/wall_1024.png b/assets/mipmaps/world/terrain/wall_1024.png
diff --git a/assets/mipmaps/world/terrain/wall_512.png b/assets/mipmaps/world/terrain/wall_512.png
diff --git a/assets/mipmaps/world/terrain/water_1024.png b/assets/mipmaps/world/terrain/water_1024.png
diff --git a/assets/mipmaps/world/terrain/water_512.png b/assets/mipmaps/world/terrain/water_512.png
diff --git a/assets/shaders/brush_world.wgsl b/assets/shaders/brush_world.wgsl
@@ -1,4 +1,4 @@
-const TileSizeHalf = vec2<i32>(16,8);
+const TileSizeHalf = vec2<i32>(32,16);
 const ImageSize = vec2<f32>(2048.0,2048.0);
 const ZStep : f32 = 0.0000001;
 
@@ -290,10 +290,10 @@ fn CreateElevationInstance(tile_id: u32, world_pos: vec2<i32>, elevation: f32, a
         return initInstancingObject();
     }
     let pos = applyRotation(world_pos);
-	let depth: f32 = WorldPosToDepth(pos) + ZStep;
+	let depth: f32 = WorldPosToDepth(pos);//+ ZStep
 	var position = WorldToScreenPos(pos);
 	position.x += offset_elevation_x;
-	var size = u32(elevation) + 8u;
+	var size = u32(elevation) + 16u;//TileSizeHalf
 	var instance: InstancingObject  = CreateObjectInstance(tile_id, world_pos, vec3(position, depth), animation_enabled, animation_tick, Color);
     instance.UvCoordSize = (instance.UvCoordSize & 0x0000ffffu) | (size << 16u);
 	return instance;