noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Screen space reflection effect

Browse Source
This commit is contained in:
Juan Linietsky
2016-11-29 19:55:12 -03:00
parent 3f40701002
commit a47c78aed1
21 changed files with 1285 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/collada/collada.cpp
View File

@@ -463,7 +463,7 @@ Transform Collada::_read_transform(XMLParser& parser) {
if (parser.is_empty())
return Transform();
Vector<float> array;
Vector<String> array;
while(parser.read()==OK) {
// TODO: check for comments inside the element
// and ignore them.
@@ -471,7 +471,7 @@ Transform Collada::_read_transform(XMLParser& parser) {
if (parser.get_node_type() == XMLParser::NODE_TEXT) {
// parse float data
String str = parser.get_node_data();
array=str.split_floats(" ",false);
array=str.split_spaces();
}
else
if (parser.get_node_type() == XMLParser::NODE_ELEMENT_END)
@@ -479,7 +479,13 @@ Transform Collada::_read_transform(XMLParser& parser) {
}
ERR_FAIL_COND_V(array.size()!=16,Transform());
return _read_transform_from_array(array);
Vector<float> farr;
farr.resize(16);
for(int i=0;i<16;i++) {
farr[i]=array[i].to_double();
}
return _read_transform_from_array(farr);
}
String Collada::_read_empty_draw_type(XMLParser& parser) {