X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation%2FSkeleton.hpp;h=908d2a884c731d38d0bf121234beac30dec95cc0;hb=6a8cb464330e92163c8feaf101b8b5837c973bba;hp=668506276af1d9771f510b5f5b2c083c77b2141c;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git diff --git a/Source/Animation/Skeleton.hpp b/Source/Animation/Skeleton.hpp index 6685062..908d2a8 100644 --- a/Source/Animation/Skeleton.hpp +++ b/Source/Animation/Skeleton.hpp @@ -1,6 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) +Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -24,11 +24,11 @@ along with Lugaru. If not, see . #include "Animation/Animation.hpp" #include "Animation/Joint.hpp" #include "Animation/Muscle.hpp" -#include "Graphic/gamegl.hpp" #include "Graphic/Models.hpp" #include "Graphic/Sprite.hpp" -#include "Math/Quaternions.hpp" -#include "Objects/Objects.hpp" +#include "Graphic/gamegl.hpp" +#include "Math/XYZ.hpp" +#include "Objects/Object.hpp" #include "Utils/binio.h" const int max_joints = 50; @@ -79,8 +79,8 @@ public: bool freefall; void FindForwards(); - float DoConstraints(XYZ *coords, float *scale); - void DoGravity(float *scale); + float DoConstraints(XYZ* coords, float* scale); + void DoGravity(float* scale); void FindRotationJoint(int which); void FindRotationJointSameTwist(int which); void FindRotationMuscle(int which, int animation); @@ -94,7 +94,6 @@ private: inline Joint& joint(int bodypart) { return joints[jointlabels[bodypart]]; } inline XYZ& jointPos(int bodypart) { return joint(bodypart).position; } inline XYZ& jointVel(int bodypart) { return joint(bodypart).velocity; } - }; #endif