v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix collada material parsing.

pull/2966/head
Kim Kulling 2020-09-23 00:20:06 +02:00
parent 93ae409e74
commit 34351b3cb9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/Collada/ColladaLoader.cpp
View File

@ -1652,7 +1652,7 @@ void ColladaLoader::BuildMaterials(ColladaParser &pParser, aiScene * /*pScene*/)
const Collada::Material &material = matIt->second;
// a material is only a reference to an effect
ColladaParser::EffectLibrary::iterator effIt = pParser.mEffectLibrary.find(material.mEffect);
if (effIt == pParser.mEffectLibrary.end())
if (effIt == pParser.mEffectLibrary.end())
continue;
Collada::Effect &effect = effIt->second;

8
code/AssetLib/Collada/ColladaParser.cpp
View File

@ -165,7 +165,7 @@ std::string ColladaParser::ReadZaeManifest(ZipArchiveIOSystem &zip_archive) {
}
XmlNode root = manifestParser.getRootNode();
const std::string &name = root.name();
const std::string &name = root.child("dae_root");
if (name != "dae_root") {
root = *manifestParser.findNode("dae_root");
if (nullptr == root) {
@ -920,9 +920,9 @@ void ColladaParser::ReadCameraLibrary(XmlNode &node) {
// ------------------------------------------------------------------------------------------------
// Reads a material entry into the given material
void ColladaParser::ReadMaterial(XmlNode &node, Collada::Material &pMaterial) {
for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
for (XmlNode currentNode : node.children()) {
const std::string &currentName = currentNode.name();
if (currentName == "material") {
if (currentName == "instance_effect") {
const char *url = currentNode.attribute("url").as_string();
if (url[0] != '#') {
ThrowException("Unknown reference format");
@ -2047,7 +2047,7 @@ void ColladaParser::ReadSceneNode(XmlNode &node, Node *pNode) {
}
for (XmlNode &currentNode : node.children()) {
const std::string &currentName = currentNode.name();
const std::string &currentName = currentNode.name();
if (currentName == "node") {
Node *child = new Node;
if (XmlParser::hasAttribute(currentNode, "id")) {