X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FSkeleton.h;h=63e1ad6239a6cb69d9284abda3a539e0b9017c89;hb=5931bd1edf827e8645f89b5a4a16585cb25bc6e1;hp=b9075fb0a6a1d5f40e52970a0c473cf7f788bb3e;hpb=320a287705c0463c6f8943ad9cf4c407c556f703;p=lugaru.git

diff --git a/Source/Skeleton.h b/Source/Skeleton.h
index b9075fb..63e1ad6 100644
--- a/Source/Skeleton.h
+++ b/Source/Skeleton.h
@@ -137,7 +137,6 @@ public:
     Animation & operator = (const Animation & ani);
 
     void Load(const char *fileName, int aheight, int aattack);
-    void Move(XYZ how);
 
 protected:
     void deallocate();
@@ -198,24 +197,36 @@ public:
     bool freefall;
 
     void FindForwards();
-    void FindForwardsfirst();
     float DoConstraints(XYZ *coords, float *scale);
     void DoGravity(float *scale);
-    void DoBalance();
-    void MusclesSet();
+    void FindRotationJoint(int which);
+    void FindRotationJointSameTwist(int which);
+    void FindRotationMuscle(int which, int animation);
+    void Load(const char *fileName, const char *lowfileName, const char *clothesfileName, const char *modelfileName, const char *model2fileName, const char *model3fileName, const char *model4fileName, const char *model5fileNamee, const char *model6fileName, const char *model7fileName, const char *modellowfileName, const char *modelclothesfileName, bool aclothes);
+
+    /*
+    // unused
+    void FindForwardsfirst();
     void Draw(int muscleview);
     void AddJoint(float x, float y, float z, int which);
     void SetJoint(float x, float y, float z, int which, int whichjoint);
     void DeleteJoint(int whichjoint);
     void AddMuscle(int attach1, int attach2, float maxlength, float minlength, int type);
     void DeleteMuscle(int whichmuscle);
-    void FindRotationJoint(int which);
-    void FindRotationJointSameTwist(int which);
-    void FindRotationMuscle(int which, int animation);
-    void Load(const char *fileName, const char *lowfileName, const char *clothesfileName, const char *modelfileName, const char *model2fileName, const char *model3fileName, const char *model4fileName, const char *model5fileNamee, const char *model6fileName, const char *model7fileName, const char *modellowfileName, const char *modelclothesfileName, bool aclothes);
+    void DoBalance();
+    void MusclesSet();
+    */
 
     Skeleton();
     ~Skeleton();
+
+private:
+    // convenience functions
+    // only for Skeleton.cpp
+    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