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

Merge pull request #16852 from godotengine/revert-15985-uniforms-single-argument-constructors 

Revert "Handle single-argument constructors in uniform default values"
This commit is contained in:
Juan Linietsky 2018-02-20 07:28:35 -03:00 committed by GitHub
parent 05a8675f82 4c56edfb83
commit 6756896b22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
servers/visual/shader_language.cpp
View File

@ -3138,60 +3138,6 @@ ShaderLanguage::Node *ShaderLanguage::_reduce_expression(BlockNode *p_block, Sha
}
}
// Passed a single argument
if (op->arguments.size() <= 2) {
if (op->get_datatype() < TYPE_MAT2) {
// Scalar or vector
int dimensions = 0;
switch (op->get_datatype()) {
case TYPE_VEC2:
case TYPE_BVEC2:
case TYPE_UVEC2:
case TYPE_IVEC2: {
dimensions = 2;
} break;
case TYPE_VEC3:
case TYPE_BVEC3:
case TYPE_UVEC3:
case TYPE_IVEC3: {
dimensions = 3;
} break;
case TYPE_VEC4:
case TYPE_BVEC4:
case TYPE_UVEC4:
case TYPE_IVEC4: {
dimensions = 4;
} break;
}
if (dimensions) {
ConstantNode::Value val = values[0];
for (int i = 1; i < dimensions; i++) {
values.push_back(val);
}
}
} else if (op->get_datatype() <= TYPE_MAT4) {
// Matrix
int dimensions = 0;
switch (op->get_datatype()) {
case TYPE_MAT2: dimensions = 2; break;
case TYPE_MAT3: dimensions = 3; break;
case TYPE_MAT4: dimensions = 4; break;
}
// Fill the diagonal with the value, the rest with zeroes
ConstantNode::Value val = values[0];
for (int i = 1; i < dimensions * dimensions; i++) {
if (i % (dimensions + 1) == 0) {
values.push_back(val);
} else {
values.push_back(ConstantNode::Value());
}
}
}
}
ConstantNode *cn = alloc_node<ConstantNode>();
cn->datatype = op->get_datatype();
cn->values = values;