Use one LevelCompilerLogger for all modules.

OpenXRay · Jan 24, 2018 · 5d4b21a · 5d4b21a
1 parent f92f37b
commit 5d4b21a
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 82 deletions.
diff --git a/src/utils/xrAI/xrAI.cpp b/src/utils/xrAI/xrAI.cpp
@@ -17,7 +17,7 @@
 Factory_Create* create_entity = 0;
 Factory_Destroy* destroy_entity = 0;
 
-LevelCompilerLoggerWindow& Logger = LevelCompilerLoggerWindow();
+LevelCompilerLoggerWindow& Logger = LevelCompilerLoggerWindow::instance();
 
 CThread::LogFunc ProxyMsg = cdecl_cast([](const char* format, ...) {
     va_list args;

diff --git a/src/utils/xrDO_Light/xrDO_Light.cpp b/src/utils/xrDO_Light/xrDO_Light.cpp
@@ -10,7 +10,7 @@
 #pragma comment(lib, "comctl32.lib")
 #pragma comment(lib, "winmm.LIB")
 
-ILevelCompilerLogger& Logger = LevelCompilerLoggerWindow();
+ILevelCompilerLogger& Logger = LevelCompilerLoggerWindow::instance();
 
 CThread::LogFunc ProxyMsg = cdecl_cast([](const char* format, ...) {
     va_list args;

diff --git a/src/utils/xrLC/xrLC.cpp b/src/utils/xrLC/xrLC.cpp
@@ -13,7 +13,7 @@
 
 CBuild* pBuild = NULL;
 u32 version = 0;
-ILevelCompilerLogger& Logger = LevelCompilerLoggerWindow();
+ILevelCompilerLogger& Logger = LevelCompilerLoggerWindow::instance();
 
 CThread::LogFunc ProxyMsg = cdecl_cast([](const char* format, ...) {
     va_list args;

diff --git a/src/utils/xrLCUtil/LevelCompilerLoggerConsole.cpp b/src/utils/xrLCUtil/LevelCompilerLoggerConsole.cpp
diff --git a/src/utils/xrLCUtil/LevelCompilerLoggerConsole.hpp b/src/utils/xrLCUtil/LevelCompilerLoggerConsole.hpp
diff --git a/src/utils/xrLCUtil/LevelCompilerLoggerWindow.cpp b/src/utils/xrLCUtil/LevelCompilerLoggerWindow.cpp
@@ -252,3 +252,9 @@ void LevelCompilerLoggerWindow::Success(const char* msg)
 
 void LevelCompilerLoggerWindow::Failure(const char* msg) { MessageBox(logWindow, msg, "Error!", MB_OK | MB_ICONERROR); }
 HWND LevelCompilerLoggerWindow::GetWindow() const { return logWindow; }
+
+LevelCompilerLoggerWindow & LevelCompilerLoggerWindow::instance()
+{
+    static LevelCompilerLoggerWindow instance;
+    return instance;
+}
diff --git a/src/utils/xrLCUtil/LevelCompilerLoggerWindow.hpp b/src/utils/xrLCUtil/LevelCompilerLoggerWindow.hpp
@@ -29,8 +29,9 @@ class XRLCUTIL_API LevelCompilerLoggerWindow : public ILevelCompilerLogger
     bool bPhaseChange = false;
     u32 phase_total_time = 0;
 
-public:
+protected:
     LevelCompilerLoggerWindow();
+public:
     virtual void Initialize(const char* name) override;
     virtual void Destroy() override;
     virtual void clMsg(const char* format, ...) override;
@@ -43,6 +44,7 @@ class XRLCUTIL_API LevelCompilerLoggerWindow : public ILevelCompilerLogger
     virtual void Success(const char* msg) override;
     virtual void Failure(const char* msg) override;
     HWND GetWindow() const;
+    static LevelCompilerLoggerWindow& instance();
 
 private:
     static void LogThreadProc(void* context);

diff --git a/src/utils/xrLCUtil/xrLCUtil.vcxproj b/src/utils/xrLCUtil/xrLCUtil.vcxproj
@@ -158,7 +158,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="LevelCompilerLoggerConsole.cpp" />
     <ClCompile Include="LevelCompilerLoggerWindow.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -181,7 +180,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ILevelCompilerLogger.hpp" />
-    <ClInclude Include="LevelCompilerLoggerConsole.hpp" />
     <ClInclude Include="LevelCompilerLoggerWindow.hpp" />
     <ClInclude Include="pch.hpp" />
     <ClInclude Include="xrThread.hpp" />

diff --git a/src/utils/xrLCUtil/xrLCUtil.vcxproj.filters b/src/utils/xrLCUtil/xrLCUtil.vcxproj.filters
@@ -24,9 +24,6 @@
     <ClCompile Include="LevelCompilerLoggerWindow.cpp">
       <Filter>Log</Filter>
     </ClCompile>
-    <ClCompile Include="LevelCompilerLoggerConsole.cpp">
-      <Filter>Log</Filter>
-    </ClCompile>
     <ClCompile Include="xrLCUtil.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -45,9 +42,6 @@
     <ClInclude Include="LevelCompilerLoggerWindow.hpp">
       <Filter>Log</Filter>
     </ClInclude>
-    <ClInclude Include="LevelCompilerLoggerConsole.hpp">
-      <Filter>Log</Filter>
-    </ClInclude>
     <ClInclude Include="xrLCUtil.hpp" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/utils/xrLC_Light/compiler.cpp b/src/utils/xrLC_Light/compiler.cpp
@@ -15,6 +15,7 @@ void xrLight()
     // Start threads, wait, continue --- perform all the work
     CThreadManager Threads(ProxyStatus, ProxyProgress);
     CTimer start_time;
+    start_time.Start();
     u32 stride = range / NUM_THREADS;
     u32 last = range - stride * (NUM_THREADS - 1);
     for (u32 thID = 0; thID < NUM_THREADS; thID++)

diff --git a/src/utils/xrLC_Light/stdafx.cpp b/src/utils/xrLC_Light/stdafx.cpp
@@ -3,9 +3,9 @@
 // stdafx.obj will contain the pre-compiled type information
 
 #include "stdafx.h"
-#include "utils/xrLCUtil/LevelCompilerLoggerConsole.hpp"
+#include "utils/xrLCUtil/LevelCompilerLoggerWindow.hpp"
 
-ILevelCompilerLogger& Logger = LevelCompilerLoggerConsole();
+ILevelCompilerLogger& Logger = LevelCompilerLoggerWindow::instance();
 
 CThread::LogFunc ProxyMsg = cdecl_cast([](const char* format, ...) {
     va_list args;