X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation%2FSkeleton.h;h=19db503c23395ef4bd645e86670c399bbf3182c9;hb=b84825978803615f45a9f128232e62431042aec0;hp=fe1ceb1106035bfc59f1bc9da76999152dd20ebe;hpb=1d589bc3024e30dd51e41b6041b57649190bef4d;p=lugaru.git
diff --git a/Source/Animation/Skeleton.h b/Source/Animation/Skeleton.h
index fe1ceb1..19db503 100644
--- a/Source/Animation/Skeleton.h
+++ b/Source/Animation/Skeleton.h
@@ -21,41 +21,25 @@ along with Lugaru. If not, see .
#ifndef _SKELETON_H_
#define _SKELETON_H_
-#include "Models.h"
-
/**> HEADER FILES <**/
-#include "gamegl.h"
-#include "Quaternions.h"
-#include "Objects.h"
-#include "Sprite.h"
-#include "binio.h"
#include "Animation/Animation.h"
#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
-};
+#include "Graphic/gamegl.h"
+#include "Graphic/Models.h"
+#include "Graphic/Sprite.h"
+#include "Math/Quaternions.h"
+#include "Objects/Objects.h"
+#include "Utils/binio.h"
const int max_joints = 50;
class Skeleton
{
public:
- int num_joints;
- //Joint joints[max_joints];
- //Joint *joints;
- Joint* joints;
+ std::vector joints;
- int num_muscles;
- //Muscle muscles[max_muscles];
- //Muscle *muscles;
- Muscle* muscles;
+ std::vector muscles;
int selected;
@@ -103,21 +87,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