implemented rats in new system to verify that it works

1 files changed, 170 insertions, 19 deletions

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index 901b3d072..1d9dd215b 100644
--- a/src/clientobject.cpp
+++ b/src/clientobject.cpp
@@ -24,6 +24,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "utility.h"
 #include "environment.h"
 
+/*
+	ClientActiveObject
+*/
+
 core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
 
 ClientActiveObject::ClientActiveObject(u16 id):
@@ -231,8 +235,9 @@ void ItemCAO::addToScene(scene::ISceneManager *smgr)
 	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
 	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
 	//buf->getMaterial().setTexture(0, NULL);
+	// Initialize with the stick texture
 	buf->getMaterial().setTexture
-			(0, driver->getTexture(porting::getDataPath("rat.png").c_str()));
+			(0, driver->getTexture(porting::getDataPath("stick.png").c_str()));
 	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
 	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
 	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
@@ -313,19 +318,12 @@ void ItemCAO::processMessage(const std::string &data)
 {
 	dstream<<"ItemCAO: Got message"<<std::endl;
 	std::istringstream is(data, std::ios::binary);
-	char buf[4];
 	// command
-	is.read(buf, 1);
-	u8 cmd = buf[0];
+	u8 cmd = readU8(is);
 	if(cmd == 0)
 	{
 		// pos
-		is.read(buf, 4);
-		m_position.X = (float)readS32((u8*)buf)/1000.0;
-		is.read(buf, 4);
-		m_position.Y = (float)readS32((u8*)buf)/1000.0;
-		is.read(buf, 4);
-		m_position.Z = (float)readS32((u8*)buf)/1000.0;
+		m_position = readV3F1000(is);
 		updateNodePos();
 	}
 }
@@ -336,20 +334,13 @@ void ItemCAO::initialize(const std::string &data)
 	
 	{
 		std::istringstream is(data, std::ios::binary);
-		char buf[4];
 		// version
-		is.read(buf, 1);
-		u8 version = buf[0];
+		u8 version = readU8(is);
 		// check version
 		if(version != 0)
 			return;
 		// pos
-		is.read(buf, 4);
-		m_position.X = (float)readS32((u8*)buf)/1000.0;
-		is.read(buf, 4);
-		m_position.Y = (float)readS32((u8*)buf)/1000.0;
-		is.read(buf, 4);
-		m_position.Z = (float)readS32((u8*)buf)/1000.0;
+		m_position = readV3F1000(is);
 		// inventorystring
 		m_inventorystring = deSerializeString(is);
 	}
@@ -400,4 +391,164 @@ void ItemCAO::initialize(const std::string &data)
 	
 }
 
+/*
+	RatCAO
+*/
+
+#include "inventory.h"
+
+// Prototype
+RatCAO proto_RatCAO;
+
+RatCAO::RatCAO():
+	ClientActiveObject(0),
+	m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS/2.,BS/3.),
+	m_node(NULL),
+	m_position(v3f(0,10*BS,0))
+{
+	ClientActiveObject::registerType(getType(), create);
+}
+
+RatCAO::~RatCAO()
+{
+}
+
+ClientActiveObject* RatCAO::create()
+{
+	return new RatCAO();
+}
+
+void RatCAO::addToScene(scene::ISceneManager *smgr)
+{
+	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,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, driver->getTexture(porting::getDataPath("rat.png").c_str()));
+	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);
+
+	scene::IMesh *mesh = m_node->getMesh();
+	if(mesh == NULL)
+		return;
+	
+	u16 mc = mesh->getMeshBufferCount();
+	for(u16 j=0; j<mc; j++)
+	{
+		scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
+		video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices();
+		u16 vc = buf->getVertexCount();
+		for(u16 i=0; i<vc; i++)
+		{
+			vertices[i].Color = color;
+		}
+	}
+}
+
+v3s16 RatCAO::getLightPosition()
+{
+	return floatToInt(m_position, 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)
+{
+	//dstream<<"RatCAO: Got message"<<std::endl;
+	std::istringstream is(data, std::ios::binary);
+	// command
+	u8 cmd = readU8(is);
+	if(cmd == 0)
+	{
+		// pos
+		m_position = readV3F1000(is);
+		pos_translator.update(m_position);
+		// yaw
+		m_yaw = readF1000(is);
+		updateNodePos();
+	}
+}
+
+void RatCAO::initialize(const std::string &data)
+{
+	//dstream<<"RatCAO: Got init data"<<std::endl;
+	
+	{
+		std::istringstream is(data, std::ios::binary);
+		// version
+		u8 version = readU8(is);
+		// check version
+		if(version != 0)
+			return;
+		// pos
+		m_position = readV3F1000(is);
+		pos_translator.init(m_position);
+	}
+	
+	updateNodePos();
+}
+