Skip to content
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

Change VisualShaderNodeVec4Constant type to vec4 #94616

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Change VisualShaderNodeVec4Constant type to vec4 #94616

Show file tree
Hide file tree
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
7 changes: 3 additions & 4 deletions editor/plugins/visual_shader_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ void VisualShaderGraphPlugin::set_input_port_default_value(VisualShader::Type p_
Vector3 v = p_value;
button->set_text(String::num(v.x, 3) + "," + String::num(v.y, 3) + "," + String::num(v.z, 3));
} break;
case Variant::QUATERNION: {
Quaternion v = p_value;
case Variant::VECTOR4: {
Vector4 v = p_value;
button->set_text(String::num(v.x, 3) + "," + String::num(v.y, 3) + "," + String::num(v.z, 3) + "," + String::num(v.w, 3));
} break;
default: {
Expand Down Expand Up @@ -3119,7 +3119,6 @@ void VisualShaderEditor::_edit_port_default_input(Object *p_button, int p_node,
popup_pref_size.width = 320;
break;
case Variant::VECTOR4:
case Variant::QUATERNION:
case Variant::PLANE:
case Variant::TRANSFORM2D:
case Variant::TRANSFORM3D:
Expand Down Expand Up @@ -7533,7 +7532,7 @@ Control *VisualShaderNodePluginDefault::create_editor(const Ref<Resource> &p_par
prop->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
} else if (Object::cast_to<EditorPropertyTransform3D>(prop) || Object::cast_to<EditorPropertyVector3>(prop)) {
prop->set_custom_minimum_size(Size2(250 * EDSCALE, 0));
} else if (Object::cast_to<EditorPropertyQuaternion>(prop)) {
} else if (Object::cast_to<EditorPropertyVector4>(prop)) {
prop->set_custom_minimum_size(Size2(320 * EDSCALE, 0));
} else if (Object::cast_to<EditorPropertyFloat>(prop)) {
prop->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
Expand Down
14 changes: 13 additions & 1 deletion scene/resources/visual_shader_nodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,17 +581,29 @@ Quaternion VisualShaderNodeVec4Constant::get_constant() const {
return constant;
}

void VisualShaderNodeVec4Constant::_set_constant_v4(const Vector4 &p_constant) {
set_constant(Quaternion(p_constant.x, p_constant.y, p_constant.z, p_constant.w));
}

Vector4 VisualShaderNodeVec4Constant::_get_constant_v4() const {
return Vector4(constant.x, constant.y, constant.z, constant.w);
}

Vector<StringName> VisualShaderNodeVec4Constant::get_editable_properties() const {
Vector<StringName> props;
props.push_back("constant");
props.push_back("constant_v4");
return props;
}

void VisualShaderNodeVec4Constant::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_constant", "constant"), &VisualShaderNodeVec4Constant::set_constant);
ClassDB::bind_method(D_METHOD("get_constant"), &VisualShaderNodeVec4Constant::get_constant);

ClassDB::bind_method(D_METHOD("_set_constant_v4", "constant"), &VisualShaderNodeVec4Constant::_set_constant_v4);
ClassDB::bind_method(D_METHOD("_get_constant_v4"), &VisualShaderNodeVec4Constant::_get_constant_v4);

ADD_PROPERTY(PropertyInfo(Variant::QUATERNION, "constant"), "set_constant", "get_constant");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR4, "constant_v4", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_INTERNAL), "_set_constant_v4", "_get_constant_v4");
}

VisualShaderNodeVec4Constant::VisualShaderNodeVec4Constant() {
Expand Down
3 changes: 3 additions & 0 deletions scene/resources/visual_shader_nodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,9 @@ class VisualShaderNodeVec4Constant : public VisualShaderNodeConstant {
void set_constant(const Quaternion &p_constant);
Quaternion get_constant() const;

void _set_constant_v4(const Vector4 &p_constant);
Vector4 _get_constant_v4() const;

virtual Vector<StringName> get_editable_properties() const override;

VisualShaderNodeVec4Constant();
Expand Down
Loading