X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FPerson.hpp;h=4896cbd2e237c053ca5fec29763d7407c131d977;hb=3bc5ee099a4322252ae9afd564335b60856a0054;hp=57f3ebb1f49bc5a7bf7221e061f1488ddc472e4e;hpb=58e2a577c2ea4cf639a07fc792122c288d4bc2a5;p=lugaru.git diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp index 57f3ebb..4896cbd 100644 --- a/Source/Objects/Person.hpp +++ b/Source/Objects/Person.hpp @@ -23,6 +23,7 @@ along with Lugaru. If not, see . #include "Animation/Animation.hpp" #include "Animation/Skeleton.hpp" +#include "Audio/Sounds.hpp" #include "Environment/Terrain.hpp" #include "Graphic/gamegl.hpp" #include "Graphic/Models.hpp" @@ -60,6 +61,33 @@ class PersonType public: // head, body, arms, legs XYZ proportions[4]; + animation_type animRun; + animation_type animRunning; + animation_type animCrouch; + animation_type animStop; + animation_type animLanding; + animation_type animLandingHard; + animation_type animFightIdle; + animation_type animBounceIdle; + animation_type animTalkIdle; + + sound_type soundsAttack[4]; + sound_type soundsTalk[2]; + + std::string figureFileName; + std::string lowFigureFileName; + std::string clothesFileName; + std::string modelFileNames[7]; + std::string lowModelFileName; + std::string modelClothesFileName; + + std::vector skins; + + GLubyte bloodText[512 * 512 * 3] = { 0 }; + + PersonType(); + bool hasAnimTalkIdle(); + static std::vector types; static void Load(); };