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

Merge pull request #267 from terziman/master 

Fixed compilation errors on OgreImporter with Visual Studio 2012
pull/270/head
Kim Kulling 2014-05-05 13:49:36 +02:00
parent 1ec72cdddb f8b79acb36
commit a5e179edf5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/OgreImporter.cpp
View File

@ -111,7 +111,7 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
// Read root node // Read root node
NextNode(reader.get()); NextNode(reader.get());
if (!CurrentNodeNameEquals(reader, "mesh")) { if (!CurrentNodeNameEquals(reader.get(), "mesh")) {
throw DeadlyImportError("Root node is not <mesh> but <" + string(reader->getNodeName()) + "> in " + pFile); throw DeadlyImportError("Root node is not <mesh> but <" + string(reader->getNodeName()) + "> in " + pFile);
} }
@ -127,20 +127,20 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
// This can be used to share geometry between submeshes // This can be used to share geometry between submeshes
NextNode(reader.get()); NextNode(reader.get());
if (CurrentNodeNameEquals(reader, nnSharedGeometry)) if (CurrentNodeNameEquals(reader.get(), nnSharedGeometry))
{ {
DefaultLogger::get()->debug("Reading shared geometry"); DefaultLogger::get()->debug("Reading shared geometry");
unsigned int NumVertices = GetAttribute<unsigned int>(reader.get(), "vertexcount"); unsigned int NumVertices = GetAttribute<unsigned int>(reader.get(), "vertexcount");
NextNode(reader.get()); NextNode(reader.get());
while(CurrentNodeNameEquals(reader, nnVertexBuffer)) { while(CurrentNodeNameEquals(reader.get(), nnVertexBuffer)) {
ReadVertexBuffer(m_SharedGeometry, reader.get(), NumVertices); ReadVertexBuffer(m_SharedGeometry, reader.get(), NumVertices);
} }
} }
// -------------------- Sub Meshes -------------------- // -------------------- Sub Meshes --------------------
if (!CurrentNodeNameEquals(reader, nnSubMeshes)) { if (!CurrentNodeNameEquals(reader.get(), nnSubMeshes)) {
throw DeadlyImportError("Could not find <submeshes> node inside root <mesh> node"); throw DeadlyImportError("Could not find <submeshes> node inside root <mesh> node");
} }
@ -148,7 +148,7 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
vector<aiMaterial*> materials; vector<aiMaterial*> materials;
NextNode(reader.get()); NextNode(reader.get());
while(CurrentNodeNameEquals(reader, nnSubMesh)) while(CurrentNodeNameEquals(reader.get(), nnSubMesh))
{ {
SubMesh* submesh = new SubMesh(); SubMesh* submesh = new SubMesh();
ReadSubMesh(subMeshes.size(), *submesh, reader.get()); ReadSubMesh(subMeshes.size(), *submesh, reader.get());
@ -178,10 +178,10 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
// Skip submesh names. // Skip submesh names.
/// @todo Should these be read to scene etc. metadata? /// @todo Should these be read to scene etc. metadata?
if (CurrentNodeNameEquals(reader, nnSubMeshNames)) if (CurrentNodeNameEquals(reader.get(), nnSubMeshNames))
{ {
NextNode(reader.get()); NextNode(reader.get());
while(CurrentNodeNameEquals(reader, nnSubMesh)) { while(CurrentNodeNameEquals(reader.get(), nnSubMesh)) {
NextNode(reader.get()); NextNode(reader.get());
} }
} }
@ -191,7 +191,7 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
vector<Bone> Bones; vector<Bone> Bones;
vector<Animation> Animations; vector<Animation> Animations;
if (CurrentNodeNameEquals(reader, nnSkeletonLink)) if (CurrentNodeNameEquals(reader.get(), nnSkeletonLink))
{ {
string skeletonFile = GetAttribute<string>(reader.get(), "name"); string skeletonFile = GetAttribute<string>(reader.get(), "name");
if (!skeletonFile.empty()) if (!skeletonFile.empty())
@ -210,7 +210,7 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
} }
// Now there might be <boneassignments> for the shared geometry // Now there might be <boneassignments> for the shared geometry
if (CurrentNodeNameEquals(reader, "boneassignments")) { if (CurrentNodeNameEquals(reader.get(), "boneassignments")) {
ReadBoneWeights(m_SharedGeometry, reader.get()); ReadBoneWeights(m_SharedGeometry, reader.get());
} }