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

Collada: next methods migrated.

pull/2966/head
kimkulling 2020-08-19 17:10:30 +02:00
parent 56381241c5
commit d393f677ce
2 changed files with 118 additions and 908 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

2
code/AssetLib/Ogre/OgreImporter.cpp
View File

@ -132,7 +132,7 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
//std::unique_ptr<XmlReader> reader(irr::io::createIrrXMLReader(xmlStream.get()));
xmlParser.parse(scopedFile.get());
// Import mesh
std::unique_ptr<MeshXml> mesh(OgreXmlSerializer::ImportMesh(xmlParser));
std::unique_ptr<MeshXml> mesh(OgreXmlSerializer::ImportMesh(&xmlParser));
// Import skeleton
OgreXmlSerializer::ImportSkeleton(pIOHandler, mesh.get());