Lots of header files compile-time distanglement.

OpenXRay · Jan 29, 2018 · 28f695d · 28f695d
1 parent c810d6d
commit 28f695d
Show file tree

Hide file tree

Showing 92 changed files with 439 additions and 145 deletions.
diff --git a/src/Include/xrRender/DebugRender.h b/src/Include/xrRender/DebugRender.h
@@ -1,11 +1,16 @@
-#ifndef DebugRender_included
-#define DebugRender_included
 #pragma once
 
 #ifdef DEBUG
 
+#include "xrCore/_types.h"
 #include "DebugShader.h"
 
+// fwd. decl.
+template <class T> struct _vector3;
+using Fvector = _vector3<float>;
+template <class T> struct _matrix;
+using Fmatrix = _matrix<float>;
+
 class IDebugRender
 {
 public:
@@ -47,5 +52,3 @@ class IDebugRender
 };
 
 #endif // DEBUG
-
-#endif //	DebugRender_included
diff --git a/src/Include/xrRender/DebugShader.h b/src/Include/xrRender/DebugShader.h
@@ -1,10 +1,6 @@
-#ifndef DebugShader_included
-#define DebugShader_included
 #pragma once
 
 #include "FactoryPtr.h"
 #include "UIShader.h"
 
-typedef FactoryPtr<IUIShader> debug_shader;
-
-#endif //	DebugShader_included
+using debug_shader = FactoryPtr<IUIShader>;
diff --git a/src/Include/xrRender/UIRender.h b/src/Include/xrRender/UIRender.h
@@ -1,8 +1,16 @@
 #ifndef UIRender_included
 #define UIRender_included
 #pragma once
+#include "xrCore/_types.h"
 
+// fwd. decl.
 class IUIShader;
+template <class T> struct _rect;
+using Irect = _rect<int>;
+template <class T> struct _vector2;
+using Fvector2 = _vector2<float>;
+template <class T> struct _matrix;
+using Fmatrix = _matrix<float>;
 
 class IUIRender
 {

diff --git a/src/xrAICore/Components/operator_condition.h b/src/xrAICore/Components/operator_condition.h
@@ -7,6 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "xrCore/_types.h"
+#include "xrCommon/inlining_macros.h"
 
 template <typename _condition_type, typename _value_type>
 class COperatorConditionAbstract

diff --git a/src/xrAICore/Navigation/PathManagers/path_manager_params_straight_line.h b/src/xrAICore/Navigation/PathManagers/path_manager_params_straight_line.h
@@ -7,6 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "xrCore/_vector3d.h"
 
 template <typename _dist_type, typename _index_type, typename _iteration_type>
 struct SStraightLineParams : public SBaseParameters<_dist_type, _index_type, _iteration_type>

diff --git a/src/xrAICore/Navigation/data_storage_binary_heap.h b/src/xrAICore/Navigation/data_storage_binary_heap.h
@@ -7,6 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "xrCore/_types.h"
 
 struct CDataStorageBinaryHeap
 {

diff --git a/src/xrAICore/Navigation/vertex_path.h b/src/xrAICore/Navigation/vertex_path.h
@@ -7,6 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "xrCore/_types.h"
+#include "xrCommon/xr_vector.h"
 
 template <bool EuclidianHeuristics = true>
 struct CVertexPath

diff --git a/src/xrCDB/xrCDB.h b/src/xrCDB/xrCDB.h
@@ -3,6 +3,8 @@
 #include "xrCore/Threading/Lock.hpp" // XXX: Remove from header. Put in .cpp.
 #include "Common/Noncopyable.hpp"
 #include "xrCore/math_constants.h"
+#include "xrCore/_vector3d.h"
+#include "xrCommon/xr_vector.h"
 
 // forward declarations
 class CFrustum;

diff --git a/src/xrCDB/xr_collide_defs.h b/src/xrCDB/xr_collide_defs.h
@@ -1,6 +1,10 @@
 #pragma once
 
+#include <algorithm>
+
 #include "xrCDB.h"
+#include "xrCore/_vector3d.h"
+#include "xrCore/_matrix.h"
 
 class IGameObject;
 namespace collide

diff --git a/src/xrCore/FixedVector.h b/src/xrCore/FixedVector.h
@@ -1,5 +1,7 @@
 #pragma once
 #include "xrCore/_types.h"
+#include "xrCore/xrDebug_macros.h"
+#include "xrCore/xrMemory.h"
 
 // deprecated, use xr_array instead
 template <class T, std::size_t dim>

diff --git a/src/xrCore/XML/XMLDocument.hpp b/src/xrCore/XML/XMLDocument.hpp
@@ -8,6 +8,8 @@
 #define PUGIXML_NO_XPATH
 #define PUGIXML_HAS_LONG_LONG
 #include "pugixml.hpp"
+#include "xrCommon/xr_vector.h"
+#include "xrCore/xrstring.h"
 
 static constexpr pcstr CONFIG_PATH = "$game_config$";
 static constexpr pcstr UI_PATH = "ui";
@@ -34,7 +36,7 @@ class XML_NODE
         return XML_NODE(node.first_child());
     }
 
-    XML_NODE firstChild(const char* name) const
+    XML_NODE firstChild(pcstr name) const
     {
         return XML_NODE(node.child(name));
     }
@@ -44,18 +46,18 @@ class XML_NODE
         return XML_NODE(node.next_sibling());
     }
 
-    XML_NODE nextSibling(const char* name) const
+    XML_NODE nextSibling(pcstr name) const
     {
         return XML_NODE(node.next_sibling(name));
     }
 
-    const char* textValueOr(const char* defaultValue) const
+    pcstr textValueOr(pcstr defaultValue) const
     {
         const auto text = node.text();
         return text ? text.get() : defaultValue;
     }
 
-    const char* elementAttribute(const char* name) const
+    pcstr elementAttribute(pcstr name) const
     {
         if (node.type() == pugi::node_element)
         {
@@ -65,15 +67,15 @@ class XML_NODE
         return nullptr;
     }
 
-    const char* elementValue() const
+    pcstr elementValue() const
     {
         if (node.type() == pugi::node_element)
             return node.name();
 
         return nullptr;
     }
 
-    const char* value() const
+    pcstr value() const
     {
         switch (node.type())
         {
@@ -95,7 +97,7 @@ struct XML_DOC
         doc.reset();
     }
 
-    void parse(const char* data)
+    void parse(pcstr data)
     {
         res = doc.load_string(data);
     }
@@ -105,7 +107,7 @@ struct XML_DOC
         return !res;
     }
 
-    const char* error() const
+    pcstr error() const
     {
         return res.description();
     }

diff --git a/src/xrCore/clsid.h b/src/xrCore/clsid.h
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _CLSID_H
 #define _CLSID_H
+#include "_types.h"
 
 //***** CLASS ID type
 typedef u64 CLASS_ID;

diff --git a/src/xrCore/xrDebug_macros.h b/src/xrCore/xrDebug_macros.h
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef xrDebug_macrosH
 #define xrDebug_macrosH
+#include "xrDebug.h"
 
 #define DEBUG_INFO {__FILE__, __LINE__, __FUNCTION__}
 #define CHECK_OR_EXIT(expr, message)\
@@ -61,7 +62,6 @@
 #endif
 
 #ifdef DEBUG
-#include "xrDebug.h"
 #define NODEFAULT FATAL("nodefault reached")
 #define VERIFY(expr)\
     do\

diff --git a/src/xrEngine/CameraDefs.h b/src/xrEngine/CameraDefs.h
@@ -1,7 +1,9 @@
+#pragma once
 #ifndef CAMERA_DEFS_H_INCLUDED
 #define CAMERA_DEFS_H_INCLUDED
 
-#pragma once
+#include "xrCore/fastdelegate.h"
+#include "xrCore/_vector3d.h"
 
 struct ENGINE_API SBaseEffector
 {

diff --git a/src/xrEngine/CameraManager.h b/src/xrEngine/CameraManager.h
@@ -2,6 +2,8 @@
 
 #include "CameraDefs.h"
 #include "xrCore/PostProcess/PPInfo.hpp"
+#include "xrCommon/xr_list.h"
+#include "xrCommon/xr_vector.h"
 
 using EffectorCamVec = xr_list<CEffectorCam*>;
 using EffectorPPVec = xr_vector<CEffectorPP*>;

diff --git a/src/xrEngine/CustomHUD.h b/src/xrEngine/CustomHUD.h
@@ -1,4 +1,7 @@
 #pragma once
+#include "xrEngine/EngineAPI.h"
+#include "xrEngine/EventAPI.h"
+#include "xrEngine/pure.h"
 
 ENGINE_API extern Flags32 psHUD_Flags;
 #define HUD_CROSSHAIR (1 << 0)
@@ -14,8 +17,7 @@ ENGINE_API extern Flags32 psHUD_Flags;
 #define HUD_WEAPON_RT2 (1 << 11)
 #define HUD_DRAW_RT2 (1 << 12)
 
-class ENGINE_API IRender_Visual;
-class CUI;
+class IGameObject;
 
 class ENGINE_API CCustomHUD : public FactoryObjectBase, public IEventReceiver, public pureScreenResolutionChanged
 {

diff --git a/src/xrEngine/Effector.h b/src/xrEngine/Effector.h
@@ -1,7 +1,7 @@
-
 #pragma once
-
 #include "CameraDefs.h"
+#include "xrCore/xrCore_benchmark_macros.h"
+#include "device.h"
 
 class ENGINE_API CEffectorCam : public SBaseEffector
 {

diff --git a/src/xrEngine/Engine.h b/src/xrEngine/Engine.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "engineAPI.h"
-#include "eventAPI.h"
+#include "EngineAPI.h"
+#include "EventAPI.h"
+#include "xrCore/xrCore_benchmark_macros.h"
 #include "xrSheduler.h"
 
 class ENGINE_API CEngine

diff --git a/src/xrEngine/EngineAPI.h b/src/xrEngine/EngineAPI.h
@@ -9,6 +9,7 @@
 #include "xrEngine/Engine.h"
 #include "xrCore/ModuleLookup.hpp"
 #include "xrCore/clsid.h"
+#include "xrCore/xrCore_benchmark_macros.h"
 
 class IFactoryObject
 {

diff --git a/src/xrEngine/EventAPI.h b/src/xrEngine/EventAPI.h
@@ -2,6 +2,7 @@
 
 #include "xrCore/Threading/Lock.hpp"
 #include "Common/Noncopyable.hpp"
+#include "xrCommon/xr_vector.h"
 
 class ENGINE_API CEvent;
 typedef CEvent* EVENT;

diff --git a/src/xrEngine/Feel_Touch.cpp b/src/xrEngine/Feel_Touch.cpp
@@ -7,7 +7,7 @@ using namespace Feel;
 Touch::Touch() : pure_relcase(&Touch::feel_touch_relcase) {}
 Touch::~Touch() {}
 bool Touch::feel_touch_contact(IGameObject* O) { return true; }
-void Touch::feel_touch_deny(IGameObject* O, DWORD T)
+void Touch::feel_touch_deny(IGameObject* O, /*DWORD*/ unsigned long T)
 {
     DenyTouch D;
     D.O = O;

diff --git a/src/xrEngine/Feel_Touch.h b/src/xrEngine/Feel_Touch.h
@@ -1,8 +1,13 @@
 #pragma once
 
 #include "pure_relcase.h"
+#include "xrCommon/xr_vector.h"
+
+// fwd. decl.
+class IGameObject;
+template <class T> struct _vector3;
+using Fvector = _vector3<float>;
 
-class ENGINE_API IGameObject;
 namespace Feel
 {
 class ENGINE_API Touch : private pure_relcase
@@ -13,7 +18,7 @@ class ENGINE_API Touch : private pure_relcase
     struct DenyTouch
     {
         IGameObject* O;
-        DWORD Expire;
+        /*DWORD*/ unsigned long Expire;
     };
 
 protected:

diff --git a/src/xrEngine/IGame_Level.h b/src/xrEngine/IGame_Level.h
@@ -6,6 +6,10 @@
 #include "xr_object_list.h"
 #include "xrCDB/xr_area.h"
 #include "xrSound/Sound.h"
+#include "xrCore/FixedVector.h"
+#include "EngineAPI.h"
+#include "EventAPI.h"
+#include "pure.h"
 
 // refs
 class ENGINE_API CCameraManager;

diff --git a/src/xrEngine/IInputReceiver.h b/src/xrEngine/IInputReceiver.h
@@ -5,6 +5,12 @@
 #pragma once
 #ifndef IINPUTRECEIVERH
 #define IINPUTRECEIVERH
+#include "xrCore/_flags.h"
+
+// fwd. decl.
+template <class T> struct _vector2;
+using Fvector2 = _vector2<float>;
+using Ivector2 = _vector2<int>;
 
 class ENGINE_API IInputReceiver
 {

diff --git a/src/xrEngine/pure.h b/src/xrEngine/pure.h
@@ -1,6 +1,7 @@
 #pragma once
 #ifndef _PURE_H_AAA_
 #define _PURE_H_AAA_
+#include "xrCommon/xr_vector.h"
 
 // messages
 #define REG_PRIORITY_LOW 0x11111111ul

diff --git a/src/xrEngine/pure_relcase.h b/src/xrEngine/pure_relcase.h
@@ -1,6 +1,10 @@
 #pragma once
 #ifndef pure_relcaseH
 #define pure_relcaseH
+#include "xrCore/xrDebug_macros.h"
+#include "xrCore/fastdelegate.h" // XXX: Inluding this VERY heavy file for just xr_stdcall seems suboptimal.
+
+class IGameObject;
 
 class ENGINE_API pure_relcase
 {

diff --git a/src/xrEngine/xrSheduler.h b/src/xrEngine/xrSheduler.h
@@ -4,6 +4,7 @@
 
 //#include "ISheduled.h"
 #include "xrCore/xrstring.h"
+#include "xrCore/FTimer.h"
 
 class ISheduled;
 

diff --git a/src/xrGame/ActorEffector.cpp b/src/xrGame/ActorEffector.cpp
@@ -2,7 +2,7 @@
 
 #include "ActorEffector.h"
 #include "PostprocessAnimator.h"
-#include "xrEngine/effectorPP.h"
+#include "xrEngine/EffectorPP.h"
 #include "xrEngine/ObjectAnimator.h"
 #include "Common/object_broker.h"
 #include "actor.h"

diff --git a/src/xrGame/CameraEffector.h b/src/xrGame/CameraEffector.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "xrEngine/CameraManager.h"
-#include "xrEngine/effector.h"
-#include "xrEngine/effectorPP.h"
+#include "xrEngine/Effector.h"
+#include "xrEngine/EffectorPP.h"
 
 #define eStartEffectorID 50