X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_cao.h;h=f30e90e21049f2359d13a8c34c27461e18326299;hb=cdc538e0a242167cd7031d40670d2d4464b87f2c;hp=abb242aa4d5906e3a6654f3b189cd1d47bc1085d;hpb=87291ea44a61614d5bd9efc0657926da3f867b5f;p=minetest.git

diff --git a/src/content_cao.h b/src/content_cao.h
index abb242aa4..f30e90e21 100644
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -26,6 +26,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "object_properties.h"
 #include "itemgroup.h"
 
+class Camera;
+class Client;
+struct Nametag;
+
 /*
 	SmoothTranslator
 */
@@ -65,12 +69,13 @@ class GenericCAO : public ClientActiveObject
 	//
 	scene::ISceneManager *m_smgr;
 	IrrlichtDevice *m_irr;
-	core::aabbox3d<f32> m_selection_box;
+	Client *m_client;
+	aabb3f m_selection_box;
 	scene::IMeshSceneNode *m_meshnode;
 	scene::IAnimatedMeshSceneNode *m_animated_meshnode;
 	WieldMeshSceneNode *m_wield_meshnode;
 	scene::IBillboardSceneNode *m_spritenode;
-	scene::ITextSceneNode* m_textnode;
+	Nametag* m_nametag;
 	v3f m_position;
 	v3f m_velocity;
 	v3f m_acceleration;
@@ -86,7 +91,7 @@ class GenericCAO : public ClientActiveObject
 	int m_animation_speed;
 	int m_animation_blend;
 	bool m_animation_loop;
-	std::map<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name
+	UNORDERED_MAP<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name
 	std::string m_attachment_bone;
 	v3f m_attachment_position;
 	v3f m_attachment_rotation;
@@ -97,6 +102,8 @@ class GenericCAO : public ClientActiveObject
 	float m_anim_timer;
 	ItemGroupList m_armor_groups;
 	float m_reset_textures_timer;
+	std::string m_previous_texture_modifier; // stores texture modifier before punch update
+	std::string m_current_texture_modifier;  // last applied texture modifier
 	bool m_visuals_expired;
 	float m_step_distance_counter;
 	u8 m_last_light;
@@ -105,13 +112,13 @@ class GenericCAO : public ClientActiveObject
 	std::vector<u16> m_children;
 
 public:
-	GenericCAO(IGameDef *gamedef, ClientEnvironment *env);
+	GenericCAO(Client *client, ClientEnvironment *env);
 
 	~GenericCAO();
 
-	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env)
+	static ClientActiveObject* create(Client *client, ClientEnvironment *env)
 	{
-		return new GenericCAO(gamedef, env);
+		return new GenericCAO(client, env);
 	}
 
 	inline ActiveObjectType getType() const
@@ -121,15 +128,21 @@ class GenericCAO : public ClientActiveObject
 
 	void initialize(const std::string &data);
 
+	void processInitData(const std::string &data);
+
 	ClientActiveObject *getParent();
 
-	bool getCollisionBox(aabb3f *toset);
+	bool getCollisionBox(aabb3f *toset) const;
 
-	bool collideWithObjects();
+	bool collideWithObjects() const;
 
-	core::aabbox3d<f32>* getSelectionBox();
+	aabb3f *getSelectionBox();
 
 	v3f getPosition();
+	inline float getYaw() const
+	{
+		return m_yaw;
+	}
 
 	scene::ISceneNode *getSceneNode();
 
@@ -187,7 +200,7 @@ class GenericCAO : public ClientActiveObject
 
 	void updateTexturePos();
 
-	void updateTextures(const std::string &mod);
+	void updateTextures(const std::string mod);
 
 	void updateAnimation();
 
@@ -201,7 +214,7 @@ class GenericCAO : public ClientActiveObject
 			float time_from_last_punch=1000000);
 
 	std::string debugInfoText();
-	
+
 	std::string infoText()
 	{
 		return m_prop.infotext;