From a35d3eb228423dd0bc654ca253888c4032978923 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 28 Nov 2022 17:00:20 +0100 Subject: move hardcoded scenery to its own dir too --- anim/control-panel.json | 37 ------------------------------------- anim/control-panel.tga | Bin 7793 -> 0 bytes anim/table.json | 37 ------------------------------------- anim/table.tga | Bin 87626 -> 0 bytes anim/table/table.blend | Bin 1195856 -> 0 bytes anim/table/table_rou.png | Bin 1219363 -> 0 bytes anim/table/wood.png | Bin 1484466 -> 0 bytes editor/app.cpp | 6 +++--- scenery/control-panel.tga | Bin 0 -> 7793 bytes scenery/table.json | 37 +++++++++++++++++++++++++++++++++++++ scenery/table.tga | Bin 0 -> 87626 bytes scenery/table/table.blend | Bin 0 -> 1195856 bytes scenery/table/table_rou.png | Bin 0 -> 1219363 bytes scenery/table/wood.png | Bin 0 -> 1484466 bytes 14 files changed, 40 insertions(+), 77 deletions(-) delete mode 100644 anim/control-panel.json delete mode 100644 anim/control-panel.tga delete mode 100644 anim/table.json delete mode 100644 anim/table.tga delete mode 100644 anim/table/table.blend delete mode 100644 anim/table/table_rou.png delete mode 100644 anim/table/wood.png create mode 100644 scenery/control-panel.tga create mode 100644 scenery/table.json create mode 100644 scenery/table.tga create mode 100644 scenery/table/table.blend create mode 100644 scenery/table/table_rou.png create mode 100644 scenery/table/wood.png diff --git a/anim/control-panel.json b/anim/control-panel.json deleted file mode 100644 index b7c95d4d..00000000 --- a/anim/control-panel.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "actionframe": 0, - "anim_name": "", - "fps": 24, - "groups": [ - { - "frames": [ - { - "ground": "17 x 66", - "offset": "0 x 0", - "size": "41 x 78" - } - ], - "ground": "17 x 66", - "name": "n", - "offset": [ - 0, - -32, - 8 - ] - }, - { - "mirror-from": "n", - "name": "w", - "offset": [ - -32, - 0, - 8 - ] - } - ], - "height": 0, - "nframes": 1, - "object_name": "control-panel", - "pixel_size": "41 x 78", - "width": 41 -} diff --git a/anim/control-panel.tga b/anim/control-panel.tga deleted file mode 100644 index 3cb724ba..00000000 Binary files a/anim/control-panel.tga and /dev/null differ diff --git a/anim/table.json b/anim/table.json deleted file mode 100644 index f472a4cd..00000000 --- a/anim/table.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "actionframe": 0, - "anim_name": "", - "fps": 24, - "groups": [ - { - "frames": [ - { - "ground": "90 x 88", - "offset": "0 x 0", - "size": "180 x 164" - } - ], - "ground": "959 x 712", - "name": "n", - "offset": [ - 0, - 0, - 0 - ] - }, - { - "mirror-from": "n", - "name": "w", - "offset": [ - 0, - 0, - 0 - ] - } - ], - "height": 0, - "nframes": 1, - "object_name": "table", - "pixel_size": "180 x 164", - "width": 180 -} diff --git a/anim/table.tga b/anim/table.tga deleted file mode 100644 index 1f6083fc..00000000 Binary files a/anim/table.tga and /dev/null differ diff --git a/anim/table/table.blend b/anim/table/table.blend deleted file mode 100644 index dddaf9c5..00000000 Binary files a/anim/table/table.blend and /dev/null differ diff --git a/anim/table/table_rou.png b/anim/table/table_rou.png deleted file mode 100644 index 2f7d0048..00000000 Binary files a/anim/table/table_rou.png and /dev/null differ diff --git a/anim/table/wood.png b/anim/table/wood.png deleted file mode 100644 index 2bdb07db..00000000 Binary files a/anim/table/wood.png and /dev/null differ diff --git a/editor/app.cpp b/editor/app.cpp index 9a897d57..850f19e3 100644 --- a/editor/app.cpp +++ b/editor/app.cpp @@ -16,9 +16,9 @@ app::app(fm_settings&& opts) : _floor2{loader.tile_atlas("metal1", {2, 2})}, _wall1{loader.tile_atlas("wood2", {2, 1})}, _wall2{loader.tile_atlas("wood1", {2, 1})}, - _door{loader.anim_atlas("door-close")}, - _table{loader.anim_atlas("table")}, - _control_panel(loader.anim_atlas("control-panel")) + _door{loader.anim_atlas("door-close", loader.SCENERY_PATH)}, + _table{loader.anim_atlas("table", loader.SCENERY_PATH)}, + _control_panel(loader.anim_atlas("control-panel", loader.SCENERY_PATH)) { world& w = M->world(); chunk_coords coord{0 ,0}; diff --git a/scenery/control-panel.tga b/scenery/control-panel.tga new file mode 100644 index 00000000..3cb724ba Binary files /dev/null and b/scenery/control-panel.tga differ diff --git a/scenery/table.json b/scenery/table.json new file mode 100644 index 00000000..f472a4cd --- /dev/null +++ b/scenery/table.json @@ -0,0 +1,37 @@ +{ + "actionframe": 0, + "anim_name": "", + "fps": 24, + "groups": [ + { + "frames": [ + { + "ground": "90 x 88", + "offset": "0 x 0", + "size": "180 x 164" + } + ], + "ground": "959 x 712", + "name": "n", + "offset": [ + 0, + 0, + 0 + ] + }, + { + "mirror-from": "n", + "name": "w", + "offset": [ + 0, + 0, + 0 + ] + } + ], + "height": 0, + "nframes": 1, + "object_name": "table", + "pixel_size": "180 x 164", + "width": 180 +} diff --git a/scenery/table.tga b/scenery/table.tga new file mode 100644 index 00000000..1f6083fc Binary files /dev/null and b/scenery/table.tga differ diff --git a/scenery/table/table.blend b/scenery/table/table.blend new file mode 100644 index 00000000..dddaf9c5 Binary files /dev/null and b/scenery/table/table.blend differ diff --git a/scenery/table/table_rou.png b/scenery/table/table_rou.png new file mode 100644 index 00000000..2f7d0048 Binary files /dev/null and b/scenery/table/table_rou.png differ diff --git a/scenery/table/wood.png b/scenery/table/wood.png new file mode 100644 index 00000000..2bdb07db Binary files /dev/null and b/scenery/table/wood.png differ -- cgit v1.2.3