Skip to content

Commit

Permalink
Make set_blend_shape_value virtual
Browse files Browse the repository at this point in the history
  • Loading branch information
tefusion committed Sep 8, 2022
1 parent 6923309 commit b7950af
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
7 changes: 5 additions & 2 deletions scene/3d/mesh_instance_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,9 @@ void MeshInstance3D::set_blend_shape_value(int p_blend_shape, float p_value) {
ERR_FAIL_COND(mesh.is_null());
ERR_FAIL_INDEX(p_blend_shape, (int)blend_shape_tracks.size());
blend_shape_tracks[p_blend_shape] = p_value;
RenderingServer::get_singleton()->instance_set_blend_shape_weight(get_instance(), p_blend_shape, p_value);
if (!GDVIRTUAL_CALL(set_blend_shape_value, p_blend_shape, p_value)) {
RenderingServer::get_singleton()->instance_set_blend_shape_weight(get_instance(), p_blend_shape, p_value);
}
}

void MeshInstance3D::_resolve_skeleton_path() {
Expand Down Expand Up @@ -492,11 +494,12 @@ void MeshInstance3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_blend_shape_count"), &MeshInstance3D::get_blend_shape_count);
ClassDB::bind_method(D_METHOD("find_blend_shape_by_name", "name"), &MeshInstance3D::find_blend_shape_by_name);
ClassDB::bind_method(D_METHOD("get_blend_shape_value", "blend_shape_idx"), &MeshInstance3D::get_blend_shape_value);
ClassDB::bind_method(D_METHOD("set_blend_shape_value", "blend_shape_idx", "value"), &MeshInstance3D::set_blend_shape_value);

ClassDB::bind_method(D_METHOD("create_debug_tangents"), &MeshInstance3D::create_debug_tangents);
ClassDB::set_method_flags("MeshInstance3D", "create_debug_tangents", METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR);

GDVIRTUAL_BIND(set_blend_shape_value, "p_blend_shape", "p_value");

ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
ADD_GROUP("Skeleton", "");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin");
Expand Down
3 changes: 2 additions & 1 deletion scene/3d/mesh_instance_3d.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ class MeshInstance3D : public GeometryInstance3D {
int get_blend_shape_count() const;
int find_blend_shape_by_name(const StringName &p_name);
float get_blend_shape_value(int p_blend_shape) const;
void set_blend_shape_value(int p_blend_shape, float p_value);
virtual void set_blend_shape_value(int p_blend_shape, float p_value);
GDVIRTUAL2(set_blend_shape_value, int, float);

int get_surface_override_material_count() const;
void set_surface_override_material(int p_surface, const Ref<Material> &p_material);
Expand Down

0 comments on commit b7950af

Please sign in to comment.