summaryrefslogtreecommitdiff
path: root/src/content_sao.h
diff options
context:
space:
mode:
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>2012-11-04 14:33:30 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-11-25 19:14:23 +0200
commitd7d759b43f99c999fedd9376edbf5f4e1384dafa (patch)
treef13d9225d632d60bfcc18737d15f02901feace13 /src/content_sao.h
parentba3fd63e29252987d4904ec3c120bce4b6758160 (diff)
downloadminetest-d7d759b43f99c999fedd9376edbf5f4e1384dafa.tar.gz
minetest-d7d759b43f99c999fedd9376edbf5f4e1384dafa.tar.bz2
minetest-d7d759b43f99c999fedd9376edbf5f4e1384dafa.zip
Enable client-side attachments, add detachment code
Diffstat (limited to 'src/content_sao.h')
-rw-r--r--src/content_sao.h33
1 files changed, 32 insertions, 1 deletions
diff --git a/src/content_sao.h b/src/content_sao.h
index e4d81cd2d..5bcd3c77f 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -99,7 +99,21 @@ private:
float m_last_sent_position_timer;
float m_last_sent_move_precision;
bool m_armor_groups_sent;
+
+ v2f m_animation_frames;
+ float m_animation_speed;
+ float m_animation_blend;
+ bool m_animations_sent;
+
+ std::map<std::string, core::vector2d<v3f> > m_animation_bone;
+ bool m_animations_bone_sent;
+
ServerActiveObject *m_parent;
+ int m_attachment_parent_id;
+ std::string m_attachment_bone;
+ v3f m_attachment_position;
+ v3f m_attachment_rotation;
+ bool m_attachment_sent;
};
/*
@@ -236,13 +250,30 @@ private:
bool m_position_not_sent;
ItemGroupList m_armor_groups;
bool m_armor_groups_sent;
- ServerActiveObject *m_parent;
+
+
+
bool m_properties_sent;
struct ObjectProperties m_prop;
// Cached privileges for enforcement
std::set<std::string> m_privs;
bool m_is_singleplayer;
+ v2f m_animation_frames;
+ float m_animation_speed;
+ float m_animation_blend;
+ bool m_animations_sent;
+
+ std::map<std::string, core::vector2d<v3f> > m_animation_bone;
+ bool m_animations_bone_sent;
+
+ ServerActiveObject *m_parent;
+ int m_attachment_parent_id;
+ std::string m_attachment_bone;
+ v3f m_attachment_position;
+ v3f m_attachment_rotation;
+ bool m_attachment_sent;
+
public:
// Some flags used by Server
bool m_teleported;