diff options
| -rw-r--r-- | src/content_cao.cpp | 47 | ||||
| -rw-r--r-- | src/content_sao.cpp | 5 | ||||
| -rw-r--r-- | src/object_properties.h | 2 |
3 files changed, 51 insertions, 3 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp index cb14cf395..e177fa15c 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -41,6 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/mathconstants.h" #include "map.h" #include <IMeshManipulator.h> +#include <IAnimatedMeshSceneNode.h> class Settings; struct ToolCapabilities; @@ -560,6 +561,7 @@ private: IrrlichtDevice *m_irr; core::aabbox3d<f32> m_selection_box; scene::IMeshSceneNode *m_meshnode; + scene::IAnimatedMeshSceneNode *m_animated_meshnode; scene::IBillboardSceneNode *m_spritenode; scene::ITextSceneNode* m_textnode; v3f m_position; @@ -594,6 +596,7 @@ public: m_irr(NULL), m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.), m_meshnode(NULL), + m_animated_meshnode(NULL), m_spritenode(NULL), m_textnode(NULL), m_position(v3f(0,10*BS,0)), @@ -683,6 +686,10 @@ public: m_meshnode->remove(); m_meshnode = NULL; } + if(m_animated_meshnode){ + m_animated_meshnode->remove(); + m_animated_meshnode = NULL; + } if(m_spritenode){ m_spritenode->remove(); m_spritenode = NULL; @@ -695,7 +702,7 @@ public: m_smgr = smgr; m_irr = irr; - if(m_meshnode != NULL || m_spritenode != NULL) + if(m_meshnode != NULL || m_animated_meshnode != NULL || m_spritenode != NULL) return; m_visuals_expired = false; @@ -791,7 +798,20 @@ public: m_prop.visual_size.X)); u8 li = m_last_light; setMeshColor(m_meshnode->getMesh(), video::SColor(255,li,li,li)); - } else if(m_prop.visual == "wielditem"){ + } + else if(m_prop.visual == "mesh"){ + infostream<<"GenericCAO::addToScene(): mesh"<<std::endl; + scene::IAnimatedMesh *mesh = smgr->getMesh(m_prop.mesh.c_str()); + m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL); + mesh->drop(); + + m_animated_meshnode->setScale(v3f(m_prop.visual_size.X, + m_prop.visual_size.Y, + m_prop.visual_size.X)); + u8 li = m_last_light; + setMeshColor(m_animated_meshnode->getMesh(), video::SColor(255,li,li,li)); + } + else if(m_prop.visual == "wielditem"){ infostream<<"GenericCAO::addToScene(): node"<<std::endl; infostream<<"textures: "<<m_prop.textures.size()<<std::endl; if(m_prop.textures.size() >= 1){ @@ -823,6 +843,8 @@ public: scene::ISceneNode *node = NULL; if(m_spritenode) node = m_spritenode; + else if(m_animated_meshnode) + node = m_animated_meshnode; else if(m_meshnode) node = m_meshnode; if(node && m_is_player && !m_is_local_player){ @@ -853,6 +875,10 @@ public: setMeshColor(m_meshnode->getMesh(), color); m_meshnode->setVisible(is_visible); } + if(m_animated_meshnode){ + setMeshColor(m_animated_meshnode->getMesh(), color); + m_animated_meshnode->setVisible(is_visible); + } if(m_spritenode){ m_spritenode->setColor(color); m_spritenode->setVisible(is_visible); @@ -873,6 +899,12 @@ public: rot.Y = -m_yaw; m_meshnode->setRotation(rot); } + if(m_animated_meshnode){ + m_animated_meshnode->setPosition(pos_translator.vect_show); + v3f rot = m_animated_meshnode->getRotation(); + rot.Y = -m_yaw; + m_animated_meshnode->setRotation(rot); + } if(m_spritenode){ m_spritenode->setPosition(pos_translator.vect_show); } @@ -1020,6 +1052,17 @@ public: tsrc->getTextureRaw(texturestring)); } } + if(m_animated_meshnode) + { + if(m_prop.visual == "mesh") + { + // fallback texture + if(m_prop.texture == "") + m_prop.texture = "unknown_block.png"; + video::IVideoDriver* driver = m_animated_meshnode->getSceneManager()->getVideoDriver(); + m_animated_meshnode->setMaterialTexture(0, driver->getTexture(m_prop.texture.c_str())); + } + } if(m_meshnode) { if(m_prop.visual == "cube") diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 7526e0353..a372b986f 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -782,12 +782,14 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_, m_prop.physical = false; m_prop.weight = 75; m_prop.collisionbox = core::aabbox3d<f32>(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.); - m_prop.visual = "upright_sprite"; + // start of default appearance, this should be overwritten by LUA + m_prop.visual = "upright-sprite"; m_prop.visual_size = v2f(1, 2); m_prop.textures.clear(); m_prop.textures.push_back("player.png"); m_prop.textures.push_back("player_back.png"); m_prop.spritediv = v2s16(1,1); + // end of default appearance m_prop.is_visible = (getHP() != 0); m_prop.makes_footstep_sound = true; } @@ -1136,6 +1138,7 @@ void PlayerSAO::disconnected() } } + std::string PlayerSAO::getPropertyPacket() { m_prop.is_visible = (getHP() != 0); diff --git a/src/object_properties.h b/src/object_properties.h index 3f44771e9..f60ecefa4 100644 --- a/src/object_properties.h +++ b/src/object_properties.h @@ -32,6 +32,8 @@ struct ObjectProperties float weight; core::aabbox3d<f32> collisionbox; std::string visual; + std::string mesh; + std::string texture; v2f visual_size; core::array<std::string> textures; v2s16 spritediv; |