Small refactoringsa

code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp

@@ -394,7 +394,7 @@ void HL1MDLLoader::read_textures() {
 
         aiMaterial *scene_material = scene_->mMaterials[i] = new aiMaterial();
 
-        const aiTextureType texture_type = aiTextureType_DIFFUSE;
+        constexpr aiTextureType texture_type = aiTextureType_DIFFUSE;
         aiString texture_name(ptexture[i].name);
         scene_material->AddProperty(&texture_name, AI_MATKEY_TEXTURE(texture_type, 0));
 

code/Common/Importer.h

@@ -138,16 +138,7 @@ inline ImporterPimpl::ImporterPimpl() AI_NO_EXCEPT :
         mIsDefaultHandler( false ),
         mProgressHandler( nullptr ),
         mIsDefaultProgressHandler( false ),
-        mImporter(),
-        mPostProcessingSteps(),
         mScene( nullptr ),
-        mErrorString(),
-        mException(),
-        mIntProperties(),
-        mFloatProperties(),
-        mStringProperties(),
-        mMatrixProperties(),
-        mPointerProperties(),
         bExtraVerbose( false ),
         mPPShared( nullptr ) {
     // empty

include/assimp/Importer.hpp

@@ -128,7 +128,6 @@ public:
      */
     static const unsigned int MaxLenHint = 200;
 
-public:
     // -------------------------------------------------------------------
     /** Constructor. Creates an empty importer object.
      *

test/unit/ImportExport/MDL/utMDLImporter_HL1_ImportSettings.cpp

@@ -187,14 +187,14 @@ private:
             const char *setting_key,
             bool setting_value,
             std::function<void(const aiScene *)> &&func) {
-        Assimp::Importer importer;
+        Importer importer;
         importer.SetPropertyBool(setting_key, setting_value);
         const aiScene *scene = importer.ReadFile(file_path, aiProcess_ValidateDataStructure);
         ASSERT_NE(nullptr, scene);
         func(scene);
     }
 
-    inline static aiNode *get_global_info(const aiScene *scene) {
+    static aiNode *get_global_info(const aiScene *scene) {
         return scene->mRootNode->FindNode(AI_MDL_HL1_NODE_GLOBAL_INFO);
     }
 

test/unit/ImportExport/MDL/utMDLImporter_HL1_Nodes.cpp

@@ -76,7 +76,7 @@ public:
 
     // Given a model, verify that the bones nodes hierarchy is correctly formed.
     void checkBoneHierarchy() {
-        Assimp::Importer importer;
+        Importer importer;
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MDL_HL1_MODELS_DIR "multiple_roots.mdl", aiProcess_ValidateDataStructure);
         ASSERT_NE(nullptr, scene);
         ASSERT_NE(nullptr, scene->mRootNode);
@@ -207,7 +207,7 @@ public:
         $body "Bodypart_4"
     */
     void duplicateBodypartsNames() {
-        Assimp::Importer importer;
+        Importer importer;
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MDL_HL1_MODELS_DIR "duplicate_bodyparts.mdl", aiProcess_ValidateDataStructure);
         ASSERT_NE(nullptr, scene);
 
@@ -252,7 +252,7 @@ public:
         }
     */
     void duplicateSubModelsNames() {
-        Assimp::Importer importer;
+        Importer importer;
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MDL_HL1_MODELS_DIR "duplicate_submodels.mdl", aiProcess_ValidateDataStructure);
         ASSERT_NE(nullptr, scene);
 

test/unit/ImportExport/utMDLImporter.cpp

@@ -63,7 +63,7 @@ public:
     }
 
 private:
-    void importerTest_HL1(Assimp::Importer *const importer) {
+    void importerTest_HL1(Importer *const importer) {
         const aiScene *scene = importer->ReadFile(MDL_HL1_FILE_MAN, 0);
         EXPECT_NE(nullptr, scene);