diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-11-28 04:52:25 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-11-28 04:52:25 +0100 |
| commit | 16f1261264f2a4d65753fb63471e0a1519377192 (patch) | |
| tree | f2910a4c4ef4cca9ddcd8e3e179dc5a16c75e1a0 /test | |
| parent | 8171d7f7cbc097c58a2097e14ce814d6a97d54bf (diff) | |
a
Diffstat (limited to 'test')
| -rw-r--r-- | test/json/wall-atlas-02_groups.json | 5 | ||||
| -rw-r--r-- | test/wall-atlas.cpp | 22 |
2 files changed, 12 insertions, 15 deletions
diff --git a/test/json/wall-atlas-02_groups.json b/test/json/wall-atlas-02_groups.json index 196085bd..ad4f0263 100644 --- a/test/json/wall-atlas-02_groups.json +++ b/test/json/wall-atlas-02_groups.json @@ -26,13 +26,11 @@ "w": { "pass-mode": "shoot-through", "wall": { - "default-tint": false, "offset": 0, "count": 1 }, "side": { - "pixel-size": "42 x 192", - "default-tint": true + "pixel-size": "42 x 192" }, "top": { "pixel-size": "192 x 42", @@ -43,7 +41,6 @@ "pixel-size": "42 x 192", "tint-mult": [ 0.125, 0.25, 0.5, 1 ], "tint-add": [ 1, 2, 3 ], - "default-tint": false, "mirrored": true }, "corner-L": { "from-rotation": "n" } diff --git a/test/wall-atlas.cpp b/test/wall-atlas.cpp index 2683c1dc..53c8b2de 100644 --- a/test/wall-atlas.cpp +++ b/test/wall-atlas.cpp @@ -61,17 +61,17 @@ void test_read_groups(StringView filename) const auto dir = read_direction_metadata(jroot, Direction_::W); fm_assert(is_direction_defined(dir)); - fm_assert(dir.passability == pass_mode::shoot_through); - fm_assert(dir.wall.pixel_size == Vector2ui{} ); - fm_assert(dir.wall.default_tint == false ); - fm_assert(dir.wall.mirrored == group_defaults.mirrored ); - fm_assert(dir.wall.from_rotation == (uint8_t)-1 ); - fm_assert(dir.side.pixel_size == Vector2ui{42, 192} ); - fm_assert(dir.side.default_tint == true ); - fm_assert(dir.top.default_tint == group_defaults.default_tint ); - fm_assert(dir.overlay.tint_mult == Vector4{0.125f, 0.25f, 0.5f, 1.f } ); - fm_assert(dir.overlay.tint_add == Vector3{1, 2, 3} ); - fm_assert(dir.overlay.mirrored == true ); + fm_assert(dir.passability == pass_mode::shoot_through); + fm_assert(dir.wall.pixel_size == Vector2ui{} ); + fm_assert(dir.overlay.default_tint == false ); + fm_assert(dir.wall.mirrored == false ); + fm_assert(dir.wall.from_rotation == (uint8_t)-1 ); + fm_assert(dir.side.pixel_size == Vector2ui{42, 192} ); + fm_assert(dir.side.default_tint == true ); + fm_assert(dir.top.default_tint == true ); + fm_assert(dir.overlay.tint_mult == Vector4{0.125f, 0.25f, 0.5f, 1.f } ); + fm_assert(dir.overlay.tint_add == Vector3{1, 2, 3} ); + fm_assert(dir.overlay.mirrored == true ); const auto atlas2 = wall_atlas_def::deserialize(path); fm_assert(atlas2.header == info); |