diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-07 23:22:00 +0200 |
---|---|---|
committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-07 23:22:00 +0200 |
commit | 4af99b75cf3ae43c365a4c1e90e85f8ec764cf62 (patch) | |
tree | b8366b07b950b3ef7e251457c9b2509175c0faad /src/tileanimation.h | |
parent | 271d7c31e69db0bb6c5cf2cfb6e97ba129045d3e (diff) | |
download | minetest-4af99b75cf3ae43c365a4c1e90e85f8ec764cf62.tar.gz minetest-4af99b75cf3ae43c365a4c1e90e85f8ec764cf62.tar.bz2 minetest-4af99b75cf3ae43c365a4c1e90e85f8ec764cf62.zip |
Pass clang-format on 14 trivial header files fixes
Also remove them from whitelist
Diffstat (limited to 'src/tileanimation.h')
-rw-r--r-- | src/tileanimation.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/tileanimation.h b/src/tileanimation.h index eecd3eb96..9872e7917 100644 --- a/src/tileanimation.h +++ b/src/tileanimation.h @@ -20,36 +20,41 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef TILEANIMATION_HEADER #define TILEANIMATION_HEADER -#include "irrlichttypes_bloated.h" #include <iostream> +#include "irrlichttypes_bloated.h" -enum TileAnimationType { +enum TileAnimationType +{ TAT_NONE = 0, TAT_VERTICAL_FRAMES = 1, TAT_SHEET_2D = 2, }; -struct TileAnimationParams { +struct TileAnimationParams +{ enum TileAnimationType type; - union { + union + { // struct { // } none; - struct { + struct + { int aspect_w; // width for aspect ratio int aspect_h; // height for aspect ratio float length; // seconds } vertical_frames; - struct { - int frames_w; // number of frames left-to-right - int frames_h; // number of frames top-to-bottom + struct + { + int frames_w; // number of frames left-to-right + int frames_h; // number of frames top-to-bottom float frame_length; // seconds } sheet_2d; }; void serialize(std::ostream &os, u16 protocol_version) const; void deSerialize(std::istream &is, u16 protocol_version); - void determineParams(v2u32 texture_size, int *frame_count, - int *frame_length_ms, v2u32 *frame_size) const; + void determineParams(v2u32 texture_size, int *frame_count, int *frame_length_ms, + v2u32 *frame_size) const; void getTextureModifer(std::ostream &os, v2u32 texture_size, int frame) const; v2f getTextureCoords(v2u32 texture_size, int frame) const; }; |