diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-23 15:02:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 15:02:15 +0200 |
| commit | 159470df08c0283a2330af94d26ccbe3d009d8fd (patch) | |
| tree | cea94427a7a53188858fc9d83dca55fc0511880d /scene/3d/mesh_instance.h | |
| parent | 30e16fff57cfdeb79f8e9ee6a7516e7d7cd6d376 (diff) | |
| parent | 36b5795f47c9a706e1d8c12a932de1fe2bb9893f (diff) | |
Merge pull request #32275 from godotengine/skin_support
Added skin support and simplified APIs to override bone position + glTF 2.0 import fixes
Diffstat (limited to 'scene/3d/mesh_instance.h')
| -rw-r--r-- | scene/3d/mesh_instance.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h index 8b690b0c21..77ead75dd3 100644 --- a/scene/3d/mesh_instance.h +++ b/scene/3d/mesh_instance.h @@ -31,8 +31,10 @@ #ifndef MESH_INSTANCE_H #define MESH_INSTANCE_H +#include "scene/3d/skeleton.h" #include "scene/3d/visual_instance.h" #include "scene/resources/mesh.h" +#include "scene/resources/skin.h" class MeshInstance : public GeometryInstance { @@ -40,6 +42,8 @@ class MeshInstance : public GeometryInstance { protected: Ref<Mesh> mesh; + Ref<Skin> skin; + Ref<SkinReference> skin_ref; NodePath skeleton_path; struct BlendShapeTrack { @@ -70,6 +74,9 @@ public: void set_mesh(const Ref<Mesh> &p_mesh); Ref<Mesh> get_mesh() const; + void set_skin(const Ref<Skin> &p_skin); + Ref<Skin> get_skin() const; + void set_skeleton_path(const NodePath &p_skeleton); NodePath get_skeleton_path(); |