xrCore: move PPMd compressor to Compression folder

OpenXRay · Jul 1, 2018 · 9341e45 · 9341e45
1 parent a4b8c36
commit 9341e45
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 84 deletions.
diff --git a/src/xrCore/Coder.hpp → src/xrCore/Compression/Coder.hpp b/src/xrCore/Coder.hpp → src/xrCore/Compression/Coder.hpp
diff --git a/src/xrCore/Model.cpp → src/xrCore/Compression/Model.cpp b/src/xrCore/Model.cpp → src/xrCore/Compression/Model.cpp
diff --git a/src/xrCore/PPMd.h → src/xrCore/Compression/PPMd.h b/src/xrCore/PPMd.h → src/xrCore/Compression/PPMd.h
diff --git a/src/xrCore/PPMdType.h → src/xrCore/Compression/PPMdType.h b/src/xrCore/PPMdType.h → src/xrCore/Compression/PPMdType.h
diff --git a/src/xrCore/SubAlloc.hpp → src/xrCore/Compression/SubAlloc.hpp b/src/xrCore/SubAlloc.hpp → src/xrCore/Compression/SubAlloc.hpp
diff --git a/src/xrCore/compression_ppmd_stream.h → ...ore/Compression/compression_ppmd_stream.h b/src/xrCore/compression_ppmd_stream.h → ...ore/Compression/compression_ppmd_stream.h
diff --git a/src/xrCore/compression_ppmd_stream_inline.h → ...pression/compression_ppmd_stream_inline.h b/src/xrCore/compression_ppmd_stream_inline.h → ...pression/compression_ppmd_stream_inline.h
diff --git a/src/xrCore/ppmd_compressor.cpp → src/xrCore/Compression/ppmd_compressor.cpp b/src/xrCore/ppmd_compressor.cpp → src/xrCore/Compression/ppmd_compressor.cpp
diff --git a/src/xrCore/ppmd_compressor.h → src/xrCore/Compression/ppmd_compressor.h b/src/xrCore/ppmd_compressor.h → src/xrCore/Compression/ppmd_compressor.h
@@ -1,7 +1,7 @@
 #ifndef PPMD_COMPRESSOR_H
 #define PPMD_COMPRESSOR_H
 
-#include "fastdelegate.h"
+#include "xrCore/fastdelegate.h"
 
 namespace compression
 {

diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp
@@ -6,13 +6,15 @@
 #if defined(WINDOWS)
 #include <mmsystem.h>
 #include <objbase.h>
+#pragma comment(lib, "winmm.lib")
 #endif
 #include "xrCore.h"
 #include "Threading/ThreadPool.hpp"
 #include "Math/MathUtil.hpp"
 #include "xrCore/_std_extensions.h"
 
-#pragma comment(lib, "winmm.lib")
+#include "Compression/compression_ppmd_stream.h"
+extern compression::ppmd::stream* trained_model;
 
 XRCORE_API xrCore Core;
 
@@ -123,10 +125,6 @@ void xrCore::Initialize(pcstr _ApplicationName, LogCallback cb, bool init_fs, pc
     init_counter++;
 }
 
-#ifndef _EDITOR
-#include "compression_ppmd_stream.h"
-extern compression::ppmd::stream* trained_model;
-#endif
 void xrCore::_destroy()
 {
     --init_counter;
@@ -138,14 +136,12 @@ void xrCore::_destroy()
         xr_FS.reset();
         xr_EFS.reset();
 
-#ifndef _EDITOR
         if (trained_model)
         {
             void* buffer = trained_model->buffer();
             xr_free(buffer);
             xr_delete(trained_model);
         }
-#endif
         xr_free(Params);
         Memory._destroy();
     }

diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj
@@ -192,6 +192,10 @@
     <ClCompile Include="Animation\SkeletonMotions.cpp" />
     <ClCompile Include="clsid.cpp" />
     <ClCompile Include="Compression\lzo_compressor.cpp" />
+    <ClCompile Include="Compression\Model.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Compression\ppmd_compressor.cpp" />
     <ClCompile Include="Compression\rt_compressor.cpp" />
     <ClCompile Include="Compression\rt_compressor9.cpp" />
     <ClCompile Include="cpuid.cpp" />
@@ -221,31 +225,10 @@
     <ClCompile Include="Math\SkinXW_SSE.cpp" />
     <ClCompile Include="Math\MathUtil.cpp" />
     <ClCompile Include="Media\Image.cpp" />
-    <ClCompile Include="Model.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TurnOffAllWarnings</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
-      </PrecompiledHeader>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">TurnOffAllWarnings</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">TurnOffAllWarnings</WarningLevel>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
-    </ClCompile>
     <ClCompile Include="NET_utils.cpp" />
     <ClCompile Include="os_clipboard.cpp" />
     <ClCompile Include="PostProcess\PostProcess.cpp" />
     <ClCompile Include="PostProcess\PPInfo.cpp" />
-    <ClCompile Include="ppmd_compressor.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -302,11 +285,15 @@
     <ClInclude Include="buffer_vector_inline.h" />
     <ClInclude Include="cdecl_cast.hpp" />
     <ClInclude Include="clsid.h" />
-    <ClInclude Include="Coder.hpp" />
+    <ClInclude Include="Compression\Coder.hpp" />
+    <ClInclude Include="Compression\compression_ppmd_stream.h" />
+    <ClInclude Include="Compression\compression_ppmd_stream_inline.h" />
     <ClInclude Include="Compression\lzo_compressor.h" />
+    <ClInclude Include="Compression\PPMd.h" />
+    <ClInclude Include="Compression\PPMdType.h" />
+    <ClInclude Include="Compression\ppmd_compressor.h" />
     <ClInclude Include="Compression\rt_compressor.h" />
-    <ClInclude Include="compression_ppmd_stream.h" />
-    <ClInclude Include="compression_ppmd_stream_inline.h" />
+    <ClInclude Include="Compression\SubAlloc.hpp" />
     <ClInclude Include="Containers\AssociativeVector.hpp" />
     <ClInclude Include="Containers\AssociativeVectorComparer.hpp" />
     <ClInclude Include="cpuid.h" />
@@ -347,16 +334,12 @@
     <ClInclude Include="os_clipboard.h" />
     <ClInclude Include="PostProcess\PostProcess.hpp" />
     <ClInclude Include="PostProcess\PPInfo.hpp" />
-    <ClInclude Include="PPMd.h" />
-    <ClInclude Include="PPMdType.h" />
-    <ClInclude Include="ppmd_compressor.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="stream_reader.h" />
     <ClInclude Include="stream_reader_inline.h" />
     <ClInclude Include="string_concatenations.h" />
     <ClInclude Include="string_concatenations_inline.h" />
-    <ClInclude Include="SubAlloc.hpp" />
     <ClInclude Include="Text\MbHelpers.h" />
     <ClInclude Include="Threading\Event.hpp" />
     <ClInclude Include="Threading\ScopeLock.hpp" />

diff --git a/src/xrCore/xrCore.vcxproj.filters b/src/xrCore/xrCore.vcxproj.filters
@@ -109,6 +109,9 @@
     <Filter Include="Memory">
       <UniqueIdentifier>{0173b19d-898c-495c-8d22-2cc3d8436008}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Compression\lzo">
+      <UniqueIdentifier>{c6342a66-65de-47b5-afe5-c51a7383edc0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="FTimer.cpp">
@@ -192,12 +195,6 @@
     <ClCompile Include="xrstring.cpp">
       <Filter>shared memory/string library</Filter>
     </ClCompile>
-    <ClCompile Include="ppmd_compressor.cpp">
-      <Filter>Compression\ppmd</Filter>
-    </ClCompile>
-    <ClCompile Include="Model.cpp">
-      <Filter>Compression\ppmd\core</Filter>
-    </ClCompile>
     <ClCompile Include="LzHuf.cpp">
       <Filter>Compression\lz</Filter>
     </ClCompile>
@@ -276,15 +273,6 @@
     <ClCompile Include="XML\XMLDocument.cpp">
       <Filter>XML</Filter>
     </ClCompile>
-    <ClCompile Include="Compression\lzo_compressor.cpp">
-      <Filter>Compression</Filter>
-    </ClCompile>
-    <ClCompile Include="Compression\rt_compressor.cpp">
-      <Filter>Compression</Filter>
-    </ClCompile>
-    <ClCompile Include="Compression\rt_compressor9.cpp">
-      <Filter>Compression</Filter>
-    </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <Filter>PCH</Filter>
     </ClCompile>
@@ -306,6 +294,21 @@
     <ClCompile Include="Threading\ScopeLock.cpp">
       <Filter>Threading</Filter>
     </ClCompile>
+    <ClCompile Include="Compression\Model.cpp">
+      <Filter>Compression\ppmd\core</Filter>
+    </ClCompile>
+    <ClCompile Include="Compression\ppmd_compressor.cpp">
+      <Filter>Compression\ppmd</Filter>
+    </ClCompile>
+    <ClCompile Include="Compression\rt_compressor9.cpp">
+      <Filter>Compression\lzo</Filter>
+    </ClCompile>
+    <ClCompile Include="Compression\lzo_compressor.cpp">
+      <Filter>Compression\lzo</Filter>
+    </ClCompile>
+    <ClCompile Include="Compression\rt_compressor.cpp">
+      <Filter>Compression\lzo</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FTimer.h">
@@ -482,27 +485,6 @@
     <ClInclude Include="intrusive_ptr.h">
       <Filter>intrusive_ptr</Filter>
     </ClInclude>
-    <ClInclude Include="ppmd_compressor.h">
-      <Filter>Compression\ppmd</Filter>
-    </ClInclude>
-    <ClInclude Include="PPMd.h">
-      <Filter>Compression\ppmd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="PPMdType.h">
-      <Filter>Compression\ppmd\common</Filter>
-    </ClInclude>
-    <ClInclude Include="Coder.hpp">
-      <Filter>Compression\ppmd\core</Filter>
-    </ClInclude>
-    <ClInclude Include="SubAlloc.hpp">
-      <Filter>Compression\ppmd\core\allocator</Filter>
-    </ClInclude>
-    <ClInclude Include="compression_ppmd_stream.h">
-      <Filter>Compression\ppmd\stream</Filter>
-    </ClInclude>
-    <ClInclude Include="compression_ppmd_stream_inline.h">
-      <Filter>Compression\ppmd\stream</Filter>
-    </ClInclude>
     <ClInclude Include="lzhuf.h">
       <Filter>Compression\lz</Filter>
     </ClInclude>
@@ -635,12 +617,6 @@
     <ClInclude Include="XML\XMLDocument.hpp">
       <Filter>XML</Filter>
     </ClInclude>
-    <ClInclude Include="Compression\lzo_compressor.h">
-      <Filter>Compression</Filter>
-    </ClInclude>
-    <ClInclude Include="Compression\rt_compressor.h">
-      <Filter>Compression</Filter>
-    </ClInclude>
     <ClInclude Include="stdafx.h">
       <Filter>PCH</Filter>
     </ClInclude>
@@ -674,6 +650,33 @@
     <ClInclude Include="Threading\ScopeLock.hpp">
       <Filter>Threading</Filter>
     </ClInclude>
+    <ClInclude Include="Compression\SubAlloc.hpp">
+      <Filter>Compression\ppmd\core\allocator</Filter>
+    </ClInclude>
+    <ClInclude Include="Compression\Coder.hpp">
+      <Filter>Compression\ppmd\core</Filter>
+    </ClInclude>
+    <ClInclude Include="Compression\PPMd.h">
+      <Filter>Compression\ppmd\common</Filter>
+    </ClInclude>
+    <ClInclude Include="Compression\PPMdType.h">
+      <Filter>Compression\ppmd\common</Filter>
+    </ClInclude>
+    <ClInclude Include="Compression\compression_ppmd_stream.h">
+      <Filter>Compression\ppmd\stream</Filter>
+    </ClInclude>
+    <ClInclude Include="Compression\compression_ppmd_stream_inline.h">
+      <Filter>Compression\ppmd\stream</Filter>
+    </ClInclude>
+    <ClInclude Include="Compression\ppmd_compressor.h">
+      <Filter>Compression\ppmd</Filter>
+    </ClInclude>
+    <ClInclude Include="Compression\lzo_compressor.h">
+      <Filter>Compression\lzo</Filter>
+    </ClInclude>
+    <ClInclude Include="Compression\rt_compressor.h">
+      <Filter>Compression\lzo</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xrCore.rc">

diff --git a/src/xrGame/Level_network_compressed_updates.cpp b/src/xrGame/Level_network_compressed_updates.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Level.h"
-#include "xrCore/ppmd_compressor.h"
+#include "xrCore/Compression/ppmd_compressor.h"
 #include "xrPhysics/iphworld.h"
 #include "xrServer_updates_compressor.h"
 

diff --git a/src/xrGame/configs_dumper.cpp b/src/xrGame/configs_dumper.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "configs_dumper.h"
 #include "configs_common.h"
-#include "xrCore/ppmd_compressor.h"
+#include "xrCore/Compression/ppmd_compressor.h"
 #include "xrCore/xr_ini.h"
 #include "xrCore/buffer_vector.h"
 #include "GameObject.h"

diff --git a/src/xrGame/game_cl_mp.cpp b/src/xrGame/game_cl_mp.cpp
@@ -32,7 +32,7 @@
 #include "RegistryFuncs.h"
 #include "xrGameSpy/xrGameSpy_MainDefs.h"
 #include "screenshot_server.h"
-#include "xrCore/ppmd_compressor.h"
+#include "xrCore/Compression/ppmd_compressor.h"
 #include "xrCore/Compression/rt_compressor.h"
 #include "game_cl_mp_snd_messages.h"
 

diff --git a/src/xrGame/screenshot_manager.cpp b/src/xrGame/screenshot_manager.cpp
@@ -2,7 +2,7 @@
 #include "screenshot_manager.h"
 #include "Level.h"
 #include "game_cl_mp.h"
-#include "xrCore/ppmd_compressor.h"
+#include "xrCore/Compression/ppmd_compressor.h"
 #include "screenshots_writer.h"
 
 #ifdef DEBUG

diff --git a/src/xrGame/traffic_optimization.h b/src/xrGame/traffic_optimization.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/compression_ppmd_stream.h"
+#include "xrCore/Compression/compression_ppmd_stream.h"
 #include "xrCore/Compression/lzo_compressor.h"
 
 namespace compression

diff --git a/src/xrGame/xrServer_updates_compressor.cpp b/src/xrGame/xrServer_updates_compressor.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Level.h"
 #include "xrServer_updates_compressor.h"
-#include "xrCore/ppmd_compressor.h"
+#include "xrCore/Compression/ppmd_compressor.h"
 #include "Common/object_broker.h"
 #include "xrMessages.h"