X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FPerson.h;h=cb62622f0710f4984aa2e846e5797cde223dd139;hb=8a32dc9e4e1011b10f009e999d7d008aa2711d8a;hp=4e0edaecb6dcf46be4f093007d2d5a7235053071;hpb=af1d37a1d6e36f63c514c20dc6413e9d61146ec6;p=lugaru.git
diff --git a/Source/Person.h b/Source/Person.h
index 4e0edae..cb62622 100644
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -25,14 +25,14 @@ along with Lugaru. If not, see .
#include "gamegl.h"
#include "Quaternions.h"
-#include "Skeleton.h"
+#include "Animation/Skeleton.h"
#include "Models.h"
#include "Terrain.h"
#include "Sprite.h"
#include
#include
#include "Weapons.h"
-#include "Animation.h"
+#include "Animation/Animation.h"
#define passivetype 0
#define guardtype 1
@@ -328,6 +328,8 @@ public:
inline Joint& joint(int bodypart) { return skeleton.joints[skeleton.jointlabels[bodypart]]; }
inline XYZ& jointPos(int bodypart) { return joint(bodypart).position; }
inline XYZ& jointVel(int bodypart) { return joint(bodypart).velocity; }
+ inline AnimationFrame& currentFrame() { return Animation::animations.at(animCurrent).frames.at(frameCurrent); }
+ inline AnimationFrame& targetFrame() { return Animation::animations.at(animTarget).frames.at(frameTarget); }
void CheckKick();
@@ -384,7 +386,7 @@ public:
int SphereCheck(XYZ *p1, float radius, XYZ *p, XYZ *move, float *rotate, Model *model);
int DrawSkeleton();
void Puff(int whichlabel);
- void FootLand(bodyparts whichfoot, float opacity);
+ void FootLand(bodypart whichfoot, float opacity);
void DoStuff();
void setAnimation(int);
void DoAnimations();