diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-02 07:26:54 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-02 07:26:59 +0100 |
| commit | 4b118d6232e507978459b7920e695bee614a67f1 (patch) | |
| tree | 689f8cfa3e10fdda2aef0b41d69db4af9f6f3da6 | |
| parent | 0d9e26aba2d2e9728ec7fc99564e4270de84e31a (diff) | |
for now, walls are 64 pixels high
| -rw-r--r-- | editor/app.cpp | 4 | ||||
| -rw-r--r-- | images/wall.json | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/editor/app.cpp b/editor/app.cpp index 4cb1cb4a..3e2c2be3 100644 --- a/editor/app.cpp +++ b/editor/app.cpp @@ -12,8 +12,8 @@ app::app(fm_settings&& opts) : M{floormat_main::create(*this, std::move(opts))}, _floor1{loader.tile_atlas("floor-tiles", {44, 4})}, _floor2{loader.tile_atlas("metal1", {2, 2})}, - _wall1{loader.tile_atlas("wood2", {1, 1})}, - _wall2{loader.tile_atlas("wood1", {1, 1})} + _wall1{loader.tile_atlas("wood2", {2, 1})}, + _wall2{loader.tile_atlas("wood1", {2, 1})} { world& w = M->world(); chunk_coords coord{0 ,0}; diff --git a/images/wall.json b/images/wall.json index 206e3004..5824513f 100644 --- a/images/wall.json +++ b/images/wall.json @@ -1,10 +1,8 @@ [ - ["wood2", "1 x 1"], - ["wood1", "1 x 1"], - ["teak1", "2 x 1"], - ["wood2", "1 x 1"], - ["metal2", "2 x 1"], - ["metal2", "2 x 1"], - ["concrete7", "4 x 2"], - ["concrete6", "4 x 2"] + ["wood2", "2 x 2"], + ["wood1", "2 x 2"], + ["teak1", "2 x 2"], + ["metal2", "2 x 2"], + ["concrete7", "4 x 4"], + ["concrete6", "4 x 4"] ] |