X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation%2FSkeleton.h;h=fe1ceb1106035bfc59f1bc9da76999152dd20ebe;hb=1d589bc3024e30dd51e41b6041b57649190bef4d;hp=7c482f911c638cd8a89812ef427fadb60dbe3449;hpb=05dffb5744dc3f845e0c874f45229134393c50a0;p=lugaru.git

diff --git a/Source/Animation/Skeleton.h b/Source/Animation/Skeleton.h
index 7c482f9..fe1ceb1 100644
--- a/Source/Animation/Skeleton.h
+++ b/Source/Animation/Skeleton.h
@@ -22,8 +22,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #define _SKELETON_H_
 
 #include "Models.h"
-#include "Quaternions.h"
-
 
 /**> HEADER FILES <**/
 #include "gamegl.h"
@@ -32,6 +30,8 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Sprite.h"
 #include "binio.h"
 #include "Animation/Animation.h"
+#include "Animation/Joint.h"
+#include "Animation/Muscle.h"
 
 enum bodyparts {
     head, neck,
@@ -42,76 +42,6 @@ enum bodyparts {
     rightknee, rightankle, rightfoot
 };
 
-class Joint
-{
-public:
-    XYZ position;
-    XYZ oldposition;
-    XYZ realoldposition;
-    XYZ velocity;
-    XYZ oldvelocity;
-    XYZ startpos;
-    float blurred;
-    float length;
-    float mass;
-    bool lower;
-    bool hasparent;
-    bool locked;
-    int modelnum;
-    bool visible;
-    Joint* parent;
-    bool sametwist;
-    int label;
-    int hasgun;
-    float delay;
-    XYZ velchange;
-
-    Joint() {
-        blurred = 0;
-        length = 0;
-        mass = 0;
-        lower = 0;
-        hasparent = 0;
-        locked = 0;
-        modelnum = 0;
-        visible = 0;
-        parent = 0;
-        sametwist = 0;
-        label = 0;
-        hasgun = 0;
-        delay = 0;
-    }
-};
-
-class Muscle
-{
-public:
-    int numvertices;
-    int* vertices;
-    int numverticeslow;
-    int* verticeslow;
-    int numverticesclothes;
-    int* verticesclothes;
-    float length;
-    float targetlength;
-    Joint* parent1;
-    Joint* parent2;
-    float maxlength;
-    float minlength;
-    int type;
-    bool visible;
-    float rotate1, rotate2, rotate3;
-    float lastrotate1, lastrotate2, lastrotate3;
-    float oldrotate1, oldrotate2, oldrotate3;
-    float newrotate1, newrotate2, newrotate3;
-
-    float strength;
-
-    Muscle();
-    ~Muscle();
-    void DoConstraint(bool spinny);
-};
-
 const int max_joints = 50;
 
 class Skeleton