2
0
Эх сурвалжийг харах

Use verbose debug logging in certain places

Malcolm Tyrrell 5 жил өмнө
parent
commit
e11d78596f

+ 1 - 1
code/Common/SceneCombiner.cpp

@@ -75,7 +75,7 @@ void PrefixString(aiString& string,const char* prefix, unsigned int len) {
         return;
         return;
 
 
     if (len+string.length>=MAXLEN-1) {
     if (len+string.length>=MAXLEN-1) {
-        ASSIMP_LOG_DEBUG("Can't add an unique prefix because the string is too long");
+		ASSIMP_LOG_VERBOSE_DEBUG("Can't add an unique prefix because the string is too long");
         ai_assert(false);
         ai_assert(false);
         return;
         return;
     }
     }

+ 4 - 4
code/Common/ScenePreprocessor.cpp

@@ -225,7 +225,7 @@ void ScenePreprocessor::ProcessAnimation (aiAnimation* anim)
                     q.mTime  = 0.;
                     q.mTime  = 0.;
                     q.mValue = rotation;
                     q.mValue = rotation;
 
 
-                    ASSIMP_LOG_DEBUG("ScenePreprocessor: Dummy rotation track has been generated");
+                    ASSIMP_LOG_VERBOSE_DEBUG("ScenePreprocessor: Dummy rotation track has been generated");
                 } else {
                 } else {
                     ai_assert(channel->mRotationKeys);
                     ai_assert(channel->mRotationKeys);
                 }
                 }
@@ -240,7 +240,7 @@ void ScenePreprocessor::ProcessAnimation (aiAnimation* anim)
                     q.mTime  = 0.;
                     q.mTime  = 0.;
                     q.mValue = scaling;
                     q.mValue = scaling;
 
 
-                    ASSIMP_LOG_DEBUG("ScenePreprocessor: Dummy scaling track has been generated");
+                    ASSIMP_LOG_VERBOSE_DEBUG("ScenePreprocessor: Dummy scaling track has been generated");
                 } else {
                 } else {
                     ai_assert(channel->mScalingKeys);
                     ai_assert(channel->mScalingKeys);
                 }
                 }
@@ -255,7 +255,7 @@ void ScenePreprocessor::ProcessAnimation (aiAnimation* anim)
                     q.mTime  = 0.;
                     q.mTime  = 0.;
                     q.mValue = position;
                     q.mValue = position;
 
 
-                    ASSIMP_LOG_DEBUG("ScenePreprocessor: Dummy position track has been generated");
+                    ASSIMP_LOG_VERBOSE_DEBUG("ScenePreprocessor: Dummy position track has been generated");
                 } else {
                 } else {
                     ai_assert(channel->mPositionKeys);
                     ai_assert(channel->mPositionKeys);
                 }
                 }
@@ -264,7 +264,7 @@ void ScenePreprocessor::ProcessAnimation (aiAnimation* anim)
     }
     }
 
 
     if (anim->mDuration == -1.)     {
     if (anim->mDuration == -1.)     {
-        ASSIMP_LOG_DEBUG("ScenePreprocessor: Setting animation duration");
+        ASSIMP_LOG_VERBOSE_DEBUG("ScenePreprocessor: Setting animation duration");
         anim->mDuration = last - std::min( first, 0. );
         anim->mDuration = last - std::min( first, 0. );
     }
     }
 }
 }

+ 3 - 3
code/Common/Subdivision.cpp

@@ -181,7 +181,7 @@ void CatmullClarkSubdivider::Subdivide (
         aiMesh* i = smesh[s];
         aiMesh* i = smesh[s];
         // FIX - mPrimitiveTypes might not yet be initialized
         // FIX - mPrimitiveTypes might not yet be initialized
         if (i->mPrimitiveTypes && (i->mPrimitiveTypes & (aiPrimitiveType_LINE|aiPrimitiveType_POINT))==i->mPrimitiveTypes) {
         if (i->mPrimitiveTypes && (i->mPrimitiveTypes & (aiPrimitiveType_LINE|aiPrimitiveType_POINT))==i->mPrimitiveTypes) {
-            ASSIMP_LOG_DEBUG("Catmull-Clark Subdivider: Skipping pure line/point mesh");
+            ASSIMP_LOG_VERBOSE_DEBUG("Catmull-Clark Subdivider: Skipping pure line/point mesh");
 
 
             if (discard_input) {
             if (discard_input) {
                 out[s] = i;
                 out[s] = i;
@@ -346,7 +346,7 @@ void CatmullClarkSubdivider::InternSubdivide (
         // Report the number of bad edges. bad edges are referenced by less than two
         // Report the number of bad edges. bad edges are referenced by less than two
         // faces in the mesh. They occur at outer model boundaries in non-closed
         // faces in the mesh. They occur at outer model boundaries in non-closed
         // shapes.
         // shapes.
-        ASSIMP_LOG_DEBUG_F("Catmull-Clark Subdivider: got ", bad_cnt, " bad edges touching only one face (totally ", 
+        ASSIMP_LOG_VERBOSE_DEBUG_F("Catmull-Clark Subdivider: got ", bad_cnt, " bad edges touching only one face (totally ", 
             static_cast<unsigned int>(edges.size()), " edges). ");
             static_cast<unsigned int>(edges.size()), " edges). ");
     }}
     }}
 
 
@@ -405,7 +405,7 @@ void CatmullClarkSubdivider::InternSubdivide (
                     }
                     }
                     ai_assert(haveit);
                     ai_assert(haveit);
                     if (!haveit) {
                     if (!haveit) {
-                        ASSIMP_LOG_DEBUG("Catmull-Clark Subdivider: Index not used");
+                        ASSIMP_LOG_VERBOSE_DEBUG("Catmull-Clark Subdivider: Index not used");
                     }
                     }
                     break;
                     break;
                 }
                 }

+ 4 - 4
code/PostProcessing/ArmaturePopulate.cpp

@@ -82,7 +82,7 @@ void ArmaturePopulate::Execute(aiScene *out) {
     for (std::pair<aiBone *, aiNode *> kvp : bone_stack) {
     for (std::pair<aiBone *, aiNode *> kvp : bone_stack) {
         aiBone *bone = kvp.first;
         aiBone *bone = kvp.first;
         aiNode *bone_node = kvp.second;
         aiNode *bone_node = kvp.second;
-        ASSIMP_LOG_DEBUG_F("active node lookup: ", bone->mName.C_Str());
+        ASSIMP_LOG_VERBOSE_DEBUG_F("active node lookup: ", bone->mName.C_Str());
         // lcl transform grab - done in generate_nodes :)
         // lcl transform grab - done in generate_nodes :)
 
 
         // bone->mOffsetMatrix = bone_node->mTransformation;
         // bone->mOffsetMatrix = bone_node->mTransformation;
@@ -178,7 +178,7 @@ void ArmaturePopulate::BuildBoneStack(aiNode *,
         if (node == nullptr) {
         if (node == nullptr) {
             node_stack.clear();
             node_stack.clear();
             BuildNodeList(root_node, node_stack);
             BuildNodeList(root_node, node_stack);
-            ASSIMP_LOG_DEBUG_F("Resetting bone stack: nullptr element ", bone->mName.C_Str());
+      ASSIMP_LOG_VERBOSE_DEBUG_F("Resetting bone stack: nullptr element ", bone->mName.C_Str());
 
 
             node = GetNodeFromStack(bone->mName, node_stack);
             node = GetNodeFromStack(bone->mName, node_stack);
 
 
@@ -188,7 +188,7 @@ void ArmaturePopulate::BuildBoneStack(aiNode *,
             }
             }
         }
         }
 
 
-        ASSIMP_LOG_DEBUG_F("Successfully added bone[", bone->mName.C_Str(), "] to stack and bone node is: ", node->mName.C_Str());
+    ASSIMP_LOG_VERBOSE_DEBUG_F("Successfully added bone[", bone->mName.C_Str(), "] to stack and bone node is: ", node->mName.C_Str());
 
 
         bone_stack.insert(std::pair<aiBone *, aiNode *>(bone, node));
         bone_stack.insert(std::pair<aiBone *, aiNode *>(bone, node));
     }
     }
@@ -202,7 +202,7 @@ aiNode *ArmaturePopulate::GetArmatureRoot(aiNode *bone_node,
                                           std::vector<aiBone *> &bone_list) {
                                           std::vector<aiBone *> &bone_list) {
     while (bone_node) {
     while (bone_node) {
         if (!IsBoneNode(bone_node->mName, bone_list)) {
         if (!IsBoneNode(bone_node->mName, bone_list)) {
-            ASSIMP_LOG_DEBUG_F("GetArmatureRoot() Found valid armature: ", bone_node->mName.C_Str());
+      ASSIMP_LOG_VERBOSE_DEBUG_F("GetArmatureRoot() Found valid armature: ", bone_node->mName.C_Str());
             return bone_node;
             return bone_node;
         }
         }
 
 

+ 1 - 1
code/PostProcessing/ConvertToLHProcess.cpp

@@ -299,7 +299,7 @@ void FlipUVsProcess::ProcessMaterial (aiMaterial* _mat)
     for (unsigned int a = 0; a < mat->mNumProperties;++a)   {
     for (unsigned int a = 0; a < mat->mNumProperties;++a)   {
         aiMaterialProperty* prop = mat->mProperties[a];
         aiMaterialProperty* prop = mat->mProperties[a];
         if( !prop ) {
         if( !prop ) {
-            ASSIMP_LOG_DEBUG( "Property is null" );
+            ASSIMP_LOG_VERBOSE_DEBUG( "Property is null" );
             continue;
             continue;
         }
         }
 
 

+ 1 - 1
code/PostProcessing/FindDegenerates.cpp

@@ -289,7 +289,7 @@ evil_jump_outside:
         if (!mesh->mNumFaces) {
         if (!mesh->mNumFaces) {
             //The whole mesh consists of degenerated faces
             //The whole mesh consists of degenerated faces
             //signal upward, that this mesh should be deleted.
             //signal upward, that this mesh should be deleted.
-            ASSIMP_LOG_DEBUG("FindDegeneratesProcess removed a mesh full of degenerated primitives");
+            ASSIMP_LOG_VERBOSE_DEBUG("FindDegeneratesProcess removed a mesh full of degenerated primitives");
             return true;
             return true;
         }
         }
     }
     }

+ 1 - 1
code/PostProcessing/ImproveCacheLocality.cpp

@@ -355,7 +355,7 @@ ai_real ImproveCacheLocalityProcess::ProcessMesh( aiMesh* pMesh, unsigned int me
 
 
         // very intense verbose logging ... prepare for much text if there are many meshes
         // very intense verbose logging ... prepare for much text if there are many meshes
         if ( DefaultLogger::get()->getLogSeverity() == Logger::VERBOSE) {
         if ( DefaultLogger::get()->getLogSeverity() == Logger::VERBOSE) {
-            ASSIMP_LOG_DEBUG_F("Mesh %u | ACMR in: ", meshNum, " out: ", fACMR, " | ~", fACMR2, ((fACMR - fACMR2) / fACMR) * 100.f);
+            ASSIMP_LOG_VERBOSE_DEBUG_F("Mesh %u | ACMR in: ", meshNum, " out: ", fACMR, " | ~", fACMR2, ((fACMR - fACMR2) / fACMR) * 100.f);
         }
         }
 
 
         fACMR2 *= pMesh->mNumFaces;
         fACMR2 *= pMesh->mNumFaces;

+ 1 - 1
code/PostProcessing/JoinVerticesProcess.cpp

@@ -373,7 +373,7 @@ int JoinVerticesProcess::ProcessMesh( aiMesh* pMesh, unsigned int meshIndex)
     }
     }
 
 
     if (!DefaultLogger::isNullLogger() && DefaultLogger::get()->getLogSeverity() == Logger::VERBOSE)    {
     if (!DefaultLogger::isNullLogger() && DefaultLogger::get()->getLogSeverity() == Logger::VERBOSE)    {
-        ASSIMP_LOG_DEBUG_F(
+        ASSIMP_LOG_VERBOSE_DEBUG_F(
             "Mesh ",meshIndex,
             "Mesh ",meshIndex,
             " (",
             " (",
             (pMesh->mName.length ? pMesh->mName.data : "unnamed"),
             (pMesh->mName.length ? pMesh->mName.data : "unnamed"),

+ 1 - 1
code/PostProcessing/RemoveRedundantMaterials.cpp

@@ -122,7 +122,7 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene)
 
 
                         // Keep this material even if no mesh references it
                         // Keep this material even if no mesh references it
                         abReferenced[i] = true;
                         abReferenced[i] = true;
-                        ASSIMP_LOG_DEBUG_F( "Found positive match in exclusion list: \'", name.data, "\'");
+                        ASSIMP_LOG_VERBOSE_DEBUG_F( "Found positive match in exclusion list: \'", name.data, "\'");
                     }
                     }
                 }
                 }
             }
             }

+ 1 - 1
include/assimp/DefaultLogger.hpp

@@ -141,7 +141,7 @@ private:
     /** @briefDestructor    */
     /** @briefDestructor    */
     ~DefaultLogger();
     ~DefaultLogger();
 
 
-    /** @brief  Logs debug infos, only been written when severity level DEBUG is set */
+    /** @brief  Logs debug infos, only been written when severity level DEBUG or higher is set */
     void OnDebug(const char* message);
     void OnDebug(const char* message);
 
 
     /** @brief  Logs debug infos, only been written when severity level VERBOSE is set */
     /** @brief  Logs debug infos, only been written when severity level VERBOSE is set */