X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FObjects%2FPerson.hpp;h=0bacf772b21744eda7de9d07be2b197c83d02e8b;hb=bb302fb1d9936b1ab630a800698ab7b867472a7d;hp=3f96a26f1b73e430636eceba768b35c56d80446e;hpb=61122a635fae9aac4df5c4dafc4443436dbb9c4f;p=lugaru.git
diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp
index 3f96a26..0bacf77 100644
--- a/Source/Objects/Person.hpp
+++ b/Source/Objects/Person.hpp
@@ -24,9 +24,9 @@ along with Lugaru. If not, see .
#include "Animation/Animation.hpp"
#include "Animation/Skeleton.hpp"
#include "Environment/Terrain.hpp"
-#include "Graphic/gamegl.hpp"
#include "Graphic/Models.hpp"
#include "Graphic/Sprite.hpp"
+#include "Graphic/gamegl.hpp"
#include "Math/XYZ.hpp"
#include "Objects/PersonType.hpp"
#include "Objects/Weapons.hpp"
@@ -44,10 +44,12 @@ along with Lugaru. If not, see .
#define getweapontype 7
#define pathfindtype 8
-struct InvalidPersonException : public exception {
- const char * what () const throw () {
- return "Invalid weapon number";
- }
+struct InvalidPersonException : public exception
+{
+ const char* what() const throw()
+ {
+ return "Invalid weapon number";
+ }
};
class Person : public enable_shared_from_this
@@ -96,11 +98,6 @@ public:
XYZ coords;
XYZ velocity;
- //~ XYZ proportionhead;
- //~ XYZ proportionlegs;
- //~ XYZ proportionarms;
- //~ XYZ proportionbody;
-
float unconscioustime;
bool immobile;
@@ -188,7 +185,6 @@ public:
float jumpkeydowntime;
bool freefall;
-
float turnspeed;
int aitype;
@@ -322,7 +318,7 @@ public:
Person();
Person(FILE*, int, unsigned);
- void skeletonLoad(bool clothes = false);
+ void skeletonLoad();
// convenience functions
inline Joint& joint(int bodypart) { return skeleton.joints[skeleton.jointlabels[bodypart]]; }
@@ -331,8 +327,11 @@ public:
inline AnimationFrame& currentFrame() { return Animation::animations.at(animCurrent).frames.at(frameCurrent); }
inline AnimationFrame& targetFrame() { return Animation::animations.at(animTarget).frames.at(frameTarget); }
- void setProportions(float, float, float, float);
- XYZ getProportion(int part) const;
+ void setProportions(float head, float body, float arms, float legs);
+ float getProportion(int part) const;
+ XYZ getProportionXYZ(int part) const;
+
+ void changeCreatureType(person_type type);
void CheckKick();
void CatchFire();
@@ -379,13 +378,14 @@ public:
void Reverse();
void DoDamage(float howmuch);
void DoHead();
- void DoMipmaps() {
+ void DoMipmaps()
+ {
skeleton.drawmodel.textureptr.bind();
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, skeleton.skinsize, skeleton.skinsize, 0, GL_RGB, GL_UNSIGNED_BYTE, &skeleton.skinText[0]);
}
- int SphereCheck(XYZ *p1, float radius, XYZ *p, XYZ *move, float *rotate, Model *model);
+ int SphereCheck(XYZ* p1, float radius, XYZ* p, XYZ* move, float* rotate, Model* model);
int DrawSkeleton();
void Puff(int whichlabel);
void FootLand(bodypart whichfoot, float opacity);
@@ -394,7 +394,7 @@ public:
void DoAnimations();
void RagDoll(bool checkcollision);
- void takeWeapon (int weaponId);
+ void takeWeapon(int weaponId);
bool addClothes(const int& clothesId);
void addClothes();