Reshape LuaEntityCAO implementation a bit and make TNT to blink

data/mods/default/init.lua

@@ -1176,18 +1176,32 @@ local TNT = {
 	timer = 0,
 	-- Number of punches required to defuse
 	health = 1,
+	blinktimer = 0,
+	blinkstatus = true,
 }
 
 -- Called when a TNT object is created
 function TNT:on_activate(staticdata)
 	print("TNT:on_activate()")
-	self.object:setvelocity({x=0, y=2, z=0})
+	self.object:setvelocity({x=0, y=4, z=0})
 	self.object:setacceleration({x=0, y=-10, z=0})
+	self.object:settexturemod("^[brighten")
 end
 
 -- Called periodically
 function TNT:on_step(dtime)
 	--print("TNT:on_step()")
+	self.timer = self.timer + dtime
+	self.blinktimer = self.blinktimer + dtime
+	if self.blinktimer > 0.5 then
+		self.blinktimer = self.blinktimer - 0.5
+		if blinkstatus then
+			self.object:settexturemod("")
+		else
+			self.object:settexturemod("^[brighten")
+		end
+		blinkstatus = not blinkstatus
+	end
 end
 
 -- Called when object is punched

src/content_cao.cpp

@@ -1269,11 +1269,35 @@ void MobV2CAO::setLooks(const std::string &looks)
 
 #include "luaentity_common.h"
 
-// Prototype
+class CLuaEntityCAO : public LuaEntityCAO
-LuaEntityCAO proto_LuaEntityCAO(NULL);
+{
+private:
+	core::aabbox3d<f32> m_selection_box;
+	scene::IMeshSceneNode *m_meshnode;
+	scene::MyBillboardSceneNode *m_spritenode;
+	v3f m_position;
+	v3f m_velocity;
+	v3f m_acceleration;
+	float m_yaw;
+	struct LuaEntityProperties *m_prop;
+	SmoothTranslator pos_translator;
 
-LuaEntityCAO::LuaEntityCAO(IGameDef *gamedef):
+public:
-	ClientActiveObject(0, gamedef),
+	u8 getType() const
+	{
+		return ACTIVEOBJECT_TYPE_LUAENTITY;
+	}
+	core::aabbox3d<f32>* getSelectionBox()
+	{
+		return &m_selection_box;
+	}
+	v3f getPosition()
+	{
+		return pos_translator.vect_show;
+	}
+		
+	CLuaEntityCAO(IGameDef *gamedef):
+		LuaEntityCAO(gamedef),
 		m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.),
 		m_meshnode(NULL),
 		m_spritenode(NULL),
@@ -1282,36 +1306,33 @@ LuaEntityCAO::LuaEntityCAO(IGameDef *gamedef):
 		m_acceleration(v3f(0,0,0)),
 		m_yaw(0),
 		m_prop(new LuaEntityProperties)
-{
+	{
 		ClientActiveObject::registerType(getType(), create);
-}
+	}
 
-LuaEntityCAO::~LuaEntityCAO()
+	~CLuaEntityCAO()
-{
+	{
 		delete m_prop;
-}
+	}
 
-ClientActiveObject* LuaEntityCAO::create(IGameDef *gamedef)
+	static ClientActiveObject* create(IGameDef *gamedef)
-{
+	{
-	return new LuaEntityCAO(gamedef);
+		return new CLuaEntityCAO(gamedef);
-}
+	}
 
-void LuaEntityCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc)
+	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc)
-{
+	{
 		if(m_meshnode != NULL || m_spritenode != NULL)
 			return;
 		
 		//video::IVideoDriver* driver = smgr->getVideoDriver();
 
 		if(m_prop->visual == "single_sprite"){
-		infostream<<"LuaEntityCAO::addToScene(): single_sprite"<<std::endl;
+			infostream<<"CLuaEntityCAO::addToScene(): single_sprite"<<std::endl;
 			m_spritenode = new scene::MyBillboardSceneNode(
 					smgr->getRootSceneNode(), smgr, -1, v3f(0,0,0), v2f(1,1));
-		std::string texturestring = "unknown_block.png";
-		if(m_prop->textures.size() >= 1)
-			texturestring = m_prop->textures[0];
 			m_spritenode->setMaterialTexture(0,
-				tsrc->getTextureRaw(texturestring));
+					tsrc->getTextureRaw("unknown_block.png"));
 			m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false);
 			m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
 			m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
@@ -1328,7 +1349,7 @@ void LuaEntityCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc)
 				m_spritenode->setTCoords(3, v2f(txs*0, tys*1));
 			}
 		} else if(m_prop->visual == "cube"){
-		infostream<<"LuaEntityCAO::addToScene(): cube"<<std::endl;
+			infostream<<"CLuaEntityCAO::addToScene(): cube"<<std::endl;
 			video::SColor c(255,255,255,255);
 			video::S3DVertex vertices[24] =
 			{
@@ -1385,37 +1406,18 @@ void LuaEntityCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc)
 			
 			m_meshnode->setMesh(mesh);
 			m_meshnode->setScale(v3f(1));
-		for (u32 i = 0; i < 6; ++i)
-		{
-			std::string texturestring = "unknown_block.png";
-			if(m_prop->textures.size() > i)
-				texturestring = m_prop->textures[i];
-			AtlasPointer ap = tsrc->getTexture(texturestring);
-
-			// Get the tile texture and atlas transformation
-			video::ITexture* atlas = ap.atlas;
-			v2f pos = ap.pos;
-			v2f size = ap.size;
-
-			// Set material flags and texture
-			video::SMaterial& material = m_meshnode->getMaterial(i);
-			material.setFlag(video::EMF_LIGHTING, false);
-			material.setFlag(video::EMF_BILINEAR_FILTER, false);
-			material.setTexture(0, atlas);
-			material.getTextureMatrix(0).setTextureTranslate(pos.X, pos.Y);
-			material.getTextureMatrix(0).setTextureScale(size.X, size.Y);
-		}
 			// Will be shown when we know the brightness
 			m_meshnode->setVisible(false);
 		} else {
-		infostream<<"LuaEntityCAO::addToScene(): \""<<m_prop->visual
+			infostream<<"CLuaEntityCAO::addToScene(): \""<<m_prop->visual
 					<<"\" not supported"<<std::endl;
 		}
+		updateTextures("");
 		updateNodePos();
-}
+	}
 
-void LuaEntityCAO::removeFromScene()
+	void removeFromScene()
-{
+	{
 		if(m_meshnode){
 			m_meshnode->remove();
 			m_meshnode = NULL;
@@ -1424,10 +1426,10 @@ void LuaEntityCAO::removeFromScene()
 			m_spritenode->remove();
 			m_spritenode = NULL;
 		}
-}
+	}
 
-void LuaEntityCAO::updateLight(u8 light_at_pos)
+	void updateLight(u8 light_at_pos)
-{
+	{
 		u8 li = decode_light(light_at_pos);
 		video::SColor color(255,li,li,li);
 		if(m_meshnode){
@@ -1438,25 +1440,25 @@ void LuaEntityCAO::updateLight(u8 light_at_pos)
 			m_spritenode->setColor(color);
 			m_spritenode->setVisible(true);
 		}
-}
+	}
 
-v3s16 LuaEntityCAO::getLightPosition()
+	v3s16 getLightPosition()
-{
+	{
 		return floatToInt(m_position, BS);
-}
+	}
 
-void LuaEntityCAO::updateNodePos()
+	void updateNodePos()
-{
+	{
 		if(m_meshnode){
 			m_meshnode->setPosition(pos_translator.vect_show);
 		}
 		if(m_spritenode){
 			m_spritenode->setPosition(pos_translator.vect_show);
 		}
-}
+	}
 
-void LuaEntityCAO::step(float dtime, ClientEnvironment *env)
+	void step(float dtime, ClientEnvironment *env)
-{
+	{
 		if(m_prop->physical){
 			core::aabbox3d<f32> box = m_prop->collisionbox;
 			box.MinEdge *= BS;
@@ -1485,15 +1487,52 @@ void LuaEntityCAO::step(float dtime, ClientEnvironment *env)
 			pos_translator.translate(dtime);
 			updateNodePos();
 		}
-}
+	}
 
-void LuaEntityCAO::processMessage(const std::string &data)
+	void updateTextures(const std::string &mod)
-{
+	{
-	infostream<<"LuaEntityCAO: Got message"<<std::endl;
+		ITextureSource *tsrc = m_gamedef->tsrc();
+
+		if(m_spritenode){
+			std::string texturestring = "unknown_block.png";
+			if(m_prop->textures.size() >= 1)
+				texturestring = m_prop->textures[0];
+			texturestring += mod;
+			m_spritenode->setMaterialTexture(0,
+					tsrc->getTextureRaw(texturestring));
+		}
+		if(m_meshnode){
+			for (u32 i = 0; i < 6; ++i)
+			{
+				std::string texturestring = "unknown_block.png";
+				if(m_prop->textures.size() > i)
+					texturestring = m_prop->textures[i];
+				texturestring += mod;
+				AtlasPointer ap = tsrc->getTexture(texturestring);
+
+				// Get the tile texture and atlas transformation
+				video::ITexture* atlas = ap.atlas;
+				v2f pos = ap.pos;
+				v2f size = ap.size;
+
+				// Set material flags and texture
+				video::SMaterial& material = m_meshnode->getMaterial(i);
+				material.setFlag(video::EMF_LIGHTING, false);
+				material.setFlag(video::EMF_BILINEAR_FILTER, false);
+				material.setTexture(0, atlas);
+				material.getTextureMatrix(0).setTextureTranslate(pos.X, pos.Y);
+				material.getTextureMatrix(0).setTextureScale(size.X, size.Y);
+			}
+		}
+	}
+
+	void processMessage(const std::string &data)
+	{
+		infostream<<"CLuaEntityCAO: Got message"<<std::endl;
 		std::istringstream is(data, std::ios::binary);
 		// command
 		u8 cmd = readU8(is);
-	if(cmd == 0)
+		if(cmd == 0) // update position
 		{
 			// do_interpolate
 			bool do_interpolate = readU8(is);
@@ -1518,11 +1557,16 @@ void LuaEntityCAO::processMessage(const std::string &data)
 			}
 			updateNodePos();
 		}
-}
+		else if(cmd == 1) // set texture modification
+		{
+			std::string mod = deSerializeString(is);
+			updateTextures(mod);
+		}
+	}
 
-void LuaEntityCAO::initialize(const std::string &data)
+	void initialize(const std::string &data)
-{
+	{
-	infostream<<"LuaEntityCAO: Got init data"<<std::endl;
+		infostream<<"CLuaEntityCAO: Got init data"<<std::endl;
 		
 		std::istringstream is(data, std::ios::binary);
 		// version
@@ -1547,6 +1591,10 @@ void LuaEntityCAO::initialize(const std::string &data)
 		pos_translator.init(m_position);
 		
 		updateNodePos();
-}
+	}
+};
+
+// Prototype
+CLuaEntityCAO proto_CLuaEntityCAO(NULL);
 
 

src/content_cao.h

@@ -391,48 +391,25 @@ private:
 	LuaEntityCAO
 */
 
-struct LuaEntityProperties;
-
 class LuaEntityCAO : public ClientActiveObject
 {
 public:
-	LuaEntityCAO(IGameDef *gamedef);
+	LuaEntityCAO(IGameDef *gamedef):
-	virtual ~LuaEntityCAO();
+		ClientActiveObject(0, gamedef)
-	
+	{}
-	u8 getType() const
+	virtual ~LuaEntityCAO(){}
-	{
+	virtual u8 getType() const=0;
-		return ACTIVEOBJECT_TYPE_LUAENTITY;
+	virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc)=0;
-	}
+	virtual void removeFromScene()=0;
-	
+	virtual void updateLight(u8 light_at_pos)=0;
-	static ClientActiveObject* create(IGameDef *gamedef);
+	virtual v3s16 getLightPosition()=0;
-
+	virtual void updateNodePos()=0;
-	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc);
+	virtual void step(float dtime, ClientEnvironment *env)=0;
-	void removeFromScene();
+	virtual void processMessage(const std::string &data)=0;
-	void updateLight(u8 light_at_pos);
+	virtual void initialize(const std::string &data)=0;
-	v3s16 getLightPosition();
+	virtual core::aabbox3d<f32>* getSelectionBox()=0;
-	void updateNodePos();
+	virtual v3f getPosition()=0;
-
-	void step(float dtime, ClientEnvironment *env);
-
-	void processMessage(const std::string &data);
-
-	void initialize(const std::string &data);
-	
-	core::aabbox3d<f32>* getSelectionBox()
-		{return &m_selection_box;}
-	v3f getPosition()
-		{return pos_translator.vect_show;}
-
 private:
-	core::aabbox3d<f32> m_selection_box;
-	scene::IMeshSceneNode *m_meshnode;
-	scene::MyBillboardSceneNode *m_spritenode;
-	v3f m_position;
-	v3f m_velocity;
-	v3f m_acceleration;
-	float m_yaw;
-	struct LuaEntityProperties *m_prop;
-	SmoothTranslator pos_translator;
 };
 
 

src/content_sao.cpp

@@ -1748,6 +1748,18 @@ void LuaEntitySAO::setAcceleration(v3f acceleration)
 	m_acceleration = acceleration;
 }
 
+void LuaEntitySAO::setTextureMod(const std::string &mod)
+{
+	std::ostringstream os(std::ios::binary);
+	// command (1 = set texture modification)
+	writeU8(os, 1);
+	// parameters
+	os<<serializeString(mod);
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), false, os.str());
+	m_messages_out.push_back(aom);
+}
+
 void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
 {
 	m_last_sent_move_precision = m_base_position.getDistanceFrom(

src/content_sao.h

@@ -216,8 +216,10 @@ public:
 	void setPos(v3f pos);
 	void moveTo(v3f pos, bool continuous);
 	float getMinimumSavedMovement();
+	/* LuaEntitySAO-specific */
 	void setVelocity(v3f velocity);
 	void setAcceleration(v3f acceleration);
+	void setTextureMod(const std::string &mod);
 private:
 	void sendPosition(bool do_interpolate, bool is_movement_end);
 

src/scriptapi.cpp

@@ -1252,6 +1252,18 @@ private:
 		return 1;
 	}
 
+	// settexturemod(self, mod)
+	static int l_settexturemod(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		LuaEntitySAO *co = getluaobject(ref);
+		if(co == NULL) return 0;
+		// Do it
+		std::string mod = lua_tostring(L, 2);
+		co->setTextureMod(mod);
+		return 0;
+	}
+	
 public:
 	ObjectRef(ServerActiveObject *object):
 		m_object(object)
@@ -1322,6 +1334,7 @@ const luaL_reg ObjectRef::methods[] = {
 	method(ObjectRef, setvelocity),
 	method(ObjectRef, setacceleration),
 	method(ObjectRef, add_to_inventory),
+	method(ObjectRef, settexturemod),
 	{0,0}
 };