X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fobject_properties.cpp;h=f560f59343a6d6507e6993d8b2aaacb43c84b2af;hb=58e6d25e033c76dc91aaac18fdeda92ac23fe0e1;hp=08e9f63cf71c47c2636b047890681a0e9a5f5878;hpb=b22168d3da597d61c40cc93dd690ba143fd5e4cc;p=oweals%2Fminetest.git

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index 08e9f63cf..f560f5934 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -1,24 +1,27 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "object_properties.h"
-#include "utility.h"
+#include "irrlichttypes_bloated.h"
+#include "exceptions.h"
+#include "util/serialize.h"
+#include <sstream>
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 #define PP2(x) "("<<(x).X<<","<<(x).Y<<")"
@@ -26,17 +29,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 ObjectProperties::ObjectProperties():
 	hp_max(1),
 	physical(false),
+	collideWithObjects(true),
 	weight(5),
 	collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5),
 	visual("sprite"),
+	mesh(""),
 	visual_size(1,1),
 	spritediv(1,1),
 	initial_sprite_basepos(0,0),
 	is_visible(true),
 	makes_footstep_sound(false),
-	automatic_rotate(0)
+	automatic_rotate(0),
+	stepheight(0),
+	automatic_face_movement_dir(false),
+	automatic_face_movement_dir_offset(0.0)
 {
 	textures.push_back("unknown_object.png");
+	colors.push_back(video::SColor(255,255,255,255));
 }
 
 std::string ObjectProperties::dump()
@@ -44,15 +53,22 @@ std::string ObjectProperties::dump()
 	std::ostringstream os(std::ios::binary);
 	os<<"hp_max="<<hp_max;
 	os<<", physical="<<physical;
+	os<<", collideWithObjects="<<collideWithObjects;
 	os<<", weight="<<weight;
 	os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge);
 	os<<", visual="<<visual;
+	os<<", mesh="<<mesh;
 	os<<", visual_size="<<PP2(visual_size);
 	os<<", textures=[";
 	for(u32 i=0; i<textures.size(); i++){
 		os<<"\""<<textures[i]<<"\" ";
 	}
 	os<<"]";
+	os<<", colors=[";
+	for(u32 i=0; i<colors.size(); i++){
+		os<<"\""<<colors[i].getAlpha()<<","<<colors[i].getRed()<<","<<colors[i].getGreen()<<","<<colors[i].getBlue()<<"\" ";
+	}
+	os<<"]";
 	os<<", spritediv="<<PP2(spritediv);
 	os<<", initial_sprite_basepos="<<PP2(initial_sprite_basepos);
 	os<<", is_visible="<<is_visible;
@@ -80,32 +96,57 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeU8(os, is_visible);
 	writeU8(os, makes_footstep_sound);
 	writeF1000(os, automatic_rotate);
+	// Added in protocol version 14
+	os<<serializeString(mesh);
+	writeU16(os, colors.size());
+	for(u32 i=0; i<colors.size(); i++){
+		writeARGB8(os, colors[i]);
+	}
+	writeU8(os, collideWithObjects);
+	writeF1000(os,stepheight);
+	writeU8(os, automatic_face_movement_dir);
+	writeF1000(os, automatic_face_movement_dir_offset);
+	// Add stuff only at the bottom.
+	// Never remove anything, because we don't want new versions of this
 }
 
 void ObjectProperties::deSerialize(std::istream &is)
 {
 	int version = readU8(is);
-	if(version != 1) throw SerializationError(
-			"unsupported ObjectProperties version");
-	hp_max = readS16(is);
-	physical = readU8(is);
-	weight = readF1000(is);
-	collisionbox.MinEdge = readV3F1000(is);
-	collisionbox.MaxEdge = readV3F1000(is);
-	visual = deSerializeString(is);
-	visual_size = readV2F1000(is);
-	textures.clear();
-	u32 texture_count = readU16(is);
-	for(u32 i=0; i<texture_count; i++){
-		textures.push_back(deSerializeString(is));
+	if(version == 1)
+	{
+		try{
+			hp_max = readS16(is);
+			physical = readU8(is);
+			weight = readF1000(is);
+			collisionbox.MinEdge = readV3F1000(is);
+			collisionbox.MaxEdge = readV3F1000(is);
+			visual = deSerializeString(is);
+			visual_size = readV2F1000(is);
+			textures.clear();
+			u32 texture_count = readU16(is);
+			for(u32 i=0; i<texture_count; i++){
+				textures.push_back(deSerializeString(is));
+			}
+			spritediv = readV2S16(is);
+			initial_sprite_basepos = readV2S16(is);
+			is_visible = readU8(is);
+			makes_footstep_sound = readU8(is);
+			automatic_rotate = readF1000(is);
+			mesh = deSerializeString(is);
+			u32 color_count = readU16(is);
+			for(u32 i=0; i<color_count; i++){
+				colors.push_back(readARGB8(is));
+			}
+			collideWithObjects = readU8(is);
+			stepheight = readF1000(is);
+			automatic_face_movement_dir = readU8(is);
+			automatic_face_movement_dir_offset = readF1000(is);
+		}catch(SerializationError &e){}
+	}
+	else
+	{
+		throw SerializationError("unsupported ObjectProperties version");
 	}
-	spritediv = readV2S16(is);
-	initial_sprite_basepos = readV2S16(is);
-	is_visible = readU8(is);
-	makes_footstep_sound = readU8(is);
-	try{
-		automatic_rotate = readF1000(is);
-	}catch(SerializationError &e){}
 }
 
-