aboutsummaryrefslogtreecommitdiff
path: root/scene/3d/mesh_instance.h
diff options
context:
space:
mode:
authormarynate2014-05-13 13:24:26 +0800
committermarynate2014-05-13 13:25:24 +0800
commit7eb86f2fbc8e75f76473dd6a0869611cf5c0cfb6 (patch)
tree203fbed40cd9a4875127c309e7240f4dbbb5d012 /scene/3d/mesh_instance.h
parent45a509282e912d85c46b40974a2deb926be5be42 (diff)
downloadgodot-7eb86f2fbc8e75f76473dd6a0869611cf5c0cfb6.tar.gz
godot-7eb86f2fbc8e75f76473dd6a0869611cf5c0cfb6.tar.zst
godot-7eb86f2fbc8e75f76473dd6a0869611cf5c0cfb6.zip
Add 'mesh/skeleton' property to MeshInstance to decouple mesh->skeleton from child parent constraint
Diffstat (limited to 'scene/3d/mesh_instance.h')
-rw-r--r--scene/3d/mesh_instance.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h
index 0e0710950..1b97564b4 100644
--- a/scene/3d/mesh_instance.h
+++ b/scene/3d/mesh_instance.h
@@ -40,6 +40,7 @@ class MeshInstance : public GeometryInstance {
OBJ_TYPE( MeshInstance, GeometryInstance );
Ref<Mesh> mesh;
+ NodePath skeleton_path;
struct MorphTrack {
@@ -50,6 +51,7 @@ class MeshInstance : public GeometryInstance {
Map<StringName,MorphTrack> morph_tracks;
+ void _resolve_skeleton_path();
protected:
@@ -57,12 +59,15 @@ protected:
bool _get(const StringName& p_name,Variant &r_ret) const;
void _get_property_list( List<PropertyInfo> *p_list) const;
-
+ void _notification(int p_what);
static void _bind_methods();
public:
void set_mesh(const Ref<Mesh>& p_mesh);
Ref<Mesh> get_mesh() const;
+
+ void set_skeleton_path(const NodePath& p_skeleton);
+ NodePath get_skeleton_path();
Node* create_trimesh_collision_node();
void create_trimesh_collision();