Use external ETextureParams.

OpenXRay · Jan 25, 2018 · 303d9bf · 303d9bf
1 parent 20302a8
commit 303d9bf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 435 deletions.
diff --git a/src/utils/xrDXT/DXT.cpp b/src/utils/xrDXT/DXT.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "dxtlib.h"
 #include <nvtt/nvtt.h>
-#include "ETextureParams.h"
+#include "Layers/xrRender/ETextureParams.h"
 //#include "dds.h"
 
 //BOOL APIENTRY DllMain(HANDLE hModule, u32 ul_reason_for_call, LPVOID lpReserved) { return TRUE; }

diff --git a/src/utils/xrDXT/DXT.vcxproj b/src/utils/xrDXT/DXT.vcxproj
@@ -131,13 +131,13 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\Layers\xrRender\ETextureParams.h" />
     <ClInclude Include="dds\ConvertColor.h" />
     <ClInclude Include="dds\ddsTypes.h" />
     <ClInclude Include="dds\nvErrorCodes.h" />
     <ClInclude Include="dds\tPixel.h" />
     <ClInclude Include="dds\tVector.h" />
     <ClInclude Include="dxtlib.h" />
-    <ClInclude Include="ETextureParams.h" />
     <ClInclude Include="Image_DXTC.h" />
     <ClInclude Include="NV_Common.h" />
     <ClInclude Include="NVI_Convolution.h" />
@@ -146,8 +146,8 @@
     <ClInclude Include="StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\Layers\xrRender\ETextureParams.cpp" />
     <ClCompile Include="DXT.cpp" />
-    <ClCompile Include="ETextureParams.cpp" />
     <ClCompile Include="Image_DXTC.cpp" />
     <ClCompile Include="NormalMapGen.cpp" />
     <ClCompile Include="NVI_Convolution.cpp" />

diff --git a/src/utils/xrDXT/DXT.vcxproj.filters b/src/utils/xrDXT/DXT.vcxproj.filters
@@ -12,9 +12,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ETextureParams.h">
-      <Filter>Shared</Filter>
-    </ClInclude>
     <ClInclude Include="Image_DXTC.h">
       <Filter>NormalMap</Filter>
     </ClInclude>
@@ -37,14 +34,14 @@
     <ClInclude Include="dxtlib.h">
       <Filter>Convert</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Layers\xrRender\ETextureParams.h">
+      <Filter>Shared</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="DXT.cpp">
       <Filter>Convert</Filter>
     </ClCompile>
-    <ClCompile Include="ETextureParams.cpp">
-      <Filter>Shared</Filter>
-    </ClCompile>
     <ClCompile Include="Image_DXTC.cpp">
       <Filter>NormalMap</Filter>
     </ClCompile>
@@ -58,5 +55,8 @@
       <Filter>NormalMap</Filter>
     </ClCompile>
     <ClCompile Include="StdAfx.cpp" />
+    <ClCompile Include="..\..\Layers\xrRender\ETextureParams.cpp">
+      <Filter>Shared</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/src/utils/xrDXT/ETextureParams.cpp b/src/utils/xrDXT/ETextureParams.cpp