diff options
| -rw-r--r-- | anim/control-panel.json | 37 | ||||
| -rw-r--r-- | editor/app.cpp | 6 | ||||
| -rw-r--r-- | scenery/control-panel.tga (renamed from anim/control-panel.tga) | bin | 7793 -> 7793 bytes | |||
| -rw-r--r-- | scenery/table.json (renamed from anim/table.json) | 0 | ||||
| -rw-r--r-- | scenery/table.tga (renamed from anim/table.tga) | bin | 87626 -> 87626 bytes | |||
| -rw-r--r-- | scenery/table/table.blend (renamed from anim/table/table.blend) | bin | 1195856 -> 1195856 bytes | |||
| -rw-r--r-- | scenery/table/table_rou.png (renamed from anim/table/table_rou.png) | bin | 1219363 -> 1219363 bytes | |||
| -rw-r--r-- | scenery/table/wood.png (renamed from anim/table/wood.png) | bin | 1484466 -> 1484466 bytes |
8 files changed, 3 insertions, 40 deletions
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/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/anim/control-panel.tga b/scenery/control-panel.tga Binary files differindex 3cb724ba..3cb724ba 100644 --- a/anim/control-panel.tga +++ b/scenery/control-panel.tga diff --git a/anim/table.json b/scenery/table.json index f472a4cd..f472a4cd 100644 --- a/anim/table.json +++ b/scenery/table.json diff --git a/anim/table.tga b/scenery/table.tga Binary files differindex 1f6083fc..1f6083fc 100644 --- a/anim/table.tga +++ b/scenery/table.tga diff --git a/anim/table/table.blend b/scenery/table/table.blend Binary files differindex dddaf9c5..dddaf9c5 100644 --- a/anim/table/table.blend +++ b/scenery/table/table.blend diff --git a/anim/table/table_rou.png b/scenery/table/table_rou.png Binary files differindex 2f7d0048..2f7d0048 100644 --- a/anim/table/table_rou.png +++ b/scenery/table/table_rou.png diff --git a/anim/table/wood.png b/scenery/table/wood.png Binary files differindex 2bdb07db..2bdb07db 100644 --- a/anim/table/wood.png +++ b/scenery/table/wood.png |
