Skip to content

Fix setting mesh blend shape properties in dummy mesh storage #114356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nikitalita wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −4
Open

Fix setting mesh blend shape properties in dummy mesh storage #114356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions servers/rendering/dummy/storage/mesh_storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ class MeshStorage : public RendererMeshStorage {
virtual void mesh_initialize(RID p_rid) override;
virtual void mesh_free(RID p_rid) override;

virtual void mesh_set_blend_shape_count(RID p_mesh, int p_blend_shape_count) override {}
virtual void mesh_set_blend_shape_count(RID p_mesh, int p_blend_shape_count) override {
DummyMesh *m = mesh_owner.get_or_null(p_mesh);
ERR_FAIL_NULL(m);
m->blend_shape_count = p_blend_shape_count;
}
virtual bool mesh_needs_instance(RID p_mesh, bool p_has_skeleton) override { return false; }

virtual void mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface) override {
Expand All @@ -95,10 +99,23 @@ class MeshStorage : public RendererMeshStorage {
m->dependency.changed_notify(Dependency::DEPENDENCY_CHANGED_MESH);
}

virtual int mesh_get_blend_shape_count(RID p_mesh) const override { return 0; }
virtual int mesh_get_blend_shape_count(RID p_mesh) const override {
DummyMesh *m = mesh_owner.get_or_null(p_mesh);
ERR_FAIL_NULL_V(m, 0);
return m->blend_shape_count;
}

virtual void mesh_set_blend_shape_mode(RID p_mesh, RS::BlendShapeMode p_mode) override {
DummyMesh *m = mesh_owner.get_or_null(p_mesh);
ERR_FAIL_NULL(m);
m->blend_shape_mode = p_mode;
}

virtual void mesh_set_blend_shape_mode(RID p_mesh, RS::BlendShapeMode p_mode) override {}
virtual RS::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const override { return RS::BLEND_SHAPE_MODE_NORMALIZED; }
virtual RS::BlendShapeMode mesh_get_blend_shape_mode(RID p_mesh) const override {
DummyMesh *m = mesh_owner.get_or_null(p_mesh);
ERR_FAIL_NULL_V(m, RS::BLEND_SHAPE_MODE_NORMALIZED);
return m->blend_shape_mode;
}

virtual void mesh_surface_update_vertex_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) override {}
virtual void mesh_surface_update_attribute_region(RID p_mesh, int p_surface, int p_offset, const Vector<uint8_t> &p_data) override {}
Expand Down