Removed empty destructors. Joint::label is a bodypart

[lugaru.git] / Source / Animation / Skeleton.h

diff --git a/Source/Animation/Skeleton.h b/Source/Animation/Skeleton.h
index fe1ceb1106035bfc59f1bc9da76999152dd20ebe..db03e75af512cbf9fba57349ee90ea27cc3d8108 100644 (file)
--- a/Source/Animation/Skeleton.h
+++ b/Source/Animation/Skeleton.h
@@ -33,29 +33,14 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Animation/Joint.h"
 #include "Animation/Muscle.h"
 
-enum bodyparts {
-    head, neck,
-    leftshoulder,  leftelbow,  leftwrist,  lefthand,
-    rightshoulder, rightelbow, rightwrist, righthand,
-    abdomen, lefthip, righthip, groin,
-    leftknee,  leftankle,  leftfoot,
-    rightknee, rightankle, rightfoot
-};
-
 const int max_joints = 50;
 
 class Skeleton
 {
 public:
-    int num_joints;
-    //Joint joints[max_joints];
-    //Joint *joints;
-    Joint* joints;
+    std::vector<Joint> joints;
 
-    int num_muscles;
-    //Muscle muscles[max_muscles];
-    //Muscle *muscles;
-    Muscle* muscles;
+    std::vector<Muscle> muscles;
 
     int selected;
 
@@ -103,21 +88,7 @@ public:
     void FindRotationMuscle(int which, int animation);
     void Load(const std::string& fileName, const std::string& lowfileName, const std::string& clothesfileName, const std::string& modelfileName, const std::string& model2fileName, const std::string& model3fileName, const std::string& model4fileName, const std::string& model5fileNamee, const std::string& model6fileName, const std::string& model7fileName, const std::string& modellowfileName, const std::string& 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 DoBalance();
-    void MusclesSet();
-    */
-
     Skeleton();
-    ~Skeleton();
 
 private:
     // convenience functions