Fix hung at startup for xrLC. And fix some warnings. Now it works wit…

…h some reservations.
OpenXRay · Jan 8, 2018 · 9d8ae19 · 9d8ae19
1 parent c1a83c5
commit 9d8ae19
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 35 deletions.
diff --git a/src/utils/ETools/ETools.cpp b/src/utils/ETools/ETools.cpp
@@ -9,13 +9,13 @@ BOOL APIENTRY DllMain(HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
     switch (fdwReason)
     {
     case DLL_PROCESS_ATTACH:
-        xrDebug::Initialize(false);
-        Core.Initialize("XRayEditorTools", 0, FALSE);
+        //xrDebug::Initialize(false);
+        //Core.Initialize("XRayEditorTools", 0, FALSE);
         // FPU::m64r	();
         break;
     case DLL_THREAD_ATTACH: break;
     case DLL_THREAD_DETACH: break;
-    case DLL_PROCESS_DETACH: Core._destroy(); break;
+    case DLL_PROCESS_DETACH: break;//Core._destroy(); break;
     }
     return TRUE;
 }

diff --git a/src/utils/xrDXT/DXT.cpp b/src/utils/xrDXT/DXT.cpp
@@ -1,10 +1,6 @@
 #include "stdafx.h"
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#pragma warning(disable : 4018)
 #include "dxtlib.h"
 #include <nvtt/nvtt.h>
-#pragma warning(pop)
 #include "ETextureParams.h"
 #include "dds.h"
 

diff --git a/src/utils/xrDXT/StdAfx.h b/src/utils/xrDXT/StdAfx.h
@@ -1,20 +1,9 @@
 #pragma once
 
-#include "Common/Common.hpp"
-#include "xrCore/xrCore.h"
-#include <io.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
 #define ENGINE_API
 #define XR_EPROPS_API
 #define ECORE_API
 
-#define USE_NVTT
-
-#ifndef MAKEFOURCC
-#define MAKEFOURCC(ch0, ch1, ch2, ch3)\
-    ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24))
-#endif // defined(MAKEFOURCC)
-
-#pragma warning(disable : 4995)
+#include "Common/Common.hpp"
+#include "xrCore/xrCore.h"
+#include <fcntl.h>
diff --git a/src/utils/xrDXT/dds/ddsTypes.h b/src/utils/xrDXT/dds/ddsTypes.h
@@ -117,15 +117,15 @@ enum nvSharpenFilterTypes
     kSharpenFilterCustom,
 };
 
-typedef enum nvMipMapGeneration
+enum nvMipMapGeneration
 {
     kGenerateMipMaps = 30,
     kUseExistingMipMaps = 31,
     kNoMipMaps = 32,
     kCompleteMipMapChain = 33, // fill in missing MIP maps
 };
 
-typedef enum nvMipFilterTypes
+enum nvMipFilterTypes
 {
     kMipFilterPoint,
     kMipFilterBox,

diff --git a/src/utils/xrDXT/dds/tPixel.h b/src/utils/xrDXT/dds/tPixel.h
@@ -5,8 +5,6 @@
 #include <dds/tVector.h>
 #include <dds/nvErrorCodes.h>
 
-#pragma warning(disable : 4201)
-
 namespace nv
 {
 // modulo value x between [lo,hi]

diff --git a/src/utils/xrLC/xrLC.cpp b/src/utils/xrLC/xrLC.cpp
@@ -8,10 +8,7 @@
 #include "utils/xrLCUtil/LevelCompilerLoggerWindow.hpp"
 #include "xrCore/ModuleLookup.hpp"
 
-#pragma comment(lib, "comctl32.lib")
 #pragma comment(lib, "d3dx9.lib")
-#pragma comment(lib, "IMAGEHLP.LIB")
-#pragma comment(lib, "winmm.LIB")
 #pragma comment(lib, "FreeImage.lib")
 
 CBuild* pBuild = NULL;

diff --git a/src/utils/xrLC_Light/fitter.cpp b/src/utils/xrLC_Light/fitter.cpp
@@ -95,7 +95,7 @@ void vfOptimizeParameters(xr_vector<xr_vector<REAL>>& A, xr_vector<xr_vector<REA
 
     if (dPreviousFunctional < dFunctional)
     {
-        std::transform(daDelta.begin(), daDelta.end(), daDelta.begin(), std::bind2nd(std::multiplies<REAL>(), -1));
+        std::transform(daDelta.begin(), daDelta.end(), daDelta.begin(), std::bind2nd(std::multiplies<REAL>(), -1.f));
         std::transform(C.begin(), C.end(), daDelta.begin(), C.begin(), std::plus<REAL>());
         std::transform(D.begin(), D.end(), daDelta.begin(), D.begin(), std::plus<REAL>());
     }

diff --git a/src/utils/xrLC_Light/xrLC_Light.cpp b/src/utils/xrLC_Light/xrLC_Light.cpp
@@ -21,11 +21,11 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
     {
     case DLL_PROCESS_ATTACH:
     {
-        xrDebug::Initialize(false);
-        bool init_log = (0 != xr_strcmp(Core.ApplicationName, "XRayEditorTools"));
-        Core.Initialize("xrLC_Light", 0, FALSE);
-        if (init_log)
-            CreateLog();
+        //xrDebug::Initialize(false);
+        //bool init_log = (0 != xr_strcmp(Core.ApplicationName, "XRayEditorTools"));
+        //Core.Initialize("xrLC_Light", 0, FALSE);
+        //if (init_log)
+            //CreateLog();
 
         // FPU::m64r ();
         break;
@@ -35,7 +35,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
     case DLL_PROCESS_DETACH:
         if (inlc_global_data())
             destroy_global_data();
-        Core._destroy();
+        //Core._destroy();
         break;
     }
     return TRUE;