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

Fix some indentation

pull/4792/head
Aaron Gokaslan 2022-11-08 11:13:14 -05:00
parent ccfb175460
commit d635bc6914
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/AssetLib/Irr/IRRMeshLoader.cpp
View File

@ -120,15 +120,15 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,
std::unique_ptr<IOStream> file(pIOHandler->Open(pFile)); std::unique_ptr<IOStream> file(pIOHandler->Open(pFile));
// Check whether we can read from the file // Check whether we can read from the file
if (file == nullptr) if (file == nullptr)
throw DeadlyImportError("Failed to open IRRMESH file ", pFile); throw DeadlyImportError("Failed to open IRRMESH file ", pFile);
// Construct the irrXML parser // Construct the irrXML parser
XmlParser parser; XmlParser parser;
if (!parser.parse( file.get() )) { if (!parser.parse( file.get() )) {
throw DeadlyImportError("XML parse error while loading IRRMESH file ", pFile); throw DeadlyImportError("XML parse error while loading IRRMESH file ", pFile);
} }
XmlNode root = parser.getRootNode(); XmlNode root = parser.getRootNode();
// final data // final data
std::vector<aiMaterial *> materials; std::vector<aiMaterial *> materials;

2
code/AssetLib/OFF/OFFLoader.cpp
View File

@ -110,7 +110,7 @@ void OFFImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOS
// Check whether we can read from the file // Check whether we can read from the file
if (file == nullptr) { if (file == nullptr) {
throw DeadlyImportError("Failed to open OFF file ", pFile, "."); throw DeadlyImportError("Failed to open OFF file ", pFile, ".");
} }
// allocate storage and copy the contents of the file to a memory buffer // allocate storage and copy the contents of the file to a memory buffer

8
tools/assimp_cmd/Main.cpp
View File

@ -291,8 +291,8 @@ const aiScene* ImportModel(
// Now validate this flag combination // Now validate this flag combination
if(!globalImporter->ValidateFlags(imp.ppFlags)) { if(!globalImporter->ValidateFlags(imp.ppFlags)) {
printf("ERROR: Unsupported post-processing flags \n"); printf("ERROR: Unsupported post-processing flags \n");
return nullptr; return nullptr;
} }
printf("Validating postprocessing flags ... OK\n"); printf("Validating postprocessing flags ... OK\n");
if (imp.showLog) { if (imp.showLog) {
PrintHorBar(); PrintHorBar();
@ -311,8 +311,8 @@ const aiScene* ImportModel(
} }
if (!scene) { if (!scene) {
printf("ERROR: Failed to load file: %s\n", globalImporter->GetErrorString()); printf("ERROR: Failed to load file: %s\n", globalImporter->GetErrorString());
return nullptr; return nullptr;
} }
const clock_t second = ::clock(); const clock_t second = ::clock();
const double seconds = static_cast<double>(second-first) / CLOCKS_PER_SEC; const double seconds = static_cast<double>(second-first) / CLOCKS_PER_SEC;