Permalink
Browse files

3D model support for players using Irrlicht. Also ready the basis for…

… mesh support on nodes / items via LUA (to be done). Supports any mesh format compatible with Irrlicht, but animations are not set up yet.
  • Loading branch information...
MirceaKitsune authored and celeron55 committed Oct 22, 2012
1 parent e02b957 commit ac97a7f70eefd4b8065e006c634a0a5baf236b62
Showing with 51 additions and 3 deletions.
  1. +45 −2 src/content_cao.cpp
  2. +4 −1 src/content_sao.cpp
  3. +2 −0 src/object_properties.h
View
@@ -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 @@ class GenericCAO : public ClientActiveObject
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 @@ class GenericCAO : public ClientActiveObject
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 @@ class GenericCAO : public ClientActiveObject
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 @@ class GenericCAO : public ClientActiveObject
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 @@ class GenericCAO : public ClientActiveObject
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 @@ class GenericCAO : public ClientActiveObject
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 @@ class GenericCAO : public ClientActiveObject
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 @@ class GenericCAO : public ClientActiveObject
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 @@ class GenericCAO : public ClientActiveObject
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")
View
@@ -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);
View
@@ -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;

0 comments on commit ac97a7f

Please sign in to comment.