diff --git a/assets/tiles/vagrant_test.tilemap.json b/assets/tiles/vagrant_test.tilemap.json deleted file mode 100644 index 6dae3bb..0000000 --- a/assets/tiles/vagrant_test.tilemap.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "id": "vagrant_test", - "tile_size": 32, - "asset_pack": "tiles", - "tiles": [ - { "id": "floor_001", "walkable": true, "texture": "floor_001" }, - { "id": "floor_002", "walkable": true, "texture": "floor_002" }, - { "id": "floor_003", "walkable": true, "texture": "floor_003" }, - { "id": "wall", "walkable": false, "texture": "floor_004" } - ] -} diff --git a/manifest.module b/manifest.module index 2e561a3..6a0db5b 100644 --- a/manifest.module +++ b/manifest.module @@ -7,16 +7,18 @@ "entry_point": "init.lua", "asset_aliases": { "subterrain_player": "lib-asset.prototype-subterrain", - "subterrain_tiles": "lib-asset.prototype-subterrain", - "subterrain_world": "lib-asset.prototype-subterrain" + "subterrain_world": "lib-asset.prototype-subterrain", + "blob_testbench": "lib-asset.prototype-blob-geom", + "blob_rect_stone": "lib-asset.prototype-blob-geom" }, "deps": [ {"id": "lib-core.input", "version": "0.4.0"}, {"id": "lib-core.camera", "version": "0.3.0"}, {"id": "lib-core.render", "version": "0.1.0"}, - {"id": "lib-core.maps", "version": "0.4.0"}, + {"id": "lib-core.maps", "version": "0.5.0"}, {"id": "lib-core.puppet", "version": "0.5.0"}, {"id": "lib-core.interaction", "version": "0.1.0"}, - {"id": "lib-asset.prototype-subterrain", "version": "0.2.0"} + {"id": "lib-asset.prototype-subterrain", "version": "0.2.0"}, + {"id": "lib-asset.prototype-blob-geom", "version": "0.1.0"} ] } diff --git a/maps/vagrant_test.map.json b/maps/vagrant_test.map.json index 4f43b32..cbd88ed 100644 --- a/maps/vagrant_test.map.json +++ b/maps/vagrant_test.map.json @@ -1,49 +1,87 @@ { + "schema_version": 3, "id": "vagrant_test", - "tilemap": "subterrain_tiles", "size": { "w": 20, "h": 20 }, - "tiles": [ - 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 4,1,1,1,1,1,1,2,2,2,2,1,1,1,1,1,1,1,1,4, - 4,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,3,3,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,3,3,1,1,1,1,1,1,2,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, - 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4 - ], - "tile_rotations": [ - 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,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,90,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,90,0,0,0,0,0,0,180,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,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,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,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 - ] + "atlases": [ "blob_testbench", "blob_rect_stone" ], + "layers": { + "surface": { + "tiles": [ + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 224, 224, 224, 224, + 224, 224, 240, 256, 272, 288, 304, 320, 336, 352, 368, 384, 400, 416, 432, 448, 224, 224, 224, 224, + 224, 224, 464, 480, 496, 512, 528, 544, 560, 576, 592, 608, 624, 640, 656, 672, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224 + ] + }, + "topsurface": { + "tiles": [ + 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, 672, 672, 672, 672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 672, 672, 672, 672, 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, 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, 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, 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 + ] + }, + "wall": { + "material": "blob_rect_stone", + "overrides": { + "9:7": 0, + "7:15": 0, + "13:15": 0 + }, + "vertices": [ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + ] + } + } }