|
@@ -255,8 +255,7 @@ void AMFImporter::ParseNode_Triangle(XmlNode &node) {
|
|
|
|
|
|
AMFTriangle &als = *((AMFTriangle *)ne); // alias for convenience
|
|
AMFTriangle &als = *((AMFTriangle *)ne); // alias for convenience
|
|
|
|
|
|
- bool col_read = false, tex_read = false;
|
|
|
|
- bool read_flag[3] = { false, false, false };
|
|
|
|
|
|
+ bool col_read = false;
|
|
if (!node.empty()) {
|
|
if (!node.empty()) {
|
|
ParseHelper_Node_Enter(ne);
|
|
ParseHelper_Node_Enter(ne);
|
|
for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
|
|
for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
|
|
@@ -267,19 +266,14 @@ void AMFImporter::ParseNode_Triangle(XmlNode &node) {
|
|
col_read = true;
|
|
col_read = true;
|
|
} else if (currentName == "texmap") {
|
|
} else if (currentName == "texmap") {
|
|
ParseNode_TexMap(currentNode);
|
|
ParseNode_TexMap(currentNode);
|
|
- tex_read = true;
|
|
|
|
} else if (currentName == "map") {
|
|
} else if (currentName == "map") {
|
|
ParseNode_TexMap(currentNode, true);
|
|
ParseNode_TexMap(currentNode, true);
|
|
- tex_read = true;
|
|
|
|
} else if (currentName == "v1") {
|
|
} else if (currentName == "v1") {
|
|
als.V[0] = std::atoi(currentNode.value());
|
|
als.V[0] = std::atoi(currentNode.value());
|
|
- read_flag[0] = true;
|
|
|
|
} else if (currentName == "v2") {
|
|
} else if (currentName == "v2") {
|
|
als.V[1] = std::atoi(currentNode.value());
|
|
als.V[1] = std::atoi(currentNode.value());
|
|
- read_flag[1] = true;
|
|
|
|
} else if (currentName == "v3") {
|
|
} else if (currentName == "v3") {
|
|
als.V[2] = std::atoi(currentNode.value());
|
|
als.V[2] = std::atoi(currentNode.value());
|
|
- read_flag[2] = true;
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
ParseHelper_Node_Exit();
|
|
ParseHelper_Node_Exit();
|
|
@@ -287,12 +281,6 @@ void AMFImporter::ParseNode_Triangle(XmlNode &node) {
|
|
mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
|
|
mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
|
|
}
|
|
}
|
|
|
|
|
|
- // Check for child nodes
|
|
|
|
- if ((read_flag[0] && read_flag[1] && read_flag[2]) == 0) {
|
|
|
|
- throw DeadlyImportError("Not all vertices of the triangle are defined.");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
|
|
mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
|
|
}
|
|
}
|
|
|
|
|