unify(client): Move ParabolicEase, CameraShakeSystem to Core (#1904)

Author: xezon

Core/GameEngine/CMakeLists.txt

@@ -210,7 +210,7 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/Module/BeaconClientUpdate.h
 #    Include/GameClient/Module/SwayClientUpdate.h
 #    Include/GameClient/Mouse.h
-#    Include/GameClient/ParabolicEase.h
+    Include/GameClient/ParabolicEase.h
 #    Include/GameClient/ParticleSys.h
 #    Include/GameClient/PlaceEventTranslator.h
 #    Include/GameClient/ProcessAnimateWindow.h
@@ -815,7 +815,7 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/MessageStream/PlaceEventTranslator.cpp
 #    Source/GameClient/MessageStream/SelectionXlat.cpp
 #    Source/GameClient/MessageStream/WindowXlat.cpp
-#    Source/GameClient/ParabolicEase.cpp
+    Source/GameClient/ParabolicEase.cpp
 #    Source/GameClient/RadiusDecal.cpp
 #    Source/GameClient/SelectionInfo.cpp
 #    Source/GameClient/Snow.cpp

GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h renamed to Core/GameEngine/Include/GameClient/ParabolicEase.h

@@ -98,7 +98,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
 #    Source/W3DDevice/Common/W3DConvert.cpp
 #    Source/W3DDevice/GameClient/BaseHeightMap.cpp
-#    Source/W3DDevice/GameClient/camerashakesystem.cpp
+    Source/W3DDevice/GameClient/CameraShakeSystem.cpp
 #    Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
 #    Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
 #    Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/ParabolicEase.cpp renamed to Core/GameEngine/Source/GameClient/ParabolicEase.cpp

@@ -75,7 +75,7 @@
 #include "W3DDevice/GameClient/W3DPoly.h"
 #include "W3DDevice/GameClient/W3DCustomScene.h"
 
-#include "W3DDevice/GameClient/camerashakesystem.h"
+#include "W3DDevice/GameClient/CameraShakeSystem.h"
 #include "WW3D2/camera.h"
 
 //#include "W3DDevice/GameClient/camera.h"

Core/GameEngineDevice/CMakeLists.txt

@@ -206,7 +206,7 @@ set(GAMEENGINE_SRC
     Include/GameClient/Module/BeaconClientUpdate.h
     Include/GameClient/Module/SwayClientUpdate.h
     Include/GameClient/Mouse.h
-    Include/GameClient/ParabolicEase.h
+#    Include/GameClient/ParabolicEase.h
     Include/GameClient/ParticleSys.h
     Include/GameClient/PlaceEventTranslator.h
     Include/GameClient/ProcessAnimateWindow.h
@@ -807,7 +807,7 @@ set(GAMEENGINE_SRC
     Source/GameClient/MessageStream/PlaceEventTranslator.cpp
     Source/GameClient/MessageStream/SelectionXlat.cpp
     Source/GameClient/MessageStream/WindowXlat.cpp
-    Source/GameClient/ParabolicEase.cpp
+#    Source/GameClient/ParabolicEase.cpp
     Source/GameClient/RadiusDecal.cpp
     Source/GameClient/SelectionInfo.cpp
     Source/GameClient/Snow.cpp

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h renamed to Core/GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h

@@ -7,7 +7,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Include/W3DDevice/Common/W3DRadar.h
     Include/W3DDevice/Common/W3DThingFactory.h
     Include/W3DDevice/GameClient/BaseHeightMap.h
-    Include/W3DDevice/GameClient/camerashakesystem.h
+#    Include/W3DDevice/GameClient/camerashakesystem.h
     Include/W3DDevice/GameClient/FlatHeightMap.h
     Include/W3DDevice/GameClient/HeightMap.h
     Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h
@@ -98,7 +98,7 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
     Source/W3DDevice/Common/W3DConvert.cpp
     Source/W3DDevice/GameClient/BaseHeightMap.cpp
-    Source/W3DDevice/GameClient/camerashakesystem.cpp
+#    Source/W3DDevice/GameClient/camerashakesystem.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
     Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyModelDraw.cpp

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp renamed to Core/GameEngineDevice/Source/W3DDevice/GameClient/CameraShakeSystem.cpp

@@ -93,7 +93,7 @@
 #include "WW3D2/predlod.h"
 #include "WW3D2/ww3d.h"
 
-#include "W3DDevice/GameClient/camerashakesystem.h"
+#include "W3DDevice/GameClient/CameraShakeSystem.h"
 
 #include "WinMain.h"  /** @todo Remove this, it's only here because we
 													are using timeGetTime, but we can remove that

GeneralsMD/Code/GameEngine/CMakeLists.txt

@@ -180,6 +180,11 @@ def main():
     #unify_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h")
     #unify_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp")
 
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Include/GameClient/ParabolicEase.h", Game.CORE, "GameEngine/Include/GameClient/ParabolicEase.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngine/Source/GameClient/ParabolicEase.cpp", Game.CORE, "GameEngine/Source/GameClient/ParabolicEase.cpp")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h", Game.CORE, "GameEngineDevice/Include/W3DDevice/GameClient/CameraShakeSystem.h")
+    #unify_move_file(Game.ZEROHOUR, "GameEngineDevice/Source/W3DDevice/GameClient/camerashakesystem.cpp", Game.CORE, "GameEngineDevice/Source/W3DDevice/GameClient/CameraShakeSystem.cpp")
+
     return