|
@@ -626,8 +626,6 @@ void ColladaParser::ReadController(XmlNode &node, Collada::Controller &controlle
|
|
XmlNodeIterator xmlIt(node, XmlNodeIterator::PreOrderMode);
|
|
XmlNodeIterator xmlIt(node, XmlNodeIterator::PreOrderMode);
|
|
XmlNode currentNode;
|
|
XmlNode currentNode;
|
|
while (xmlIt.getNext(currentNode)) {
|
|
while (xmlIt.getNext(currentNode)) {
|
|
-
|
|
|
|
- //for (XmlNode ¤tNode : node.children()) {
|
|
|
|
const std::string ¤tName = currentNode.name();
|
|
const std::string ¤tName = currentNode.name();
|
|
if (currentName == "morph") {
|
|
if (currentName == "morph") {
|
|
controller.mType = Morph;
|
|
controller.mType = Morph;
|
|
@@ -1439,9 +1437,8 @@ void ColladaParser::ReadDataArray(XmlNode &node) {
|
|
throw DeadlyImportError("Expected more values while reading float_array contents.");
|
|
throw DeadlyImportError("Expected more values while reading float_array contents.");
|
|
}
|
|
}
|
|
|
|
|
|
- ai_real value;
|
|
|
|
// read a number
|
|
// read a number
|
|
- //SkipSpacesAndLineEnd(&content);
|
|
|
|
|
|
+ ai_real value;
|
|
content = fast_atoreal_move<ai_real>(content, value);
|
|
content = fast_atoreal_move<ai_real>(content, value);
|
|
data.mValues.push_back(value);
|
|
data.mValues.push_back(value);
|
|
// skip whitespace after it
|
|
// skip whitespace after it
|
|
@@ -1489,11 +1486,10 @@ void ColladaParser::ReadAccessor(XmlNode &node, const std::string &pID) {
|
|
std::string name;
|
|
std::string name;
|
|
if (XmlParser::hasAttribute(currentNode, "name")) {
|
|
if (XmlParser::hasAttribute(currentNode, "name")) {
|
|
XmlParser::getStdStrAttribute(currentNode, "name", name);
|
|
XmlParser::getStdStrAttribute(currentNode, "name", name);
|
|
- //name = mReader->getAttributeValue(attrName);
|
|
|
|
|
|
|
|
// analyse for common type components and store it's sub-offset in the corresponding field
|
|
// analyse for common type components and store it's sub-offset in the corresponding field
|
|
|
|
|
|
- /* Cartesian coordinates */
|
|
|
|
|
|
+ // Cartesian coordinates
|
|
if (name == "X")
|
|
if (name == "X")
|
|
acc.mSubOffset[0] = acc.mParams.size();
|
|
acc.mSubOffset[0] = acc.mParams.size();
|
|
else if (name == "Y")
|
|
else if (name == "Y")
|