diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/anim.hpp | 20 | ||||
| -rw-r--r-- | src/wall-atlas.hpp | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/anim.hpp b/src/anim.hpp index d1f413ae..e505f29f 100644 --- a/src/anim.hpp +++ b/src/anim.hpp @@ -10,8 +10,8 @@ namespace floormat { struct anim_frame final { - Vector2i ground; - Vector2ui offset, size; + Vector2i ground{}; + Vector2ui offset{}, size{}; }; enum class anim_direction : unsigned char @@ -22,11 +22,11 @@ enum class anim_direction : unsigned char struct anim_group final { - String name, mirror_from; - std::vector<anim_frame> frames; - Vector2ui ground; // for use in anim-crop-tool only - Vector2s z_offset, depth_offset; - Vector3b offset; + String name{}, mirror_from{}; + std::vector<anim_frame> frames{}; + Vector2ui ground{}; // for use in anim-crop-tool only + Vector2s z_offset{}, depth_offset{}; + Vector3b offset{}; }; enum class anim_scale_type : unsigned char { invalid, ratio, fixed, }; @@ -53,9 +53,9 @@ struct anim_scale final struct anim_def final { - String object_name, anim_name; - std::vector<anim_group> groups; - Vector2ui pixel_size; + String object_name{}, anim_name{}; + std::vector<anim_group> groups{}; + Vector2ui pixel_size{}; anim_scale scale = anim_scale::ratio{1}; size_t nframes = 0, fps = 0, action_frame = 0, action_frame2 = 0; }; diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp index 4dcc0e59..257df02d 100644 --- a/src/wall-atlas.hpp +++ b/src/wall-atlas.hpp @@ -28,8 +28,8 @@ struct Group Color4 tint_mult{1,1,1,1}; Color3 tint_add; uint8_t from_rotation = (uint8_t)-1; // applies only to images - bool mirrored : 1 = false, - default_tint : 1 = true; + bool mirrored : 1 = false, + default_tint : 1 = true; explicit operator bool() const noexcept { return !is_empty(); } bool is_empty() const noexcept { return count == 0; } @@ -49,8 +49,8 @@ struct Direction explicit operator bool() const noexcept { return !is_empty(); } bool is_empty() const noexcept; - Group wall, overlay, side, top; - Group corner_L, corner_R; + Group wall{}, overlay{}, side{}, top{}; + Group corner_L{}, corner_R{}; pass_mode passability = pass_mode::blocked; const Group& group(Group_ i) const; |