godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #44805 from Chaosus/vs_convert

Browse Source 
Add convert options between constants and uniforms in visual shaders
This commit is contained in:
Rémi Verschelde
2021-01-15 16:58:26 +01:00
committed by GitHub
parent e8aab62d40 c98c6eadbe
commit c7fb7674c8
15 changed files with 341 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
editor/plugins/visual_shader_editor_plugin.h
View File

@@ -189,6 +189,9 @@ class VisualShaderEditor : public VBoxContainer {
PASTE,
DELETE,
DUPLICATE,
SEPARATOR2, // ignore
CONVERT_CONSTANTS_TO_UNIFORMS,
CONVERT_UNIFORMS_TO_CONSTANTS,
};
Tree *members;
@@ -319,6 +322,14 @@ class VisualShaderEditor : public VBoxContainer {
int from_node;
int from_slot;
Set<int> selected_constants;
Set<int> selected_uniforms;
void _convert_constants_to_uniforms(bool p_vice_versa);
void _replace_node(VisualShader::Type p_type_id, int p_node_id, const StringName &p_from, const StringName &p_to);
void _update_constant(VisualShader::Type p_type_id, int p_node_id, Variant p_var, int p_preview_port);
void _update_uniform(VisualShader::Type p_type_id, int p_node_id, Variant p_var, int p_preview_port);
void _connection_to_empty(const String &p_from, int p_from_slot, const Vector2 &p_release_position);
void _connection_from_empty(const String &p_to, int p_to_slot, const Vector2 &p_release_position);