From 784bb6ff22944ab748c1dbe7362cb989368fcdac Mon Sep 17 00:00:00 2001
From: elexis <elexis@3db68df2-c116-0410-a063-a993310a9797>
Date: Fri, 14 Apr 2017 23:20:49 +0000
Subject: [PATCH] Move CinemaPath class to the simulation helper directory,
 because it contains predominantly simulation data that is already serialized.
 The remaining graphics code should be moved or removed.

Differential Revision: https://code.wildfiregames.com/D324
Patch By: Vladislav



git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@19414 3db68df2-c116-0410-a063-a993310a9797
---
 source/graphics/CinemaManager.h                         |  2 +-
 source/ps/GameSetup/GameSetup.cpp                       |  1 -
 source/simulation2/components/ICmpCinemaManager.h       |  2 +-
 source/{graphics => simulation2/helpers}/CinemaPath.cpp | 12 +-----------
 source/{graphics => simulation2/helpers}/CinemaPath.h   |  2 --
 5 files changed, 3 insertions(+), 16 deletions(-)
 rename source/{graphics => simulation2/helpers}/CinemaPath.cpp (96%)
 rename source/{graphics => simulation2/helpers}/CinemaPath.h (98%)

diff --git a/source/graphics/CinemaManager.h b/source/graphics/CinemaManager.h
index 087c12c9d5..0b07c24b85 100644
--- a/source/graphics/CinemaManager.h
+++ b/source/graphics/CinemaManager.h
@@ -24,7 +24,7 @@
 
 #include "lib/input.h" // InReaction - can't forward-declare enum
 
-#include "graphics/CinemaPath.h"
+#include "simulation2/helpers/CinemaPath.h"
 #include "ps/CStr.h"
 #include "ps/Shapes.h"
 
diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index b834b630e6..c85383fe03 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -36,7 +36,6 @@
 #endif
 
 #include "graphics/CinemaManager.h"
-#include "graphics/CinemaPath.h"
 #include "graphics/FontMetrics.h"
 #include "graphics/GameView.h"
 #include "graphics/LightEnv.h"
diff --git a/source/simulation2/components/ICmpCinemaManager.h b/source/simulation2/components/ICmpCinemaManager.h
index a64e0c5130..813eb575f7 100644
--- a/source/simulation2/components/ICmpCinemaManager.h
+++ b/source/simulation2/components/ICmpCinemaManager.h
@@ -18,7 +18,7 @@
 #ifndef INCLUDED_ICMPCINEMAMANAGER
 #define INCLUDED_ICMPCINEMAMANAGER
 
-#include "graphics/CinemaPath.h"
+#include "simulation2/helpers/CinemaPath.h"
 #include "simulation2/system/Interface.h"
 
 #include "ps/CStr.h"
diff --git a/source/graphics/CinemaPath.cpp b/source/simulation2/helpers/CinemaPath.cpp
similarity index 96%
rename from source/graphics/CinemaPath.cpp
rename to source/simulation2/helpers/CinemaPath.cpp
index 9421014e5a..44031880a4 100644
--- a/source/graphics/CinemaPath.cpp
+++ b/source/simulation2/helpers/CinemaPath.cpp
@@ -22,22 +22,12 @@
 #include <sstream>
 #include <string>
 
-#include "Camera.h"
-#include "CinemaManager.h"
-#include "GameView.h"
-#include "gui/CGUI.h"
-#include "gui/GUIManager.h"
-#include "gui/IGUIObject.h"
-#include "lib/ogl.h"
+#include "graphics/Camera.h"
 #include "maths/MathUtil.h"
 #include "maths/Quaternion.h"
 #include "maths/Vector3D.h"
-#include "maths/Vector4D.h"
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
-#include "ps/Game.h"
-#include "renderer/Renderer.h"
-
 
 CCinemaPath::CCinemaPath(const CCinemaData& data, const TNSpline& spline, const TNSpline& targetSpline)
 	: CCinemaData(data), TNSpline(spline), m_TargetSpline(targetSpline), m_TimeElapsed(0.f)
diff --git a/source/graphics/CinemaPath.h b/source/simulation2/helpers/CinemaPath.h
similarity index 98%
rename from source/graphics/CinemaPath.h
rename to source/simulation2/helpers/CinemaPath.h
index 4807aecc50..87841aab05 100644
--- a/source/graphics/CinemaPath.h
+++ b/source/simulation2/helpers/CinemaPath.h
@@ -22,10 +22,8 @@
 #include "ps/CStr.h"
 
 class CVector3D;
-class CVector4D;
 class CCamera;
 
-// For loading data
 class CCinemaData
 {
 public:
-- 
2.11.4.GIT