Performance improvement: Use std::list instead of std::vector for request_media,...

[oweals/minetest.git] / src / genericobject.cpp

diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 563b7f7f12652b4f04a7d0522e9d68d15070d41c..9a1b9d8d0dc657b109220b3d2a2d5877cce5277d 100644 (file)
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -1,67 +1,38 @@
 /*
-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 "genericobject.h"
-#include "utility.h"
 #include <sstream>
+#include "util/serialize.h"
 
 std::string gob_cmd_set_properties(const ObjectProperties &prop)
 {
        std::ostringstream os(std::ios::binary);
        writeU8(os, GENERIC_CMD_SET_PROPERTIES);
-       writeS16(os, prop.hp_max);
-       writeU8(os, prop.physical);
-       writeF1000(os, prop.weight);
-       writeV3F1000(os, prop.collisionbox.MinEdge);
-       writeV3F1000(os, prop.collisionbox.MaxEdge);
-       os<<serializeString(prop.visual);
-       writeV2F1000(os, prop.visual_size);
-       writeU16(os, prop.textures.size());
-       for(u32 i=0; i<prop.textures.size(); i++){
-               os<<serializeString(prop.textures[i]);
-       }
-       writeV2S16(os, prop.spritediv);
-       writeV2S16(os, prop.initial_sprite_basepos);
-       writeU8(os, prop.is_visible);
-       writeU8(os, prop.makes_footstep_sound);
+       prop.serialize(os);
        return os.str();
 }
 
 ObjectProperties gob_read_set_properties(std::istream &is)
 {
        ObjectProperties prop;
-       prop.hp_max = readS16(is);
-       prop.physical = readU8(is);
-       prop.weight = readF1000(is);
-       prop.collisionbox.MinEdge = readV3F1000(is);
-       prop.collisionbox.MaxEdge = readV3F1000(is);
-       prop.visual = deSerializeString(is);
-       prop.visual_size = readV2F1000(is);
-       prop.textures.clear();
-       u32 texture_count = readU16(is);
-       for(u32 i=0; i<texture_count; i++){
-               prop.textures.push_back(deSerializeString(is));
-       }
-       prop.spritediv = readV2S16(is);
-       prop.initial_sprite_basepos = readV2S16(is);
-       prop.is_visible = readU8(is);
-       prop.makes_footstep_sound = readU8(is);
+       prop.deSerialize(is);
        return prop;
 }
 
@@ -146,4 +117,56 @@ std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups)
        return os.str();
 }
 
+std::string gob_cmd_update_physics_override(float physics_override_speed, float physics_override_jump,
+               float physics_override_gravity, bool sneak, bool sneak_glitch)
+{
+       std::ostringstream os(std::ios::binary);
+       // command 
+       writeU8(os, GENERIC_CMD_SET_PHYSICS_OVERRIDE);
+       // parameters
+       writeF1000(os, physics_override_speed);
+       writeF1000(os, physics_override_jump);
+       writeF1000(os, physics_override_gravity);
+       // these are sent inverted so we get true when the server sends nothing
+       writeU8(os, !sneak);
+       writeU8(os, !sneak_glitch);
+       return os.str();
+}
+
+std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend)
+{
+       std::ostringstream os(std::ios::binary);
+       // command 
+       writeU8(os, GENERIC_CMD_SET_ANIMATION);
+       // parameters
+       writeV2F1000(os, frames);
+       writeF1000(os, frame_speed);
+       writeF1000(os, frame_blend);
+       return os.str();
+}
+
+std::string gob_cmd_update_bone_position(std::string bone, v3f position, v3f rotation)
+{
+       std::ostringstream os(std::ios::binary);
+       // command 
+       writeU8(os, GENERIC_CMD_SET_BONE_POSITION);
+       // parameters
+       os<<serializeString(bone);
+       writeV3F1000(os, position);
+       writeV3F1000(os, rotation);
+       return os.str();
+}
+
+std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f position, v3f rotation)
+{
+       std::ostringstream os(std::ios::binary);
+       // command 
+       writeU8(os, GENERIC_CMD_SET_ATTACHMENT);
+       // parameters
+       writeS16(os, parent_id);
+       os<<serializeString(bone);
+       writeV3F1000(os, position);
+       writeV3F1000(os, rotation);
+       return os.str();
+}