From: Perttu Ahola Date: Sat, 26 Nov 2011 10:35:30 +0000 (+0200) Subject: Reshape LuaEntityCAO implementation a bit and make TNT to blink X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=70363847aacbf765c60a294940ba50c8bb256cc6;p=zefram%2Fminetest%2Fminetest_engine.git Reshape LuaEntityCAO implementation a bit and make TNT to blink --- diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua index 8f8188df..b9af94be 100644 --- a/data/mods/default/init.lua +++ b/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 diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 213de554..984a216d 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -1269,284 +1269,332 @@ void MobV2CAO::setLooks(const std::string &looks) #include "luaentity_common.h" -// Prototype -LuaEntityCAO proto_LuaEntityCAO(NULL); +class CLuaEntityCAO : public LuaEntityCAO +{ +private: + core::aabbox3d 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; + +public: + u8 getType() const + { + return ACTIVEOBJECT_TYPE_LUAENTITY; + } + core::aabbox3d* 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), + m_position(v3f(0,10*BS,0)), + m_velocity(v3f(0,0,0)), + m_acceleration(v3f(0,0,0)), + m_yaw(0), + m_prop(new LuaEntityProperties) + { + ClientActiveObject::registerType(getType(), create); + } -LuaEntityCAO::LuaEntityCAO(IGameDef *gamedef): - ClientActiveObject(0, gamedef), - m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.), - m_meshnode(NULL), - m_spritenode(NULL), - m_position(v3f(0,10*BS,0)), - m_velocity(v3f(0,0,0)), - m_acceleration(v3f(0,0,0)), - m_yaw(0), - m_prop(new LuaEntityProperties) -{ - ClientActiveObject::registerType(getType(), create); -} + ~CLuaEntityCAO() + { + delete m_prop; + } -LuaEntityCAO::~LuaEntityCAO() -{ - delete m_prop; -} + static ClientActiveObject* create(IGameDef *gamedef) + { + return new CLuaEntityCAO(gamedef); + } -ClientActiveObject* LuaEntityCAO::create(IGameDef *gamedef) -{ - return new LuaEntityCAO(gamedef); -} + 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<<"CLuaEntityCAO::addToScene(): single_sprite"<getRootSceneNode(), smgr, -1, v3f(0,0,0), v2f(1,1)); + m_spritenode->setMaterialTexture(0, + 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); + m_spritenode->setMaterialFlag(video::EMF_FOG_ENABLE, true); + m_spritenode->setColor(video::SColor(255,0,0,0)); + m_spritenode->setVisible(false); /* Set visible when brightness is known */ + m_spritenode->setSize(v2f(1,1)*1.0*BS); + { + const float txs = 1.0 / 1; + const float tys = 1.0 / 1; + m_spritenode->setTCoords(0, v2f(txs*1, tys*1)); + m_spritenode->setTCoords(1, v2f(txs*1, tys*0)); + m_spritenode->setTCoords(2, v2f(txs*0, tys*0)); + m_spritenode->setTCoords(3, v2f(txs*0, tys*1)); + } + } else if(m_prop->visual == "cube"){ + infostream<<"CLuaEntityCAO::addToScene(): cube"<getVideoDriver(); + u16 indices[6] = {0,1,2,2,3,0}; - if(m_prop->visual == "single_sprite"){ - infostream<<"LuaEntityCAO::addToScene(): single_sprite"<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)); - m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false); - m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false); - m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF); - m_spritenode->setMaterialFlag(video::EMF_FOG_ENABLE, true); - m_spritenode->setColor(video::SColor(255,0,0,0)); - m_spritenode->setVisible(false); /* Set visible when brightness is known */ - m_spritenode->setSize(v2f(1,1)*1.0*BS); - { - const float txs = 1.0 / 1; - const float tys = 1.0 / 1; - m_spritenode->setTCoords(0, v2f(txs*1, tys*1)); - m_spritenode->setTCoords(1, v2f(txs*1, tys*0)); - m_spritenode->setTCoords(2, v2f(txs*0, tys*0)); - m_spritenode->setTCoords(3, v2f(txs*0, tys*1)); - } - } else if(m_prop->visual == "cube"){ - infostream<<"LuaEntityCAO::addToScene(): cube"<append(vertices + 4 * i, 4, indices, 6); + buf->recalculateBoundingBox(); + mesh->addMeshBuffer(buf); + buf->drop(); + } + mesh->recalculateBoundingBox(); - for(u32 i=0; i<24; ++i){ - vertices[i].Pos *= BS; + m_meshnode = smgr->addMeshSceneNode(mesh, NULL); + + m_meshnode->setMesh(mesh); + m_meshnode->setScale(v3f(1)); + // Will be shown when we know the brightness + m_meshnode->setVisible(false); + } else { + infostream<<"CLuaEntityCAO::addToScene(): \""<visual + <<"\" not supported"<append(vertices + 4 * i, 4, indices, 6); - buf->recalculateBoundingBox(); - mesh->addMeshBuffer(buf); - buf->drop(); + void removeFromScene() + { + if(m_meshnode){ + m_meshnode->remove(); + m_meshnode = NULL; } - mesh->recalculateBoundingBox(); - - m_meshnode = smgr->addMeshSceneNode(mesh, NULL); - - 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); + if(m_spritenode){ + m_spritenode->remove(); + m_spritenode = NULL; } - // Will be shown when we know the brightness - m_meshnode->setVisible(false); - } else { - infostream<<"LuaEntityCAO::addToScene(): \""<visual - <<"\" not supported"<remove(); - m_meshnode = NULL; + void updateLight(u8 light_at_pos) + { + u8 li = decode_light(light_at_pos); + video::SColor color(255,li,li,li); + if(m_meshnode){ + setMeshVerticesColor(m_meshnode->getMesh(), color); + m_meshnode->setVisible(true); + } + if(m_spritenode){ + m_spritenode->setColor(color); + m_spritenode->setVisible(true); + } } - if(m_spritenode){ - m_spritenode->remove(); - m_spritenode = NULL; + + v3s16 getLightPosition() + { + return floatToInt(m_position, BS); } -} -void LuaEntityCAO::updateLight(u8 light_at_pos) -{ - u8 li = decode_light(light_at_pos); - video::SColor color(255,li,li,li); - if(m_meshnode){ - setMeshVerticesColor(m_meshnode->getMesh(), color); - m_meshnode->setVisible(true); + void updateNodePos() + { + if(m_meshnode){ + m_meshnode->setPosition(pos_translator.vect_show); + } + if(m_spritenode){ + m_spritenode->setPosition(pos_translator.vect_show); + } } - if(m_spritenode){ - m_spritenode->setColor(color); - m_spritenode->setVisible(true); + + void step(float dtime, ClientEnvironment *env) + { + if(m_prop->physical){ + core::aabbox3d box = m_prop->collisionbox; + box.MinEdge *= BS; + box.MaxEdge *= BS; + collisionMoveResult moveresult; + f32 pos_max_d = BS*0.25; // Distance per iteration + v3f p_pos = m_position; + v3f p_velocity = m_velocity; + IGameDef *gamedef = env->getGameDef(); + moveresult = collisionMovePrecise(&env->getMap(), gamedef, + pos_max_d, box, dtime, p_pos, p_velocity); + // Apply results + m_position = p_pos; + m_velocity = p_velocity; + + bool is_end_position = moveresult.collides; + pos_translator.update(m_position, is_end_position, dtime); + pos_translator.translate(dtime); + updateNodePos(); + + m_velocity += dtime * m_acceleration; + } else { + m_position += dtime * m_velocity + 0.5 * dtime * dtime * m_acceleration; + m_velocity += dtime * m_acceleration; + pos_translator.update(m_position, pos_translator.aim_is_end, pos_translator.anim_time); + pos_translator.translate(dtime); + updateNodePos(); + } } -} -v3s16 LuaEntityCAO::getLightPosition() -{ - return floatToInt(m_position, BS); -} + void updateTextures(const std::string &mod) + { + ITextureSource *tsrc = m_gamedef->tsrc(); -void LuaEntityCAO::updateNodePos() -{ - if(m_meshnode){ - m_meshnode->setPosition(pos_translator.vect_show); - } - if(m_spritenode){ - m_spritenode->setPosition(pos_translator.vect_show); + 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 LuaEntityCAO::step(float dtime, ClientEnvironment *env) -{ - if(m_prop->physical){ - core::aabbox3d box = m_prop->collisionbox; - box.MinEdge *= BS; - box.MaxEdge *= BS; - collisionMoveResult moveresult; - f32 pos_max_d = BS*0.25; // Distance per iteration - v3f p_pos = m_position; - v3f p_velocity = m_velocity; - IGameDef *gamedef = env->getGameDef(); - moveresult = collisionMovePrecise(&env->getMap(), gamedef, - pos_max_d, box, dtime, p_pos, p_velocity); - // Apply results - m_position = p_pos; - m_velocity = p_velocity; - - bool is_end_position = moveresult.collides; - pos_translator.update(m_position, is_end_position, dtime); - pos_translator.translate(dtime); - updateNodePos(); - m_velocity += dtime * m_acceleration; - } else { - m_position += dtime * m_velocity + 0.5 * dtime * dtime * m_acceleration; - m_velocity += dtime * m_acceleration; - pos_translator.update(m_position, pos_translator.aim_is_end, pos_translator.anim_time); - pos_translator.translate(dtime); - updateNodePos(); + void processMessage(const std::string &data) + { + infostream<<"CLuaEntityCAO: Got message"<physical) + pos_translator.update(m_position, is_end_position, update_interval); + } else { + pos_translator.init(m_position); + } + updateNodePos(); + } + else if(cmd == 1) // set texture modification + { + std::string mod = deSerializeString(is); + updateTextures(mod); + } } -} -void LuaEntityCAO::processMessage(const std::string &data) -{ - infostream<<"LuaEntityCAO: Got message"<deSerialize(prop_is); + + infostream<<"m_prop: "<dump()<collisionbox; + m_selection_box.MinEdge *= BS; + m_selection_box.MaxEdge *= BS; + + pos_translator.init(m_position); - if(do_interpolate){ - if(!m_prop->physical) - pos_translator.update(m_position, is_end_position, update_interval); - } else { - pos_translator.init(m_position); - } updateNodePos(); } -} +}; -void LuaEntityCAO::initialize(const std::string &data) -{ - infostream<<"LuaEntityCAO: Got init data"<deSerialize(prop_is); - - infostream<<"m_prop: "<dump()<collisionbox; - m_selection_box.MinEdge *= BS; - m_selection_box.MaxEdge *= BS; - - pos_translator.init(m_position); - - updateNodePos(); -} +// Prototype +CLuaEntityCAO proto_CLuaEntityCAO(NULL); diff --git a/src/content_cao.h b/src/content_cao.h index fa7a0cb4..37d9c4ed 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -391,48 +391,25 @@ private: LuaEntityCAO */ -struct LuaEntityProperties; - class LuaEntityCAO : public ClientActiveObject { public: - LuaEntityCAO(IGameDef *gamedef); - virtual ~LuaEntityCAO(); - - u8 getType() const - { - return ACTIVEOBJECT_TYPE_LUAENTITY; - } - - static ClientActiveObject* create(IGameDef *gamedef); - - void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc); - void removeFromScene(); - void updateLight(u8 light_at_pos); - v3s16 getLightPosition(); - void updateNodePos(); - - void step(float dtime, ClientEnvironment *env); - - void processMessage(const std::string &data); - - void initialize(const std::string &data); - - core::aabbox3d* getSelectionBox() - {return &m_selection_box;} - v3f getPosition() - {return pos_translator.vect_show;} - + LuaEntityCAO(IGameDef *gamedef): + ClientActiveObject(0, gamedef) + {} + virtual ~LuaEntityCAO(){} + virtual u8 getType() const=0; + virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc)=0; + virtual void removeFromScene()=0; + virtual void updateLight(u8 light_at_pos)=0; + virtual v3s16 getLightPosition()=0; + virtual void updateNodePos()=0; + virtual void step(float dtime, ClientEnvironment *env)=0; + virtual void processMessage(const std::string &data)=0; + virtual void initialize(const std::string &data)=0; + virtual core::aabbox3d* getSelectionBox()=0; + virtual v3f getPosition()=0; private: - core::aabbox3d 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; }; diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 5d63b295..74824d57 100644 --- a/src/content_sao.cpp +++ b/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<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} };