X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=inline;f=Source%2FPerson.h;h=cb62622f0710f4984aa2e846e5797cde223dd139;hb=c5dc3750efbc615b70917f19bb95cbd352cd00f6;hp=a11f22bdafb074882c302ae2731af931937e773c;hpb=0010abfd8f9ce65ce3fad7c5f8c2da4f9aedbe94;p=lugaru.git
diff --git a/Source/Person.h b/Source/Person.h
index a11f22b..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
@@ -322,10 +322,14 @@ public:
Person();
Person(FILE*, int, unsigned);
+ void skeletonLoad(bool clothes = false);
+
// convenience functions
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();
@@ -382,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();