Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #63062 from Chaosus/vs_fix

Browse source
This commit is contained in:
Rémi Verschelde 2022-07-18 12:05:36 +02:00 • committed by GitHub
commit 1c6148aa86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 127 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

57
scene/resources/visual_shader.cpp
View file

@ -30,6 +30,7 @@
#include "visual_shader.h"
#include "core/templates/rb_map.h"
#include "core/templates/vmap.h"
#include "servers/rendering/shader_types.h"
#include "visual_shader_nodes.h"
@ -3189,18 +3190,18 @@ VisualShaderNodeInput::VisualShaderNodeInput() {
////////////// UniformRef
List<VisualShaderNodeUniformRef::Uniform> uniforms;
RBMap<RID, List<VisualShaderNodeUniformRef::Uniform>> uniforms;
void VisualShaderNodeUniformRef::add_uniform(const String &p_name, UniformType p_type) {
uniforms.push_back({ p_name, p_type });
void VisualShaderNodeUniformRef::add_uniform(RID p_shader_rid, const String &p_name, UniformType p_type) {
uniforms[p_shader_rid].push_back({ p_name, p_type });
}
void VisualShaderNodeUniformRef::clear_uniforms() {
uniforms.clear();
void VisualShaderNodeUniformRef::clear_uniforms(RID p_shader_rid) {
uniforms[p_shader_rid].clear();
}
bool VisualShaderNodeUniformRef::has_uniform(const String &p_name) {
for (const VisualShaderNodeUniformRef::Uniform &E : uniforms) {
bool VisualShaderNodeUniformRef::has_uniform(RID p_shader_rid, const String &p_name) {
for (const VisualShaderNodeUniformRef::Uniform &E : uniforms[p_shader_rid]) {
if (E.name == p_name) {
return true;
}
@ -3313,14 +3314,24 @@ String VisualShaderNodeUniformRef::get_output_port_name(int p_port) const {
return "";
}
void VisualShaderNodeUniformRef::set_shader_rid(const RID &p_shader_rid) {
shader_rid = p_shader_rid;
}
void VisualShaderNodeUniformRef::set_uniform_name(const String &p_name) {
uniform_name = p_name;
if (shader_rid.is_valid()) {
update_uniform_type();
}
emit_changed();
}
void VisualShaderNodeUniformRef::update_uniform_type() {
if (uniform_name != "[None]") {
uniform_type = get_uniform_type_by_name(uniform_name);
} else {
uniform_type = UniformType::UNIFORM_TYPE_FLOAT;
}
emit_changed();
}
String VisualShaderNodeUniformRef::get_uniform_name() const {
@ -3328,35 +3339,45 @@ String VisualShaderNodeUniformRef::get_uniform_name() const {
}
int VisualShaderNodeUniformRef::get_uniforms_count() const {
return uniforms.size();
ERR_FAIL_COND_V(!shader_rid.is_valid(), 0);
return uniforms[shader_rid].size();
}
String VisualShaderNodeUniformRef::get_uniform_name_by_index(int p_idx) const {
if (p_idx >= 0 && p_idx < uniforms.size()) {
return uniforms[p_idx].name;
ERR_FAIL_COND_V(!shader_rid.is_valid(), String());
if (p_idx >= 0 && p_idx < uniforms[shader_rid].size()) {
return uniforms[shader_rid][p_idx].name;
}
return "";
}
VisualShaderNodeUniformRef::UniformType VisualShaderNodeUniformRef::get_uniform_type_by_name(const String &p_name) const {
for (int i = 0; i < uniforms.size(); i++) {
if (uniforms[i].name == p_name) {
return uniforms[i].type;
ERR_FAIL_COND_V(!shader_rid.is_valid(), UNIFORM_TYPE_FLOAT);
for (int i = 0; i < uniforms[shader_rid].size(); i++) {
if (uniforms[shader_rid][i].name == p_name) {
return uniforms[shader_rid][i].type;
}
}
return UniformType::UNIFORM_TYPE_FLOAT;
}
VisualShaderNodeUniformRef::UniformType VisualShaderNodeUniformRef::get_uniform_type_by_index(int p_idx) const {
if (p_idx >= 0 && p_idx < uniforms.size()) {
return uniforms[p_idx].type;
ERR_FAIL_COND_V(!shader_rid.is_valid(), UNIFORM_TYPE_FLOAT);
if (p_idx >= 0 && p_idx < uniforms[shader_rid].size()) {
return uniforms[shader_rid][p_idx].type;
}
return UniformType::UNIFORM_TYPE_FLOAT;
}
VisualShaderNodeUniformRef::PortType VisualShaderNodeUniformRef::get_port_type_by_index(int p_idx) const {
if (p_idx >= 0 && p_idx < uniforms.size()) {
switch (uniforms[p_idx].type) {
ERR_FAIL_COND_V(!shader_rid.is_valid(), PORT_TYPE_SCALAR);
if (p_idx >= 0 && p_idx < uniforms[shader_rid].size()) {
switch (uniforms[shader_rid][p_idx].type) {
case UniformType::UNIFORM_TYPE_FLOAT:
return PORT_TYPE_SCALAR;
case UniformType::UNIFORM_TYPE_INT:

11
scene/resources/visual_shader.h
View file

@ -561,6 +561,7 @@ public:
};
private:
RID shader_rid;
String uniform_name = "[None]";
UniformType uniform_type = UniformType::UNIFORM_TYPE_FLOAT;
@ -568,9 +569,9 @@ protected:
static void _bind_methods();
public:
static void add_uniform(const String &p_name, UniformType p_type);
static void clear_uniforms();
static bool has_uniform(const String &p_name);
static void add_uniform(RID p_shader_rid, const String &p_name, UniformType p_type);
static void clear_uniforms(RID p_shader_rid);
static bool has_uniform(RID p_shader_rid, const String &p_name);
public:
virtual String get_caption() const override;
@ -583,9 +584,13 @@ public:
virtual PortType get_output_port_type(int p_port) const override;
virtual String get_output_port_name(int p_port) const override;
void set_shader_rid(const RID &p_shader);
void set_uniform_name(const String &p_name);
String get_uniform_name() const;
void update_uniform_type();
void _set_uniform_type(int p_uniform_type);
int _get_uniform_type() const;