X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation%2FAnimation.hpp;h=f9e0482e767ac5d1b16e1ad06399ed328576164c;hb=bb543993bb6f1eb76519a395d9a0a10ee777d160;hp=b58f6ba5207d8054918e9f0c1c9c471d160b67ab;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git
diff --git a/Source/Animation/Animation.hpp b/Source/Animation/Animation.hpp
index b58f6ba..f9e0482 100644
--- a/Source/Animation/Animation.hpp
+++ b/Source/Animation/Animation.hpp
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
@@ -20,33 +20,43 @@ along with Lugaru. If not, see .
#ifndef _ANIMATION_HPP_
#define _ANIMATION_HPP_
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
#include
-enum anim_attack_type {
- neutral, normalattack, reversed, reversal
+enum anim_attack_type
+{
+ neutral,
+ normalattack,
+ reversed,
+ reversal
};
-enum anim_height_type {
- lowheight, middleheight, highheight
+enum anim_height_type
+{
+ lowheight,
+ middleheight,
+ highheight
};
-enum animation_types {
+enum animation_type
+{
#define DECLARE_ANIM(id, ...) id,
#include "Animation.def"
#undef DECLARE_ANIM
animation_count
};
-enum animation_bit_offsets {
+enum animation_bit_offsets
+{
#define DECLARE_ANIM_BIT(bit) o_##bit,
#include "Animation.def"
#undef DECLARE_ANIM_BIT
animation_bit_count
};
-enum animation_bits_def {
+enum animation_bits_def
+{
#define DECLARE_ANIM_BIT(bit) bit = 1 << o_##bit,
#include "Animation.def"
#undef DECLARE_ANIM_BIT
@@ -60,7 +70,7 @@ static const int animation_bits[animation_count] = {
struct AnimationFrameJointInfo
{
- XYZ position;
+ XYZ position;
float twist;
float twist2;
bool onground;