Skip to content

Commit df61dca

Browse files
committed
Change VisualShaderNodeVec4Constant type to vec4
1 parent 33c30b9 commit df61dca

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

editor/plugins/visual_shader_editor_plugin.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ void VisualShaderGraphPlugin::set_input_port_default_value(VisualShader::Type p_
311311
Vector3 v = p_value;
312312
button->set_text(String::num(v.x, 3) + "," + String::num(v.y, 3) + "," + String::num(v.z, 3));
313313
} break;
314-
case Variant::QUATERNION: {
315-
Quaternion v = p_value;
314+
case Variant::VECTOR4: {
315+
Vector4 v = p_value;
316316
button->set_text(String::num(v.x, 3) + "," + String::num(v.y, 3) + "," + String::num(v.z, 3) + "," + String::num(v.w, 3));
317317
} break;
318318
default: {
@@ -3119,7 +3119,6 @@ void VisualShaderEditor::_edit_port_default_input(Object *p_button, int p_node,
31193119
popup_pref_size.width = 320;
31203120
break;
31213121
case Variant::VECTOR4:
3122-
case Variant::QUATERNION:
31233122
case Variant::PLANE:
31243123
case Variant::TRANSFORM2D:
31253124
case Variant::TRANSFORM3D:
@@ -7533,7 +7532,7 @@ Control *VisualShaderNodePluginDefault::create_editor(const Ref<Resource> &p_par
75337532
prop->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
75347533
} else if (Object::cast_to<EditorPropertyTransform3D>(prop) || Object::cast_to<EditorPropertyVector3>(prop)) {
75357534
prop->set_custom_minimum_size(Size2(250 * EDSCALE, 0));
7536-
} else if (Object::cast_to<EditorPropertyQuaternion>(prop)) {
7535+
} else if (Object::cast_to<EditorPropertyVector4>(prop)) {
75377536
prop->set_custom_minimum_size(Size2(320 * EDSCALE, 0));
75387537
} else if (Object::cast_to<EditorPropertyFloat>(prop)) {
75397538
prop->set_custom_minimum_size(Size2(100 * EDSCALE, 0));

scene/resources/visual_shader_nodes.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,17 +581,29 @@ Quaternion VisualShaderNodeVec4Constant::get_constant() const {
581581
return constant;
582582
}
583583

584+
void VisualShaderNodeVec4Constant::_set_constant_v4(const Vector4 &p_constant) {
585+
set_constant(Quaternion(p_constant.x, p_constant.y, p_constant.z, p_constant.w));
586+
}
587+
588+
Vector4 VisualShaderNodeVec4Constant::_get_constant_v4() const {
589+
return Vector4(constant.x, constant.y, constant.z, constant.w);
590+
}
591+
584592
Vector<StringName> VisualShaderNodeVec4Constant::get_editable_properties() const {
585593
Vector<StringName> props;
586-
props.push_back("constant");
594+
props.push_back("constant_v4");
587595
return props;
588596
}
589597

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

602+
ClassDB::bind_method(D_METHOD("_set_constant_v4", "constant"), &VisualShaderNodeVec4Constant::_set_constant_v4);
603+
ClassDB::bind_method(D_METHOD("_get_constant_v4"), &VisualShaderNodeVec4Constant::_get_constant_v4);
604+
594605
ADD_PROPERTY(PropertyInfo(Variant::QUATERNION, "constant"), "set_constant", "get_constant");
606+
ADD_PROPERTY(PropertyInfo(Variant::VECTOR4, "constant_v4", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_INTERNAL), "_set_constant_v4", "_get_constant_v4");
595607
}
596608

597609
VisualShaderNodeVec4Constant::VisualShaderNodeVec4Constant() {

scene/resources/visual_shader_nodes.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,9 @@ class VisualShaderNodeVec4Constant : public VisualShaderNodeConstant {
341341
void set_constant(const Quaternion &p_constant);
342342
Quaternion get_constant() const;
343343

344+
void _set_constant_v4(const Vector4 &p_constant);
345+
Vector4 _get_constant_v4() const;
346+
344347
virtual Vector<StringName> get_editable_properties() const override;
345348

346349
VisualShaderNodeVec4Constant();

0 commit comments

Comments
 (0)