Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

next fixed warnings

Browse Source
This commit is contained in:
Kim Kulling
2020-03-01 13:15:45 +01:00
parent fb3c3048a5
commit 920535165d
41 changed files with 4124 additions and 4618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/XGL/XGLLoader.cpp
+9 -14
View File
@@ -297,8 +297,7 @@ std::string XGLImporter::GetElementName()
std::string ret;
ret.resize(len);
std::transform(s,s+len,ret.begin(),::tolower);
std::transform(s, s + len, ret.begin(), ::ToLower<char>);
return ret;
}
@@ -618,26 +617,22 @@ bool XGLImporter::ReadMesh(TempScope& scope)
bool has[3] = {0};
while (ReadElementUpToClosing(s.c_str())) {
const std::string& s = GetElementName();
if (s == "fv1" || s == "lv1" || s == "pv1") {
const std::string& elemName = GetElementName();
if (elemName == "fv1" || elemName == "lv1" || elemName == "pv1") {
ReadFaceVertex(t,tf[0]);
has[0] = true;
}
else if (s == "fv2" || s == "lv2") {
ReadFaceVertex(t,tf[1]);
} else if (elemName == "fv2" || elemName == "lv2") {
ReadFaceVertex(t, tf[1]);
has[1] = true;
}
else if (s == "fv3") {
ReadFaceVertex(t,tf[2]);
} else if (elemName == "fv3") {
ReadFaceVertex(t, tf[2]);
has[2] = true;
}
else if (s == "mat") {
} else if (elemName == "mat") {
if (mid != ~0u) {
LogWarn("only one material tag allowed per <f>");
}
mid = ResolveMaterialRef(scope);
}
else if (s == "matref") {
} else if (elemName == "matref") {
if (mid != ~0u) {
LogWarn("only one material tag allowed per <f>");
}