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 /editor/plugins | |
| 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 'editor/plugins')
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 728b67f6fa..aa61f4bae1 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -58,6 +58,7 @@ public: RID instance; Ref<ArrayMesh> mesh; Ref<Material> material; + Ref<SkinReference> skin_reference; RID skeleton; bool billboard; bool unscaled; @@ -101,7 +102,7 @@ protected: public: void add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material, bool p_billboard = false); - void add_mesh(const Ref<ArrayMesh> &p_mesh, bool p_billboard = false, const RID &p_skeleton = RID(), const Ref<Material> &p_material = Ref<Material>()); + void add_mesh(const Ref<ArrayMesh> &p_mesh, bool p_billboard = false, const Ref<SkinReference> &p_skin_reference = Ref<SkinReference>(), const Ref<Material> &p_material = Ref<Material>()); void add_collision_segments(const Vector<Vector3> &p_lines); void add_collision_triangles(const Ref<TriangleMesh> &p_tmesh); void add_unscaled_billboard(const Ref<Material> &p_material, float p_scale = 1); |