godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51144 from Chaosus/vs_version

Browse Source 
Makes dictionary instead of string for visual shader version
This commit is contained in:
Yuri Roubinsky 2021-08-02 21:55:50 +03:00 committed by GitHub
commit bd6b7c4b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/classes/VisualShader.xml
View File

@ -146,11 +146,13 @@
</method> </method>
</methods> </methods>
<members> <members>
<member name="engine_version" type="Dictionary" setter="set_engine_version" getter="get_engine_version" default="{}">
The Godot version this [VisualShader] was designed for, in the form of a [Dictionary] with [code]major[/code] and [code]minor[/code] keys with integer values. Example: [code]{"major": 4, "minor": 0}[/code]
This is used by the editor to convert visual shaders from older Godot versions.
</member>
<member name="graph_offset" type="Vector2" setter="set_graph_offset" getter="get_graph_offset" default="Vector2(0, 0)"> <member name="graph_offset" type="Vector2" setter="set_graph_offset" getter="get_graph_offset" default="Vector2(0, 0)">
The offset vector of the whole graph. The offset vector of the whole graph.
</member> </member>
<member name="version" type="String" setter="set_version" getter="get_version" default="&quot;&quot;">
</member>
</members> </members>
<constants> <constants>
<constant name="TYPE_VERTEX" value="0" enum="Type"> <constant name="TYPE_VERTEX" value="0" enum="Type">

21
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -35,7 +35,6 @@
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/math/math_defs.h" #include "core/math/math_defs.h"
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
#include "core/version.h"
#include "editor/editor_log.h" #include "editor/editor_log.h"
#include "editor/editor_properties.h" #include "editor/editor_properties.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
@ -999,9 +998,23 @@ void VisualShaderEditor::edit(VisualShader *p_visual_shader) {
visual_shader->connect("changed", callable_mp(this, &VisualShaderEditor::_update_preview)); visual_shader->connect("changed", callable_mp(this, &VisualShaderEditor::_update_preview));
} }
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
String version = VERSION_BRANCH; Dictionary engine_version = Engine::get_singleton()->get_version_info();
if (visual_shader->get_version() != version) { static Array components;
visual_shader->update_version(version); if (components.is_empty()) {
components.push_back("major");
components.push_back("minor");
}
const Dictionary vs_version = visual_shader->get_engine_version();
if (!vs_version.has_all(components)) {
visual_shader->update_engine_version(engine_version);
} else {
for (int i = 0; i < components.size(); i++) {
if (vs_version[components[i]] != engine_version[components[i]]) {
visual_shader->update_engine_version(engine_version);
print_line(vformat(TTR("The shader (\"%s\") has been updated to correspond Godot %s.%s version."), visual_shader->get_path(), engine_version["major"], engine_version["minor"]));
break;
}
}
} }
#endif #endif
visual_shader->set_graph_offset(graph->get_scroll_ofs() / EDSCALE); visual_shader->set_graph_offset(graph->get_scroll_ofs() / EDSCALE);

27
scene/resources/visual_shader.cpp
View File

@ -451,16 +451,21 @@ VisualShader::Type VisualShader::get_shader_type() const {
return current_type; return current_type;
} }
void VisualShader::set_version(const String &p_version) { void VisualShader::set_engine_version(const Dictionary &p_engine_version) {
version = p_version; ERR_FAIL_COND(!p_engine_version.has("major"));
ERR_FAIL_COND(!p_engine_version.has("minor"));
engine_version["major"] = p_engine_version["major"];
engine_version["minor"] = p_engine_version["minor"];
} }
String VisualShader::get_version() const { Dictionary VisualShader::get_engine_version() const {
return version; return engine_version;
} }
void VisualShader::update_version(const String &p_new_version) { #ifndef DISABLE_DEPRECATED
if (version == "") {
void VisualShader::update_engine_version(const Dictionary &p_new_version) {
if (engine_version.is_empty()) { // before 4.0
for (int i = 0; i < TYPE_MAX; i++) { for (int i = 0; i < TYPE_MAX; i++) {
for (Map<int, Node>::Element *E = graph[i].nodes.front(); E; E = E->next()) { for (Map<int, Node>::Element *E = graph[i].nodes.front(); E; E = E->next()) {
Ref<VisualShaderNodeExpression> expression = Object::cast_to<VisualShaderNodeExpression>(E->get().node.ptr()); Ref<VisualShaderNodeExpression> expression = Object::cast_to<VisualShaderNodeExpression>(E->get().node.ptr());
@ -491,9 +496,11 @@ void VisualShader::update_version(const String &p_new_version) {
} }
} }
} }
set_version(p_new_version); set_engine_version(p_new_version);
} }
#endif /* DISABLE_DEPRECATED */
void VisualShader::add_node(Type p_type, const Ref<VisualShaderNode> &p_node, const Vector2 &p_position, int p_id) { void VisualShader::add_node(Type p_type, const Ref<VisualShaderNode> &p_node, const Vector2 &p_position, int p_id) {
ERR_FAIL_COND(p_node.is_null()); ERR_FAIL_COND(p_node.is_null());
ERR_FAIL_COND(p_id < 2); ERR_FAIL_COND(p_id < 2);
@ -2007,8 +2014,8 @@ void VisualShader::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_node_connections", "type"), &VisualShader::_get_node_connections); ClassDB::bind_method(D_METHOD("get_node_connections", "type"), &VisualShader::_get_node_connections);
ClassDB::bind_method(D_METHOD("set_version", "version"), &VisualShader::set_version); ClassDB::bind_method(D_METHOD("set_engine_version", "version"), &VisualShader::set_engine_version);
ClassDB::bind_method(D_METHOD("get_version"), &VisualShader::get_version); ClassDB::bind_method(D_METHOD("get_engine_version"), &VisualShader::get_engine_version);
ClassDB::bind_method(D_METHOD("set_graph_offset", "offset"), &VisualShader::set_graph_offset); ClassDB::bind_method(D_METHOD("set_graph_offset", "offset"), &VisualShader::set_graph_offset);
ClassDB::bind_method(D_METHOD("get_graph_offset"), &VisualShader::get_graph_offset); ClassDB::bind_method(D_METHOD("get_graph_offset"), &VisualShader::get_graph_offset);
@ -2016,7 +2023,7 @@ void VisualShader::_bind_methods() {
ClassDB::bind_method(D_METHOD("_update_shader"), &VisualShader::_update_shader); ClassDB::bind_method(D_METHOD("_update_shader"), &VisualShader::_update_shader);
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "graph_offset", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_graph_offset", "get_graph_offset"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "graph_offset", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_graph_offset", "get_graph_offset");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "version", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_version", "get_version"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "engine_version", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_engine_version", "get_engine_version");
ADD_PROPERTY_DEFAULT("code", ""); // Inherited from Shader, prevents showing default code as override in docs. ADD_PROPERTY_DEFAULT("code", ""); // Inherited from Shader, prevents showing default code as override in docs.

10
scene/resources/visual_shader.h
View File

@ -44,7 +44,7 @@ class VisualShader : public Shader {
friend class VisualShaderNodeVersionChecker; friend class VisualShaderNodeVersionChecker;
String version = ""; Dictionary engine_version;
public: public:
enum Type { enum Type {
@ -137,10 +137,12 @@ public: // internal methods
Type get_shader_type() const; Type get_shader_type() const;
public: public:
void set_version(const String &p_version); void set_engine_version(const Dictionary &p_version);
String get_version() const; Dictionary get_engine_version() const;
void update_version(const String &p_new_version); #ifndef DISABLE_DEPRECATED
void update_engine_version(const Dictionary &p_new_version);
#endif /* DISABLE_DEPRECATED */
enum { enum {
NODE_ID_INVALID = -1, NODE_ID_INVALID = -1,