Removed engine.h from includes in header files, replaced by forward declarations and includes in source files

src/app/app.cpp

@@ -37,6 +37,7 @@
 
 #include "common/system/system.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/opengl/glutil.h"
 
 #include "level/robotmain.h"

src/graphics/engine/camera.h

@@ -24,8 +24,7 @@
 
 #pragma once
 
-#include "graphics/engine/engine.h"
-
+#include "graphics/core/color.h"
 
 class CObject;
 class CRobotMain;
@@ -37,6 +36,10 @@ struct Event;
 namespace Gfx
 {
 
+class CEngine;
+class CTerrain;
+class CWater;
+
 enum class TransparencyMode : unsigned char;
 
 /**

src/graphics/engine/engine.h

@@ -148,7 +148,7 @@ struct EngineObject
  * \struct EngineShadowType
  * \brief Type of shadow drawn by the graphics engine
  */
-enum class EngineShadowType
+enum class EngineShadowType : unsigned char
 {
     //! Normal shadow
     NORMAL = 0,

src/graphics/engine/lightman.cpp

@@ -24,6 +24,8 @@
 
 #include "graphics/core/device.h"
 
+#include "graphics/engine/engine.h"
+
 #include "math/geometry.h"
 
 

src/graphics/engine/lightman.h

@@ -26,7 +26,7 @@
 
 #include "graphics/core/light.h"
 
-#include "graphics/engine/engine.h"
+#include <vector>
 
 #include <glm/glm.hpp>
 
@@ -35,8 +35,13 @@
 namespace Gfx
 {
 
+class CDevice;
+class CEngine;
+
 struct Color;
 
+enum EngineObjectType;
+
 /**
  * \struct LightProgression
  * \brief Describes the progression of light parameters change
@@ -125,8 +130,8 @@ struct DynamicLight
      , used(false)
      , enabled(false)
      , priority(LIGHT_PRI_LOW)
-     , includeType(ENG_OBJTYPE_NULL)
-     , excludeType(ENG_OBJTYPE_NULL)
+     , includeType{}
+     , excludeType{}
     {}
 };
 

src/graphics/engine/lightning.cpp

@@ -27,6 +27,7 @@
 #include "graphics/core/transparency.h"
 
 #include "graphics/engine/camera.h"
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 
 #include "level/robotmain.h"

src/graphics/engine/particle.h

@@ -24,8 +24,7 @@
 
 #pragma once
 
-
-#include "graphics/engine/engine.h"
+#include "graphics/core/color.h"
 
 #include "object/interface/trace_drawing_object.h"
 
@@ -42,7 +41,12 @@ class CSoundInterface;
 namespace Gfx
 {
 
+class CDevice;
+class CEngine;
 class CParticleRenderer;
+class CTerrain;
+class CWater;
+
 struct EngineTriangle;
 
 const short MAXPARTICULE = 500;

src/level/mainmovie.cpp

@@ -22,6 +22,8 @@
 
 #include "app/app.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "math/geometry.h"

src/level/parser/parserparam.h

@@ -50,6 +50,13 @@ class CLevelParserParam;
 using CLevelParserParamUPtr = std::unique_ptr<CLevelParserParam>;
 using CLevelParserParamVec = std::vector<CLevelParserParamUPtr>;
 
+namespace Gfx
+{
+class CEngine;
+
+enum EngineObjectType;
+}
+
 class CLevelParserParam
 {
 public:

src/level/robotmain.h

@@ -44,6 +44,8 @@
 #include "object/tool_type.h"
 
 #include <deque>
+#include <map>
+#include <set>
 #include <stdexcept>
 
 #include <glm/glm.hpp>
@@ -82,7 +84,7 @@ bool IsInSimulationConfigPhase(Phase phase);
 bool IsPhaseWithWorld(Phase phase);
 bool IsMainMenuPhase(Phase phase);
 
-
+class CApplication;
 class CEventQueue;
 class CSoundInterface;
 class CLevelParserLine;
@@ -104,6 +106,7 @@ class CLightManager;
 class CWater;
 class CCloud;
 class CLightning;
+class COldModelManager;
 class CPlanet;
 class CTerrain;
 class CModelManager;

src/object/auto/auto.cpp

@@ -25,6 +25,8 @@
 #include "common/event.h"
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "level/parser/parserline.h"

src/object/auto/autobase.cpp

@@ -21,6 +21,7 @@
 #include "object/auto/autobase.h"
 
 #include "graphics/engine/cloud.h"
+#include "graphics/engine/engine.h"
 #include "graphics/engine/lightning.h"
 #include "graphics/engine/planet.h"
 #include "graphics/engine/terrain.h"

src/object/auto/autoconvert.cpp

@@ -22,6 +22,8 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "level/parser/parserline.h"

src/object/auto/autoderrick.cpp

@@ -22,6 +22,7 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 
 #include "level/parser/parserline.h"

src/object/auto/autodestroyer.cpp

@@ -22,6 +22,7 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/pyro_manager.h"
 
 #include "level/robotmain.h"

src/object/auto/autoegg.cpp

@@ -22,6 +22,7 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/pyro_manager.h"
 
 #include "level/parser/parser.h"

src/object/auto/autofactory.cpp

@@ -22,6 +22,8 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "level/parser/parser.h"

src/object/auto/autoflag.cpp

@@ -20,6 +20,7 @@
 
 #include "object/auto/autoflag.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 
 #include "math/geometry.h"

src/object/auto/autohouston.cpp

@@ -19,6 +19,8 @@
 
 #include "object/auto/autohouston.h"
 
+#include "graphics/engine/engine.h"
+
 #include "math/geometry.h"
 
 #include "object/old_object.h"

src/object/auto/autokid.cpp

@@ -20,6 +20,7 @@
 
 #include "object/auto/autokid.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 #include "graphics/engine/water.h"
 

src/object/auto/autolabo.cpp

@@ -22,6 +22,8 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "level/parser/parserline.h"

src/object/auto/automush.cpp

@@ -22,6 +22,8 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/parser/parserline.h"
 #include "level/parser/parserparam.h"
 

src/object/auto/autonuclearplant.cpp

@@ -22,6 +22,8 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "level/parser/parserline.h"

src/object/auto/autoportico.cpp

@@ -20,6 +20,8 @@
 
 #include "object/auto/autoportico.h"
 
+#include "graphics/engine/engine.h"
+
 #include "common/stringutils.h"
 
 #include "level/robotmain.h"

src/object/auto/autopowercaptor.cpp

@@ -22,6 +22,8 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/parser/parserline.h"
 #include "level/parser/parserparam.h"
 

src/object/auto/autopowerplant.cpp

@@ -22,6 +22,7 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 
 #include "level/robotmain.h"

src/object/auto/autopowerstation.cpp

@@ -20,6 +20,7 @@
 
 #include "object/auto/autopowerstation.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
 

src/object/auto/autoradar.cpp

@@ -20,6 +20,8 @@
 
 #include "object/auto/autoradar.h"
 
+#include "graphics/engine/engine.h"
+
 #include "math/geometry.h"
 
 #include "object/object_manager.h"

src/object/auto/autorepair.cpp

@@ -22,6 +22,8 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/parser/parserline.h"
 #include "level/parser/parserparam.h"
 

src/object/auto/autoresearch.cpp

@@ -23,6 +23,8 @@
 #include "common/global.h"
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "level/parser/parserline.h"

src/object/auto/autovault.cpp

@@ -22,6 +22,8 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "level/parser/parserline.h"

src/object/motion/motionant.cpp

@@ -22,6 +22,7 @@
 
 #include "app/app.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/oldmodelmanager.h"
 #include "graphics/engine/particle.h"
 

src/object/motion/motionbee.cpp

@@ -22,6 +22,7 @@
 
 #include "app/app.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/oldmodelmanager.h"
 
 #include "math/func.h"

src/object/motion/motionlevelcontroller.cpp

@@ -20,6 +20,8 @@
 
 #include "object/motion/motionlevelcontroller.h"
 
+#include "graphics/engine/engine.h"
+
 #include "object/old_object.h"
 
 #include "physics/physics.h"

src/object/motion/motionqueen.cpp

@@ -22,6 +22,7 @@
 
 #include "app/app.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/oldmodelmanager.h"
 
 #include "math/func.h"

src/object/motion/motionspider.cpp

@@ -22,6 +22,7 @@
 
 #include "app/app.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/oldmodelmanager.h"
 #include "graphics/engine/particle.h"
 

src/object/motion/motiontoto.cpp

@@ -22,6 +22,7 @@
 
 #include "app/app.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/oldmodelmanager.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"

src/object/old_object.cpp

@@ -27,6 +27,7 @@
 #include "common/settings.h"
 #include "common/stringutils.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/lightman.h"
 #include "graphics/engine/lightning.h"
 #include "graphics/engine/particle.h"

src/object/old_object.h

@@ -74,6 +74,11 @@ namespace Ui
 class CObjectInterface;
 }
 
+namespace Gfx
+{
+enum class EngineShadowType : unsigned char;
+}
+
 
 class COldObject : public CObject,
                    public CInteractiveObject,
@@ -253,7 +258,7 @@ public:
     CMotion*    GetMotion() override;
     CAuto*      GetAuto() override;
 
-    bool        CreateShadowCircle(float radius, float intensity, Gfx::EngineShadowType type = Gfx::EngineShadowType::NORMAL);
+    bool        CreateShadowCircle(float radius, float intensity, Gfx::EngineShadowType type = {});
     bool        CreateShadowLight(float height, Gfx::Color color);
 
     void        FlatParent() override;

src/object/subclass/base_building.cpp

@@ -21,6 +21,7 @@
 
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/oldmodelmanager.h"
 #include "graphics/engine/terrain.h"
 

src/object/subclass/exchange_post.cpp

@@ -22,6 +22,7 @@
 #include "common/make_unique.h"
 #include "common/regex_utils.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/oldmodelmanager.h"
 
 #include "level/parser/parserexceptions.h"

src/object/task/task.cpp

@@ -22,6 +22,8 @@
 
 #include "app/app.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "object/old_object.h"

src/object/task/taskbuild.cpp

@@ -23,6 +23,7 @@
 #include "graphics/core/color.h"
 #include "graphics/core/light.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/lightman.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"

src/object/task/taskdeletemark.cpp

@@ -22,6 +22,7 @@
 
 #include "common/global.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 #include "graphics/engine/pyro_manager.h"
 #include "graphics/engine/terrain.h"

src/object/task/taskfire.cpp

@@ -20,6 +20,7 @@
 
 #include "object/task/taskfire.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 
 #include "math/geometry.h"

src/object/task/taskfireant.cpp

@@ -20,6 +20,7 @@
 
 #include "object/task/taskfireant.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 
 #include "math/geometry.h"

src/object/task/taskflag.cpp

@@ -19,6 +19,7 @@
 
 #include "object/task/taskflag.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 #include "graphics/engine/pyro_manager.h"
 #include "graphics/engine/water.h"

src/object/task/taskgoto.cpp

@@ -25,6 +25,7 @@
 #include "common/image.h"
 #include "common/make_unique.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 

src/object/task/taskgungoal.cpp

@@ -20,6 +20,8 @@
 
 #include "math/func.h"
 
+#include "graphics/engine/engine.h"
+
 #include "object/task/taskgungoal.h"
 
 #include "object/old_object.h"

src/object/task/taskinfo.cpp

@@ -22,6 +22,7 @@
 
 #include "common/global.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 
 #include "object/object_manager.h"

src/object/task/taskmanip.cpp

@@ -20,6 +20,7 @@
 
 #include "object/task/taskmanip.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/pyro_manager.h"
 #include "graphics/engine/terrain.h"
 

src/object/task/taskpen.cpp

@@ -19,6 +19,7 @@
 
 #include "object/task/taskpen.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 
 #include "math/geometry.h"

src/object/task/taskrecover.cpp

@@ -22,6 +22,7 @@
 
 #include "common/global.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 
 #include "level/robotmain.h"

src/object/task/tasksearch.cpp

@@ -20,6 +20,7 @@
 
 #include "object/task/tasksearch.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
 

src/object/task/taskshield.cpp

@@ -22,6 +22,7 @@
 
 #include "graphics/core/light.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/lightman.h"
 #include "graphics/engine/particle.h"
 

src/object/task/tasktake.cpp

@@ -20,6 +20,7 @@
 
 #include "object/task/tasktake.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 

src/object/task/taskterraform.cpp

@@ -19,6 +19,7 @@
 
 #include "object/task/taskterraform.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 #include "graphics/engine/pyro_manager.h"
 #include "graphics/engine/terrain.h"

src/object/task/taskturn.cpp

@@ -20,6 +20,7 @@
 
 #include "object/task/taskturn.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 
 #include "level/robotmain.h"

src/script/scriptfunc.cpp

@@ -31,6 +31,7 @@
 #include "common/resources/outputstream.h"
 #include "common/resources/resourcemanager.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 

src/ui/controls/control.cpp

@@ -31,6 +31,8 @@
 #include "graphics/core/renderers.h"
 #include "graphics/core/transparency.h"
 
+#include "graphics/engine/engine.h"
+
 #include "math/func.h"
 
 namespace Ui

src/ui/controls/interface.cpp

@@ -22,6 +22,8 @@
 
 #include "app/app.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "ui/controls/button.h"

src/ui/controls/map.cpp

@@ -26,6 +26,7 @@
 #include "graphics/core/renderers.h"
 #include "graphics/core/transparency.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 

src/ui/controls/target.cpp

@@ -20,6 +20,8 @@
 
 #include "ui/controls/target.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "object/object_manager.h"

src/ui/controls/window.cpp

@@ -42,6 +42,8 @@
 #include "graphics/core/renderers.h"
 #include "graphics/core/transparency.h"
 
+#include "graphics/engine/engine.h"
+
 #include <algorithm>
 
 

src/ui/controls/window.h

@@ -21,12 +21,15 @@
 
 #include "ui/controls/control.h"
 
-#include "graphics/engine/engine.h" // TODO: only needed for EngineMouseType
-
 #include <memory>
 #include <string>
 #include <vector>
 
+namespace Gfx
+{
+enum EngineMouseType;
+}
+
 namespace Ui
 {
 
@@ -147,7 +150,7 @@ protected:
     bool        m_bCapture;
     glm::vec2   m_pressPos;
     int         m_pressFlags;
-    Gfx::EngineMouseType    m_pressMouse;
+    Gfx::EngineMouseType m_pressMouse;
 };
 
 

src/ui/maindialog.cpp

@@ -29,6 +29,8 @@
 #include "common/make_unique.h"
 #include "common/settings.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/player_profile.h"
 #include "level/robotmain.h"
 

src/ui/mainmap.cpp

@@ -22,6 +22,8 @@
 
 #include "app/app.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "ui/controls/interface.h"

src/ui/mainshort.cpp

@@ -25,6 +25,8 @@
 
 #include "common/logger.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/robotmain.h"
 
 #include "object/object.h"

src/ui/mainui.cpp

@@ -63,6 +63,8 @@
 
 #include "graphics/core/transparency.h"
 
+#include "graphics/engine/engine.h"
+
 namespace Ui
 {
 

src/ui/object_interface.cpp

@@ -26,6 +26,7 @@
 
 #include "graphics/core/color.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/water.h"
 

src/ui/particles_generator.cpp

@@ -19,6 +19,7 @@
 
 #include "ui/particles_generator.h"
 
+#include "graphics/engine/engine.h"
 #include "graphics/engine/particle.h"
 
 #include "math/func.h"

src/ui/screen/screen_apperance.cpp

@@ -24,6 +24,7 @@
 #include "common/restext.h"
 
 #include "graphics/engine/camera.h"
+#include "graphics/engine/engine.h"
 
 #include "level/player_profile.h"
 #include "level/robotmain.h"

src/ui/screen/screen_io.cpp

@@ -23,6 +23,8 @@
 #include "common/restext.h"
 #include "common/stringutils.h"
 
+#include "graphics/engine/engine.h"
+
 #include "level/player_profile.h"
 #include "level/robotmain.h"
 

src/ui/screen/screen_loading.cpp

@@ -29,6 +29,8 @@
 #include "ui/controls/label.h"
 #include "ui/controls/window.h"
 
+#include "graphics/engine/engine.h"
+
 namespace Ui
 {
 

src/ui/screen/screen_setup_display.cpp

@@ -28,6 +28,7 @@
 #include "common/stringutils.h"
 
 #include "graphics/engine/camera.h"
+#include "graphics/engine/engine.h"
 
 #include "ui/controls/button.h"
 #include "ui/controls/check.h"

src/ui/screen/screen_setup_game.cpp

@@ -26,6 +26,7 @@
 #include "common/stringutils.h"
 
 #include "graphics/engine/camera.h"
+#include "graphics/engine/engine.h"
 
 #include "ui/controls/button.h"
 #include "ui/controls/check.h"

src/ui/screen/screen_setup_graphics.cpp

@@ -28,6 +28,7 @@
 #include "common/stringutils.h"
 
 #include "graphics/engine/camera.h"
+#include "graphics/engine/engine.h"
 
 #include "math/func.h"
 

src/ui/studio.h

@@ -19,18 +19,31 @@
 
 #pragma once
 
-#include "graphics/engine/camera.h"
-
+#include <memory>
 #include <string>
 
+#include <glm/glm.hpp>
+
+class CApplication;
 class CEventQueue;
+class CFileDialog;
+class CRobotMain;
 class CScript;
-class CSoundInterface;
 class CSettings;
-struct Program;
+class CSoundInterface;
 class CPauseManager;
+
 struct ActivePause;
 struct Event;
+struct Program;
+
+namespace Gfx
+{
+class CCamera;
+class CEngine;
+
+enum CameraType;
+}
 
 namespace Ui
 {