From d635bc691497db1ac302ebcfa20907f421c95316 Mon Sep 17 00:00:00 2001 From: Aaron Gokaslan Date: Tue, 8 Nov 2022 11:13:14 -0500 Subject: [PATCH] Fix some indentation --- code/AssetLib/Irr/IRRMeshLoader.cpp | 12 ++++++------ code/AssetLib/OFF/OFFLoader.cpp | 2 +- tools/assimp_cmd/Main.cpp | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/AssetLib/Irr/IRRMeshLoader.cpp b/code/AssetLib/Irr/IRRMeshLoader.cpp index 8375fce25..9b4faec83 100644 --- a/code/AssetLib/Irr/IRRMeshLoader.cpp +++ b/code/AssetLib/Irr/IRRMeshLoader.cpp @@ -120,15 +120,15 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile, std::unique_ptr file(pIOHandler->Open(pFile)); // Check whether we can read from the file - if (file == nullptr) - throw DeadlyImportError("Failed to open IRRMESH file ", pFile); + if (file == nullptr) + throw DeadlyImportError("Failed to open IRRMESH file ", pFile); // Construct the irrXML parser XmlParser parser; - if (!parser.parse( file.get() )) { - throw DeadlyImportError("XML parse error while loading IRRMESH file ", pFile); - } - XmlNode root = parser.getRootNode(); + if (!parser.parse( file.get() )) { + throw DeadlyImportError("XML parse error while loading IRRMESH file ", pFile); + } + XmlNode root = parser.getRootNode(); // final data std::vector materials; diff --git a/code/AssetLib/OFF/OFFLoader.cpp b/code/AssetLib/OFF/OFFLoader.cpp index 967d88b1c..a366d7463 100644 --- a/code/AssetLib/OFF/OFFLoader.cpp +++ b/code/AssetLib/OFF/OFFLoader.cpp @@ -110,7 +110,7 @@ void OFFImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOS // Check whether we can read from the file 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 diff --git a/tools/assimp_cmd/Main.cpp b/tools/assimp_cmd/Main.cpp index 4360cf2ab..c6349550f 100644 --- a/tools/assimp_cmd/Main.cpp +++ b/tools/assimp_cmd/Main.cpp @@ -291,8 +291,8 @@ const aiScene* ImportModel( // Now validate this flag combination if(!globalImporter->ValidateFlags(imp.ppFlags)) { printf("ERROR: Unsupported post-processing flags \n"); - return nullptr; - } + return nullptr; + } printf("Validating postprocessing flags ... OK\n"); if (imp.showLog) { PrintHorBar(); @@ -311,8 +311,8 @@ const aiScene* ImportModel( } if (!scene) { printf("ERROR: Failed to load file: %s\n", globalImporter->GetErrorString()); - return nullptr; - } + return nullptr; + } const clock_t second = ::clock(); const double seconds = static_cast(second-first) / CLOCKS_PER_SEC;