Browse Source

Adds verbose logging in debug builds.
Properly disconnects the logging stream.

OTHGMars 6 năm trước cách đây
mục cha
commit
f0ccd8d079

+ 11 - 5
Engine/source/ts/assimp/assimpShapeLoader.cpp

@@ -177,11 +177,15 @@ void AssimpShapeLoader::enumerateScene()
    //aiSetImportPropertyFloat(props,     AI_CONFIG_PP_GSN_MAX_SMOOTHING_ANGLE,  80.f);
    //aiSetImportPropertyFloat(props,     AI_CONFIG_PP_GSN_MAX_SMOOTHING_ANGLE,  80.f);
    //aiSetImportPropertyInteger(props,AI_CONFIG_PP_PTV_KEEP_HIERARCHY,1);
    //aiSetImportPropertyInteger(props,AI_CONFIG_PP_PTV_KEEP_HIERARCHY,1);
 
 
-   struct aiLogStream c;
-   c = aiGetPredefinedLogStream(aiDefaultLogStream_FILE, "assimp.log");
-   aiAttachLogStream(&c);
-   c = aiGetPredefinedLogStream(aiDefaultLogStream_STDOUT, NULL);
-   aiAttachLogStream(&c);
+   struct aiLogStream shapeLog;
+   shapeLog = aiGetPredefinedLogStream(aiDefaultLogStream_FILE, "assimp.log");
+   aiAttachLogStream(&shapeLog);
+#ifdef TORQUE_DEBUG
+   aiEnableVerboseLogging(true);
+#endif
+
+   //c = aiGetPredefinedLogStream(aiDefaultLogStream_STDOUT, NULL);
+   //aiAttachLogStream(&c);
 
 
    // Attempt to import with Assimp.
    // Attempt to import with Assimp.
    //mScene = importer.ReadFile(shapePath.getFullPath().c_str(), (aiProcessPreset_TargetRealtime_Quality | aiProcess_FlipWindingOrder | aiProcess_FlipUVs | aiProcess_CalcTangentSpace)
    //mScene = importer.ReadFile(shapePath.getFullPath().c_str(), (aiProcessPreset_TargetRealtime_Quality | aiProcess_FlipWindingOrder | aiProcess_FlipUVs | aiProcess_CalcTangentSpace)
@@ -217,6 +221,8 @@ void AssimpShapeLoader::enumerateScene()
       TSShapeLoader::updateProgress(TSShapeLoader::Load_Complete, "Import failed");
       TSShapeLoader::updateProgress(TSShapeLoader::Load_Complete, "Import failed");
       Con::printf("[ASSIMP] Import Error: %s", aiGetErrorString());
       Con::printf("[ASSIMP] Import Error: %s", aiGetErrorString());
    }
    }
+
+   aiDetachLogStream(&shapeLog);
 }
 }
 
 
 void AssimpShapeLoader::processAnimations()
 void AssimpShapeLoader::processAnimations()