X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_cao.cpp;h=01f13df4ef2d0244b5b9fc9377fc30420d632d40;hb=989aba1966373885d4cac306daea25e102f8d68d;hp=a2708674b7295d86ba775a640a725b0a4bfca997;hpb=6a76c226e10e92c3e3339096f07f8ab065e2098b;p=dragonfireclient.git diff --git a/src/content_cao.cpp b/src/content_cao.cpp index a2708674b..01f13df4e 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -31,7 +31,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_object.h" #include "mesh.h" #include "utility.h" // For IntervalLimiter +#include "itemdef.h" +#include "tool.h" class Settings; +struct ToolCapabilities; core::map ClientActiveObject::m_types; @@ -116,225 +119,10 @@ struct SmoothTranslator } }; - -/* - TestCAO -*/ - -class TestCAO : public ClientActiveObject -{ -public: - TestCAO(IGameDef *gamedef, ClientEnvironment *env); - virtual ~TestCAO(); - - u8 getType() const - { - return ACTIVEOBJECT_TYPE_TEST; - } - - static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env); - - void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr); - void removeFromScene(); - void updateLight(u8 light_at_pos); - v3s16 getLightPosition(); - void updateNodePos(); - - void step(float dtime, ClientEnvironment *env); - - void processMessage(const std::string &data); - -private: - scene::IMeshSceneNode *m_node; - v3f m_position; -}; - -/* - ItemCAO -*/ - -class ItemCAO : public ClientActiveObject -{ -public: - ItemCAO(IGameDef *gamedef, ClientEnvironment *env); - virtual ~ItemCAO(); - - u8 getType() const - { - return ACTIVEOBJECT_TYPE_ITEM; - } - - static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env); - - void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr); - void removeFromScene(); - void updateLight(u8 light_at_pos); - v3s16 getLightPosition(); - void updateNodePos(); - void updateInfoText(); - void updateTexture(); - - 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 m_position;} - - std::string infoText() - {return m_infotext;} - -private: - core::aabbox3d m_selection_box; - scene::IMeshSceneNode *m_node; - v3f m_position; - std::string m_itemstring; - std::string m_infotext; -}; - -/* - RatCAO -*/ - -class RatCAO : public ClientActiveObject -{ -public: - RatCAO(IGameDef *gamedef, ClientEnvironment *env); - virtual ~RatCAO(); - - u8 getType() const - { - return ACTIVEOBJECT_TYPE_RAT; - } - - static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env); - - void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr); - 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;} - //{return m_position;} - -private: - core::aabbox3d m_selection_box; - scene::IMeshSceneNode *m_node; - v3f m_position; - float m_yaw; - SmoothTranslator pos_translator; -}; - -/* - Oerkki1CAO -*/ - -class Oerkki1CAO : public ClientActiveObject -{ -public: - Oerkki1CAO(IGameDef *gamedef, ClientEnvironment *env); - virtual ~Oerkki1CAO(); - - u8 getType() const - { - return ACTIVEOBJECT_TYPE_OERKKI1; - } - - static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env); - - void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr); - 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;} - //{return m_position;} - - // If returns true, punch will not be sent to the server - bool directReportPunch(const std::string &toolname, v3f dir); - -private: - IntervalLimiter m_attack_interval; - core::aabbox3d m_selection_box; - scene::IMeshSceneNode *m_node; - v3f m_position; - float m_yaw; - SmoothTranslator pos_translator; - float m_damage_visual_timer; - bool m_damage_texture_enabled; -}; - /* - FireflyCAO + Other stuff */ -class FireflyCAO : public ClientActiveObject -{ -public: - FireflyCAO(IGameDef *gamedef, ClientEnvironment *env); - virtual ~FireflyCAO(); - - u8 getType() const - { - return ACTIVEOBJECT_TYPE_FIREFLY; - } - - static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env); - - void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr); - 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 m_position;} - -private: - core::aabbox3d m_selection_box; - scene::IMeshSceneNode *m_node; - v3f m_position; - float m_yaw; - SmoothTranslator pos_translator; -}; - static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill, float txs, float tys, int col, int row) { @@ -345,18 +133,18 @@ static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill, } /* - MobV2CAO + TestCAO */ -class MobV2CAO : public ClientActiveObject +class TestCAO : public ClientActiveObject { public: - MobV2CAO(IGameDef *gamedef, ClientEnvironment *env); - virtual ~MobV2CAO(); + TestCAO(IGameDef *gamedef, ClientEnvironment *env); + virtual ~TestCAO(); u8 getType() const { - return ACTIVEOBJECT_TYPE_MOBV2; + return ACTIVEOBJECT_TYPE_TEST; } static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env); @@ -372,55 +160,11 @@ class MobV2CAO : public ClientActiveObject 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;} - //{return m_position;} - bool doShowSelectionBox(){return false;} - - // If returns true, punch will not be sent to the server - bool directReportPunch(const std::string &toolname, v3f dir); - private: - void setLooks(const std::string &looks); - - IntervalLimiter m_attack_interval; - core::aabbox3d m_selection_box; - scene::IBillboardSceneNode *m_node; + scene::IMeshSceneNode *m_node; v3f m_position; - std::string m_texture_name; - float m_yaw; - SmoothTranslator pos_translator; - bool m_walking; - float m_walking_unset_timer; - float m_walk_timer; - int m_walk_frame; - float m_damage_visual_timer; - u8 m_last_light; - bool m_shooting; - float m_shooting_unset_timer; - v2f m_sprite_size; - float m_sprite_y; - bool m_bright_shooting; - std::string m_sprite_type; - int m_simple_anim_frames; - float m_simple_anim_frametime; - bool m_lock_full_brightness; - int m_player_hit_damage; - float m_player_hit_distance; - float m_player_hit_interval; - float m_player_hit_timer; - - Settings *m_properties; }; -/* - TestCAO -*/ - // Prototype TestCAO proto_TestCAO(NULL, NULL); @@ -535,829 +279,123 @@ void TestCAO::processMessage(const std::string &data) ItemCAO */ -#include "inventory.h" - -// Prototype -ItemCAO proto_ItemCAO(NULL, NULL); - -ItemCAO::ItemCAO(IGameDef *gamedef, ClientEnvironment *env): - ClientActiveObject(0, gamedef, env), - m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.), - m_node(NULL), - m_position(v3f(0,10*BS,0)) +class ItemCAO : public ClientActiveObject { - if(!gamedef && !env) +public: + ItemCAO(IGameDef *gamedef, ClientEnvironment *env); + virtual ~ItemCAO(); + + u8 getType() const { - ClientActiveObject::registerType(getType(), create); + return ACTIVEOBJECT_TYPE_ITEM; } -} + + static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env); -ItemCAO::~ItemCAO() -{ -} + void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, + IrrlichtDevice *irr); + void removeFromScene(); + void updateLight(u8 light_at_pos); + v3s16 getLightPosition(); + void updateNodePos(); + void updateInfoText(); + void updateTexture(); -ClientActiveObject* ItemCAO::create(IGameDef *gamedef, ClientEnvironment *env) -{ - return new ItemCAO(gamedef, env); -} + void step(float dtime, ClientEnvironment *env); -void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr) -{ - if(m_node != NULL) - return; - - //video::IVideoDriver* driver = smgr->getVideoDriver(); - - scene::SMesh *mesh = new scene::SMesh(); - scene::IMeshBuffer *buf = new scene::SMeshBuffer(); - video::SColor c(255,255,255,255); - video::S3DVertex vertices[4] = - { - /*video::S3DVertex(-BS/2,-BS/4,0, 0,0,0, c, 0,1), - video::S3DVertex(BS/2,-BS/4,0, 0,0,0, c, 1,1), - video::S3DVertex(BS/2,BS/4,0, 0,0,0, c, 1,0), - video::S3DVertex(-BS/2,BS/4,0, 0,0,0, c, 0,0),*/ - video::S3DVertex(BS/3.,0,0, 0,0,0, c, 0,1), - video::S3DVertex(-BS/3.,0,0, 0,0,0, c, 1,1), - video::S3DVertex(-BS/3.,0+BS*2./3.,0, 0,0,0, c, 1,0), - video::S3DVertex(BS/3.,0+BS*2./3.,0, 0,0,0, c, 0,0), - }; - u16 indices[] = {0,1,2,2,3,0}; - buf->append(vertices, 4, indices, 6); - // Set material - buf->getMaterial().setFlag(video::EMF_LIGHTING, false); - buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); - // Initialize with a generated placeholder texture - buf->getMaterial().setTexture(0, tsrc->getTextureRaw("")); - buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); - buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true); - buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; - // Add to mesh - mesh->addMeshBuffer(buf); - buf->drop(); - m_node = smgr->addMeshSceneNode(mesh, NULL); - mesh->drop(); - updateNodePos(); - - /* - Update image of node - */ - - updateTexture(); -} - -void ItemCAO::removeFromScene() -{ - if(m_node == NULL) - return; - - m_node->remove(); - m_node = NULL; -} - -void ItemCAO::updateLight(u8 light_at_pos) -{ - if(m_node == NULL) - return; - - u8 li = decode_light(light_at_pos); - video::SColor color(255,li,li,li); - setMeshColor(m_node->getMesh(), color); -} - -v3s16 ItemCAO::getLightPosition() -{ - return floatToInt(m_position, BS); -} - -void ItemCAO::updateNodePos() -{ - if(m_node == NULL) - return; - - m_node->setPosition(m_position); -} - -void ItemCAO::updateInfoText() -{ - try{ - IItemDefManager *idef = m_gamedef->idef(); - ItemStack item; - item.deSerialize(m_itemstring, idef); - if(item.isKnown(idef)) - m_infotext = item.getDefinition(idef).description; - else - m_infotext = "Unknown item: '" + m_itemstring + "'"; - if(item.count >= 2) - m_infotext += " (" + itos(item.count) + ")"; - } - catch(SerializationError &e) - { - m_infotext = "Unknown item: '" + m_itemstring + "'"; - } -} - -void ItemCAO::updateTexture() -{ - if(m_node == NULL) - return; - - // Create an inventory item to see what is its image - std::istringstream is(m_itemstring, std::ios_base::binary); - video::ITexture *texture = NULL; - try{ - IItemDefManager *idef = m_gamedef->idef(); - ItemStack item; - item.deSerialize(is, idef); - texture = item.getDefinition(idef).inventory_texture; - } - catch(SerializationError &e) - { - infostream<<"WARNING: "<<__FUNCTION_NAME - <<": error deSerializing itemstring \"" - <getMaterial(0).setTexture(0, texture); -} - - -void ItemCAO::step(float dtime, ClientEnvironment *env) -{ - if(m_node) - { - /*v3f rot = m_node->getRotation(); - rot.Y += dtime * 120; - m_node->setRotation(rot);*/ - LocalPlayer *player = env->getLocalPlayer(); - assert(player); - v3f rot = m_node->getRotation(); - rot.Y = 180.0 - (player->getYaw()); - m_node->setRotation(rot); - } -} - -void ItemCAO::processMessage(const std::string &data) -{ - //infostream<<"ItemCAO: Got message"<getVideoDriver(); - - scene::SMesh *mesh = new scene::SMesh(); - scene::IMeshBuffer *buf = new scene::SMeshBuffer(); - video::SColor c(255,255,255,255); - video::S3DVertex vertices[4] = - { - video::S3DVertex(-BS/2,0,0, 0,0,0, c, 0,1), - video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1), - video::S3DVertex(BS/2,BS/2,0, 0,0,0, c, 1,0), - video::S3DVertex(-BS/2,BS/2,0, 0,0,0, c, 0,0), - }; - u16 indices[] = {0,1,2,2,3,0}; - buf->append(vertices, 4, indices, 6); - // Set material - buf->getMaterial().setFlag(video::EMF_LIGHTING, false); - buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); - //buf->getMaterial().setTexture(0, NULL); - buf->getMaterial().setTexture(0, tsrc->getTextureRaw("rat.png")); - buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); - buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true); - buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; - // Add to mesh - mesh->addMeshBuffer(buf); - buf->drop(); - m_node = smgr->addMeshSceneNode(mesh, NULL); - mesh->drop(); - // Set it to use the materials of the meshbuffers directly. - // This is needed for changing the texture in the future - m_node->setReadOnlyMaterials(true); - updateNodePos(); -} - -void RatCAO::removeFromScene() -{ - if(m_node == NULL) - return; - - m_node->remove(); - m_node = NULL; -} - -void RatCAO::updateLight(u8 light_at_pos) -{ - if(m_node == NULL) - return; - - u8 li = decode_light(light_at_pos); - video::SColor color(255,li,li,li); - setMeshColor(m_node->getMesh(), color); -} - -v3s16 RatCAO::getLightPosition() -{ - return floatToInt(m_position+v3f(0,BS*0.5,0), BS); -} - -void RatCAO::updateNodePos() -{ - if(m_node == NULL) - return; - - //m_node->setPosition(m_position); - m_node->setPosition(pos_translator.vect_show); - - v3f rot = m_node->getRotation(); - rot.Y = 180.0 - m_yaw; - m_node->setRotation(rot); -} - -void RatCAO::step(float dtime, ClientEnvironment *env) -{ - pos_translator.translate(dtime); - updateNodePos(); -} - -void RatCAO::processMessage(const std::string &data) -{ - //infostream<<"RatCAO: Got message"<getVideoDriver(); - - scene::SMesh *mesh = new scene::SMesh(); - scene::IMeshBuffer *buf = new scene::SMeshBuffer(); - video::SColor c(255,255,255,255); - video::S3DVertex vertices[4] = - { - video::S3DVertex(-BS/2-BS,0,0, 0,0,0, c, 0,1), - video::S3DVertex(BS/2+BS,0,0, 0,0,0, c, 1,1), - video::S3DVertex(BS/2+BS,BS*2,0, 0,0,0, c, 1,0), - video::S3DVertex(-BS/2-BS,BS*2,0, 0,0,0, c, 0,0), - }; - u16 indices[] = {0,1,2,2,3,0}; - buf->append(vertices, 4, indices, 6); - // Set material - buf->getMaterial().setFlag(video::EMF_LIGHTING, false); - buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); - //buf->getMaterial().setTexture(0, NULL); - buf->getMaterial().setTexture(0, tsrc->getTextureRaw("oerkki1.png")); - buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); - buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true); - buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; - // Add to mesh - mesh->addMeshBuffer(buf); - buf->drop(); - m_node = smgr->addMeshSceneNode(mesh, NULL); - mesh->drop(); - // Set it to use the materials of the meshbuffers directly. - // This is needed for changing the texture in the future - m_node->setReadOnlyMaterials(true); - updateNodePos(); -} - -void Oerkki1CAO::removeFromScene() -{ - if(m_node == NULL) - return; - - m_node->remove(); - m_node = NULL; -} - -void Oerkki1CAO::updateLight(u8 light_at_pos) -{ - if(m_node == NULL) - return; - - if(light_at_pos <= 2) - { - m_node->setVisible(false); - return; - } - - m_node->setVisible(true); - - u8 li = decode_light(light_at_pos); - video::SColor color(255,li,li,li); - setMeshColor(m_node->getMesh(), color); -} - -v3s16 Oerkki1CAO::getLightPosition() -{ - return floatToInt(m_position+v3f(0,BS*1.5,0), BS); -} - -void Oerkki1CAO::updateNodePos() -{ - if(m_node == NULL) - return; - - //m_node->setPosition(m_position); - m_node->setPosition(pos_translator.vect_show); - - v3f rot = m_node->getRotation(); - rot.Y = 180.0 - m_yaw + 90.0; - m_node->setRotation(rot); -} - -void Oerkki1CAO::step(float dtime, ClientEnvironment *env) -{ - ITextureSource *tsrc = m_gamedef->tsrc(); - - pos_translator.translate(dtime); - updateNodePos(); - - LocalPlayer *player = env->getLocalPlayer(); - assert(player); - - v3f playerpos = player->getPosition(); - v2f playerpos_2d(playerpos.X,playerpos.Z); - v2f objectpos_2d(m_position.X,m_position.Z); - - if(fabs(m_position.Y - playerpos.Y) < 1.5*BS && - objectpos_2d.getDistanceFrom(playerpos_2d) < 1.5*BS) - { - if(m_attack_interval.step(dtime, 0.5)) - { - env->damageLocalPlayer(2); - } - } - - if(m_damage_visual_timer > 0) - { - if(!m_damage_texture_enabled) - { - // Enable damage texture - if(m_node) - { - /*video::IVideoDriver* driver = - m_node->getSceneManager()->getVideoDriver();*/ - - scene::IMesh *mesh = m_node->getMesh(); - if(mesh == NULL) - return; - - u16 mc = mesh->getMeshBufferCount(); - for(u16 j=0; jgetMeshBuffer(j); - buf->getMaterial().setTexture(0, - tsrc->getTextureRaw("oerkki1_damaged.png")); - } - } - m_damage_texture_enabled = true; - } - m_damage_visual_timer -= dtime; - } - else - { - if(m_damage_texture_enabled) - { - // Disable damage texture - if(m_node) - { - /*video::IVideoDriver* driver = - m_node->getSceneManager()->getVideoDriver();*/ - - scene::IMesh *mesh = m_node->getMesh(); - if(mesh == NULL) - return; - - u16 mc = mesh->getMeshBufferCount(); - for(u16 j=0; jgetMeshBuffer(j); - buf->getMaterial().setTexture(0, - tsrc->getTextureRaw("oerkki1.png")); - } - } - m_damage_texture_enabled = false; - } - } -} - -void Oerkki1CAO::processMessage(const std::string &data) -{ - //infostream<<"Oerkki1CAO: Got message"<getVideoDriver(); - - scene::SMesh *mesh = new scene::SMesh(); - scene::IMeshBuffer *buf = new scene::SMeshBuffer(); - video::SColor c(255,255,255,255); - video::S3DVertex vertices[4] = - { - video::S3DVertex(0,0,0, 0,0,0, c, 0,1), - video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1), - video::S3DVertex(BS/2,BS/2,0, 0,0,0, c, 1,0), - video::S3DVertex(0,BS/2,0, 0,0,0, c, 0,0), - }; - u16 indices[] = {0,1,2,2,3,0}; - buf->append(vertices, 4, indices, 6); - // Set material - buf->getMaterial().setFlag(video::EMF_LIGHTING, false); - buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); - //buf->getMaterial().setTexture(0, NULL); - buf->getMaterial().setTexture(0, tsrc->getTextureRaw("firefly.png")); - buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); - buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true); - buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; - // Add to mesh - mesh->addMeshBuffer(buf); - buf->drop(); - m_node = smgr->addMeshSceneNode(mesh, NULL); - mesh->drop(); - // Set it to use the materials of the meshbuffers directly. - // This is needed for changing the texture in the future - m_node->setReadOnlyMaterials(true); - updateNodePos(); -} - -void FireflyCAO::removeFromScene() -{ - if(m_node == NULL) - return; - - m_node->remove(); - m_node = NULL; -} - -void FireflyCAO::updateLight(u8 light_at_pos) -{ - if(m_node == NULL) - return; - - u8 li = 255; - video::SColor color(255,li,li,li); - setMeshColor(m_node->getMesh(), color); -} - -v3s16 FireflyCAO::getLightPosition() -{ - return floatToInt(m_position+v3f(0,BS*0.5,0), BS); -} - -void FireflyCAO::updateNodePos() -{ - if(m_node == NULL) - return; - - //m_node->setPosition(m_position); - m_node->setPosition(pos_translator.vect_show); - - v3f rot = m_node->getRotation(); - rot.Y = 180.0 - m_yaw; - m_node->setRotation(rot); -} - -void FireflyCAO::step(float dtime, ClientEnvironment *env) -{ - pos_translator.translate(dtime); - updateNodePos(); -} - -void FireflyCAO::processMessage(const std::string &data) -{ - //infostream<<"FireflyCAO: Got message"<* getSelectionBox() + {return &m_selection_box;} + v3f getPosition() + {return m_position;} - updateNodePos(); -} + std::string infoText() + {return m_infotext;} -/* - MobV2CAO -*/ +private: + core::aabbox3d m_selection_box; + scene::IMeshSceneNode *m_node; + v3f m_position; + std::string m_itemstring; + std::string m_infotext; +}; + +#include "inventory.h" // Prototype -MobV2CAO proto_MobV2CAO(NULL, NULL); +ItemCAO proto_ItemCAO(NULL, NULL); -MobV2CAO::MobV2CAO(IGameDef *gamedef, ClientEnvironment *env): +ItemCAO::ItemCAO(IGameDef *gamedef, ClientEnvironment *env): ClientActiveObject(0, gamedef, env), - m_selection_box(-0.4*BS,-0.4*BS,-0.4*BS, 0.4*BS,0.8*BS,0.4*BS), + m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.), m_node(NULL), - m_position(v3f(0,10*BS,0)), - m_yaw(0), - m_walking(false), - m_walking_unset_timer(0), - m_walk_timer(0), - m_walk_frame(0), - m_damage_visual_timer(0), - m_last_light(0), - m_shooting(0), - m_shooting_unset_timer(0), - m_sprite_size(BS,BS), - m_sprite_y(0), - m_bright_shooting(false), - m_lock_full_brightness(false), - m_player_hit_timer(0) + m_position(v3f(0,10*BS,0)) { - ClientActiveObject::registerType(getType(), create); - - m_properties = new Settings; + if(!gamedef && !env) + { + ClientActiveObject::registerType(getType(), create); + } } -MobV2CAO::~MobV2CAO() +ItemCAO::~ItemCAO() { - delete m_properties; } -ClientActiveObject* MobV2CAO::create(IGameDef *gamedef, ClientEnvironment *env) +ClientActiveObject* ItemCAO::create(IGameDef *gamedef, ClientEnvironment *env) { - return new MobV2CAO(gamedef, env); + return new ItemCAO(gamedef, env); } -void MobV2CAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, +void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, IrrlichtDevice *irr) { if(m_node != NULL) return; - /*infostream<<"MobV2CAO::addToScene using texture_name="<< - m_texture_name<getVideoDriver(); - scene::IBillboardSceneNode *bill = smgr->addBillboardSceneNode( - NULL, v2f(1, 1), v3f(0,0,0), -1); - bill->setMaterialTexture(0, tsrc->getTextureRaw(texture_string)); - bill->setMaterialFlag(video::EMF_LIGHTING, false); - bill->setMaterialFlag(video::EMF_BILINEAR_FILTER, false); - bill->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF); - bill->setMaterialFlag(video::EMF_FOG_ENABLE, true); - bill->setColor(video::SColor(255,0,0,0)); - bill->setVisible(false); /* Set visible when brightness is known */ - bill->setSize(m_sprite_size); - if(m_sprite_type == "humanoid_1"){ - const float txp = 1./192; - const float txs = txp*32; - const float typ = 1./240; - const float tys = typ*48; - setBillboardTextureMatrix(bill, txs, tys, 0, 0); - } else if(m_sprite_type == "simple"){ - const float txs = 1.0; - const float tys = 1.0 / m_simple_anim_frames; - setBillboardTextureMatrix(bill, txs, tys, 0, 0); - } else { - infostream<<"MobV2CAO: Unknown sprite type \""<append(vertices, 4, indices, 6); + // Set material + buf->getMaterial().setFlag(video::EMF_LIGHTING, false); + buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); + // Initialize with a generated placeholder texture + buf->getMaterial().setTexture(0, tsrc->getTextureRaw("")); + buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); + buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true); + buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; + // Add to mesh + mesh->addMeshBuffer(buf); + buf->drop(); + m_node = smgr->addMeshSceneNode(mesh, NULL); + mesh->drop(); + updateNodePos(); - m_node = bill; + /* + Update image of node + */ - updateNodePos(); + updateTexture(); } -void MobV2CAO::removeFromScene() +void ItemCAO::removeFromScene() { if(m_node == NULL) return; @@ -1366,313 +404,129 @@ void MobV2CAO::removeFromScene() m_node = NULL; } -void MobV2CAO::updateLight(u8 light_at_pos) +void ItemCAO::updateLight(u8 light_at_pos) { - if(m_lock_full_brightness) - light_at_pos = 15; - - m_last_light = light_at_pos; - if(m_node == NULL) return; - - if(m_damage_visual_timer > 0) - return; - - if(m_shooting && m_bright_shooting) - return; - - /*if(light_at_pos <= 2){ - m_node->setVisible(false); - return; - }*/ - - m_node->setVisible(true); u8 li = decode_light(light_at_pos); video::SColor color(255,li,li,li); - m_node->setColor(color); + setMeshColor(m_node->getMesh(), color); } -v3s16 MobV2CAO::getLightPosition() +v3s16 ItemCAO::getLightPosition() { - return floatToInt(m_position+v3f(0,0,0), BS); + return floatToInt(m_position + v3f(0,0.5*BS,0), BS); } -void MobV2CAO::updateNodePos() +void ItemCAO::updateNodePos() { if(m_node == NULL) return; - m_node->setPosition(pos_translator.vect_show + v3f(0,m_sprite_y,0)); + m_node->setPosition(m_position); } -void MobV2CAO::step(float dtime, ClientEnvironment *env) +void ItemCAO::updateInfoText() { - scene::IBillboardSceneNode *bill = m_node; - if(!bill) - return; - - pos_translator.translate(dtime); - - if(m_sprite_type == "humanoid_1"){ - scene::ICameraSceneNode* camera = m_node->getSceneManager()->getActiveCamera(); - if(!camera) - return; - v3f cam_to_mob = m_node->getAbsolutePosition() - camera->getAbsolutePosition(); - cam_to_mob.normalize(); - int col = 0; - if(cam_to_mob.Y > 0.75) - col = 5; - else if(cam_to_mob.Y < -0.75) - col = 4; - else{ - float mob_dir = atan2(cam_to_mob.Z, cam_to_mob.X) / PI * 180.; - float dir = mob_dir - m_yaw; - dir = wrapDegrees_180(dir); - //infostream<<"id="<= m_simple_anim_frametime){ - m_walk_frame = (m_walk_frame + 1) % m_simple_anim_frames; - m_walk_timer = 0; - } - int col = 0; - int row = m_walk_frame; - const float txs = 1.0; - const float tys = 1.0 / m_simple_anim_frames; - setBillboardTextureMatrix(bill, txs, tys, col, row); - } else { - infostream<<"MobV2CAO::step(): Unknown sprite type \"" - <idef(); + ItemStack item; + item.deSerialize(m_itemstring, idef); + if(item.isKnown(idef)) + m_infotext = item.getDefinition(idef).description; + else + m_infotext = "Unknown item: '" + m_itemstring + "'"; + if(item.count >= 2) + m_infotext += " (" + itos(item.count) + ")"; } - - updateNodePos(); - - /* Damage local player */ - if(m_player_hit_damage && m_player_hit_timer <= 0.0){ - LocalPlayer *player = env->getLocalPlayer(); - assert(player); - - v3f playerpos = player->getPosition(); - v2f playerpos_2d(playerpos.X,playerpos.Z); - v2f objectpos_2d(m_position.X,m_position.Z); - - if(fabs(m_position.Y - playerpos.Y) < m_player_hit_distance*BS && - objectpos_2d.getDistanceFrom(playerpos_2d) < m_player_hit_distance*BS) - { - env->damageLocalPlayer(m_player_hit_damage); - m_player_hit_timer = m_player_hit_interval; - } + catch(SerializationError &e) + { + m_infotext = "Unknown item: '" + m_itemstring + "'"; } +} - /* Run timers */ - - m_player_hit_timer -= dtime; +void ItemCAO::updateTexture() +{ + if(m_node == NULL) + return; - if(m_damage_visual_timer >= 0){ - m_damage_visual_timer -= dtime; - if(m_damage_visual_timer <= 0){ - infostream<<"id="<idef(); + ItemStack item; + item.deSerialize(is, idef); + texture = item.getDefinition(idef).inventory_texture; } - - m_walking_unset_timer += dtime; - if(m_walking_unset_timer >= 1.0){ - m_walking = false; + catch(SerializationError &e) + { + infostream<<"WARNING: "<<__FUNCTION_NAME + <<": error deSerializing itemstring \"" + <getMaterial(0).setTexture(0, texture); +} - m_shooting_unset_timer -= dtime; - if(m_shooting_unset_timer <= 0.0){ - if(m_bright_shooting){ - u8 li = decode_light(m_last_light); - video::SColor color(255,li,li,li); - bill->setColor(color); - m_bright_shooting = false; - } - m_shooting = false; - } +void ItemCAO::step(float dtime, ClientEnvironment *env) +{ + if(m_node) + { + /*v3f rot = m_node->getRotation(); + rot.Y += dtime * 120; + m_node->setRotation(rot);*/ + LocalPlayer *player = env->getLocalPlayer(); + assert(player); + v3f rot = m_node->getRotation(); + rot.Y = 180.0 - (player->getYaw()); + m_node->setRotation(rot); + } } -void MobV2CAO::processMessage(const std::string &data) +void ItemCAO::processMessage(const std::string &data) { - //infostream<<"MobV2CAO: Got message"<= 100) - li = 30; - else - li = 255;*/ - - /*video::SColor color(255,255,0,0); - m_node->setColor(color); - - m_damage_visual_timer = 0.2;*/ - } - // Trigger shooting - else if(cmd == 2) + if(cmd == 1) { - // length - m_shooting_unset_timer = readF1000(is); - // bright? - m_bright_shooting = readU8(is); - if(m_bright_shooting){ - u8 li = 255; - video::SColor color(255,li,li,li); - m_node->setColor(color); - } - - m_shooting = true; + // itemstring + m_itemstring = deSerializeString(is); + updateInfoText(); + updateTexture(); } } -void MobV2CAO::initialize(const std::string &data) +void ItemCAO::initialize(const std::string &data) { - //infostream<<"MobV2CAO: Got init data"<parseConfigLines(tmp_is, "MobArgsEnd"); - - infostream<<"MobV2CAO::initialize(): got properties:"<writeLines(infostream); - - m_properties->setDefault("looks", "dummy_default"); - m_properties->setDefault("yaw", "0"); - m_properties->setDefault("pos", "(0,0,0)"); - m_properties->setDefault("player_hit_damage", "0"); - m_properties->setDefault("player_hit_distance", "1.5"); - m_properties->setDefault("player_hit_interval", "1.5"); - - setLooks(m_properties->get("looks")); - m_yaw = m_properties->getFloat("yaw"); - m_position = m_properties->getV3F("pos"); - m_player_hit_damage = m_properties->getS32("player_hit_damage"); - m_player_hit_distance = m_properties->getFloat("player_hit_distance"); - m_player_hit_interval = m_properties->getFloat("player_hit_interval"); - - pos_translator.init(m_position); + // pos + m_position = readV3F1000(is); + // itemstring + m_itemstring = deSerializeString(is); } updateNodePos(); -} - -bool MobV2CAO::directReportPunch(const std::string &toolname, v3f dir) -{ - video::SColor color(255,255,0,0); - m_node->setColor(color); - - m_damage_visual_timer = 0.05; - - m_position += dir * BS; - pos_translator.sharpen(); - pos_translator.update(m_position); - updateNodePos(); - - return false; -} - -void MobV2CAO::setLooks(const std::string &looks) -{ - v2f selection_size = v2f(0.4, 0.4) * BS; - float selection_y = 0 * BS; - - if(looks == "dungeon_master"){ - m_texture_name = "dungeon_master.png"; - m_sprite_type = "humanoid_1"; - m_sprite_size = v2f(2, 3) * BS; - m_sprite_y = 0.85 * BS; - selection_size = v2f(0.4, 2.6) * BS; - selection_y = -0.4 * BS; - } - else if(looks == "fireball"){ - m_texture_name = "fireball.png"; - m_sprite_type = "simple"; - m_sprite_size = v2f(1, 1) * BS; - m_simple_anim_frames = 3; - m_simple_anim_frametime = 0.1; - m_lock_full_brightness = true; - } - else{ - m_texture_name = "stone.png"; - m_sprite_type = "simple"; - m_sprite_size = v2f(1, 1) * BS; - m_simple_anim_frames = 3; - m_simple_anim_frametime = 0.333; - selection_size = v2f(0.4, 0.4) * BS; - selection_y = 0 * BS; - } - - m_selection_box = core::aabbox3d( - -selection_size.X, selection_y, -selection_size.X, - selection_size.X, selection_y+selection_size.Y, - selection_size.X); + updateInfoText(); } /* @@ -1691,6 +545,7 @@ class LuaEntityCAO : public ClientActiveObject v3f m_velocity; v3f m_acceleration; float m_yaw; + s16 m_hp; struct LuaEntityProperties *m_prop; SmoothTranslator pos_translator; // Spritesheet/animation stuff @@ -1701,6 +556,8 @@ class LuaEntityCAO : public ClientActiveObject int m_anim_num_frames; float m_anim_framelength; float m_anim_timer; + ItemGroupList m_armor_groups; + float m_reset_textures_timer; public: LuaEntityCAO(IGameDef *gamedef, ClientEnvironment *env): @@ -1712,6 +569,7 @@ class LuaEntityCAO : public ClientActiveObject m_velocity(v3f(0,0,0)), m_acceleration(v3f(0,0,0)), m_yaw(0), + m_hp(1), m_prop(new LuaEntityProperties), m_tx_size(1,1), m_tx_basepos(0,0), @@ -1719,7 +577,8 @@ class LuaEntityCAO : public ClientActiveObject m_anim_frame(0), m_anim_num_frames(1), m_anim_framelength(0.2), - m_anim_timer(0) + m_anim_timer(0), + m_reset_textures_timer(-1) { if(gamedef == NULL) ClientActiveObject::registerType(getType(), create); @@ -1733,12 +592,14 @@ class LuaEntityCAO : public ClientActiveObject // version u8 version = readU8(is); // check version - if(version != 0) + if(version != 1) return; // pos m_position = readV3F1000(is); // yaw m_yaw = readF1000(is); + // hp + m_hp = readS16(is); // properties std::istringstream prop_is(deSerializeLongString(is), std::ios::binary); m_prop->deSerialize(prop_is); @@ -1907,6 +768,14 @@ class LuaEntityCAO : public ClientActiveObject } updateTexturePos(); + + if(m_reset_textures_timer >= 0){ + m_reset_textures_timer -= dtime; + if(m_reset_textures_timer <= 0){ + m_reset_textures_timer = -1; + updateTextures(""); + } + } } void updateTexturePos() @@ -2000,7 +869,7 @@ class LuaEntityCAO : public ClientActiveObject std::istringstream is(data, std::ios::binary); // command u8 cmd = readU8(is); - if(cmd == 0) // update position + if(cmd == LUAENTITY_CMD_UPDATE_POSITION) // update position { // do_interpolate bool do_interpolate = readU8(is); @@ -2025,12 +894,12 @@ class LuaEntityCAO : public ClientActiveObject } updateNodePos(); } - else if(cmd == 1) // set texture modification + else if(cmd == LUAENTITY_CMD_SET_TEXTURE_MOD) // set texture modification { std::string mod = deSerializeString(is); updateTextures(mod); } - else if(cmd == 2) // set sprite + else if(cmd == LUAENTITY_CMD_SET_SPRITE) // set sprite { v2s16 p = readV2S16(is); int num_frames = readU16(is); @@ -2044,6 +913,64 @@ class LuaEntityCAO : public ClientActiveObject updateTexturePos(); } + else if(cmd == LUAENTITY_CMD_PUNCHED) + { + /*s16 damage =*/ readS16(is); + s16 result_hp = readS16(is); + + m_hp = result_hp; + // TODO: Execute defined fast response + } + else if(cmd == LUAENTITY_CMD_UPDATE_ARMOR_GROUPS) + { + m_armor_groups.clear(); + int armor_groups_size = readU16(is); + for(int i=0; igetToolCapabilities(m_gamedef->idef()); + PunchDamageResult result = getPunchDamage( + m_armor_groups, + toolcap, + punchitem, + time_from_last_punch); + + if(result.did_punch && result.damage != 0) + { + if(result.damage < m_hp) + m_hp -= result.damage; + else + m_hp = 0; + // TODO: Execute defined fast response + // I guess flashing is fine as of now + updateTextures("^[brighten"); + m_reset_textures_timer = 0.1; + } + + return false; + } + + std::string debugInfoText() + { + std::ostringstream os(std::ios::binary); + os<<"LuaEntityCAO hp="<first<<"="<second<<", "; + } + os<<"}"; + return os.str(); } }; @@ -2067,6 +994,7 @@ class PlayerCAO : public ClientActiveObject bool m_is_local_player; LocalPlayer *m_local_player; float m_damage_visual_timer; + bool m_dead; public: PlayerCAO(IGameDef *gamedef, ClientEnvironment *env): @@ -2078,7 +1006,8 @@ class PlayerCAO : public ClientActiveObject m_yaw(0), m_is_local_player(false), m_local_player(NULL), - m_damage_visual_timer(0) + m_damage_visual_timer(0), + m_dead(false) { if(gamedef == NULL) ClientActiveObject::registerType(getType(), create); @@ -2100,6 +1029,8 @@ class PlayerCAO : public ClientActiveObject m_position = readV3F1000(is); // yaw m_yaw = readF1000(is); + // dead + m_dead = readU8(is); pos_translator.init(m_position); @@ -2129,6 +1060,8 @@ class PlayerCAO : public ClientActiveObject { if(m_is_local_player) return NULL; + if(m_dead) + return NULL; return &m_selection_box; } v3f getPosition() @@ -2204,6 +1137,7 @@ class PlayerCAO : public ClientActiveObject m_text->setPosition(v3f(0, (f32)BS*2.1, 0)); updateTextures(""); + updateVisibility(); updateNodePos(); } @@ -2221,11 +1155,11 @@ class PlayerCAO : public ClientActiveObject if(m_node == NULL) return; - m_node->setVisible(true); - u8 li = decode_light(light_at_pos); video::SColor color(255,li,li,li); setMeshColor(m_node->getMesh(), color); + + updateVisibility(); } v3s16 getLightPosition() @@ -2233,6 +1167,14 @@ class PlayerCAO : public ClientActiveObject return floatToInt(m_position+v3f(0,BS*1.5,0), BS); } + void updateVisibility() + { + if(m_node == NULL) + return; + + m_node->setVisible(!m_dead); + } + void updateNodePos() { if(m_node == NULL) @@ -2248,6 +1190,7 @@ class PlayerCAO : public ClientActiveObject void step(float dtime, ClientEnvironment *env) { pos_translator.translate(dtime); + updateVisibility(); updateNodePos(); if(m_damage_visual_timer > 0){ @@ -2279,13 +1222,16 @@ class PlayerCAO : public ClientActiveObject { // damage s16 damage = readS16(is); - - if(m_is_local_player) - m_env->damageLocalPlayer(damage, false); - - m_damage_visual_timer = 0.5; + m_damage_visual_timer = 0.05; + if(damage >= 2) + m_damage_visual_timer += 0.05 * damage; updateTextures("^[brighten"); } + else if(cmd == 2) // died or respawned + { + m_dead = readU8(is); + updateVisibility(); + } } void updateTextures(const std::string &mod)