Fixed headers causing "use of undefined Actor" all around. 🔧

Headers should make do with forward decls and shouldn't `#include Actor.h` at all. This means no code (function body or even autogenerated ctor/dtor) which manipulates ActorPtr should be in header.
ohlidalp · Oct 24, 2023 · 747b238 · 747b238
1 parent d3e9095
commit 747b238
Show file tree

Hide file tree

Showing 28 changed files with 311 additions and 90 deletions.
diff --git a/source/main/CMakeLists.txt b/source/main/CMakeLists.txt
@@ -33,14 +33,14 @@ set(SOURCE_FILES
         gfx/DustPool.{h,cpp}
         gfx/EnvironmentMap.{h,cpp}
         gfx/GfxActor.{h,cpp}
-        gfx/GfxData.h
+        gfx/GfxData.{h,cpp}
         gfx/GfxScene.{h,cpp}
         gfx/HydraxWater.{h,cpp}
         gfx/IWater.h
         gfx/MovableText.{h,cpp}
         gfx/Renderdash.{h,cpp}
         gfx/ShadowManager.{h,cpp}
-        gfx/SimBuffers.h
+        gfx/SimBuffers.{h,cpp}
         gfx/Skidmark.{h,cpp}
         gfx/SkyManager.{h,cpp}
         gfx/SkyXManager.{h,cpp}
@@ -156,7 +156,7 @@ set(SOURCE_FILES
         physics/Differentials.{h,cpp}
         physics/Savegame.cpp
         physics/SimConstants.h
-        physics/SimData.h
+        physics/SimData.{h,cpp}
         physics/SlideNode.{h,cpp}
         physics/air/AeroEngine.h
         physics/air/AirBrake.{h,cpp}

diff --git a/source/main/ForwardDeclarations.h b/source/main/ForwardDeclarations.h
@@ -27,6 +27,9 @@
 
 #include "RefCountingObjectPtr.h"
 
+#include <limits>
+#include <vector>
+
 #pragma once
 
 namespace RoR
@@ -177,6 +180,8 @@ namespace RoR
     typedef RefCountingObjectPtr<Terrain> TerrainPtr;
     typedef RefCountingObjectPtr<VehicleAI> VehicleAIPtr;
 
+    typedef std::vector<ActorPtr> ActorPtrVec;
+
     namespace GUI
     {
         class  ConsoleView;

diff --git a/source/main/GameContext.cpp b/source/main/GameContext.cpp
@@ -49,6 +49,16 @@
 
 using namespace RoR;
 
+GameContext::GameContext()
+{
+    // Constructs `ActorPtr` - doesn't compile without `#include Actor.h` - not pretty if in header (even if auto-generated by C++).
+}
+
+GameContext::~GameContext()
+{
+    // Destructs `ActorPtr` - doesn't compile without `#include Actor.h` - not pretty if in header (even if auto-generated by C++).
+}
+
 // --------------------------------
 // Message queue
 
@@ -766,6 +776,8 @@ void GameContext::OnLoaderGuiApply(LoaderType type, CacheEntryPtr entry, std::st
     }
 }
 
+void GameContext::SetPrevPlayerActor(ActorPtr actor) { m_prev_player_actor = actor; }
+
 // --------------------------------
 // Characters
 

diff --git a/source/main/GameContext.h b/source/main/GameContext.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include "Actor.h"
 #include "ActorManager.h"
 #include "CacheSystem.h"
 #include "CharacterFactory.h"
@@ -98,6 +97,9 @@ class GameContext
     friend class AppContext;
 public:
 
+    GameContext();
+    ~GameContext();
+
     /// @name Message queue
     /// @{
 
@@ -132,7 +134,7 @@ class GameContext
     const ActorPtr&     GetPlayerActor() { return m_player_actor; }
     const ActorPtr&     GetPrevPlayerActor() { return m_prev_player_actor; }
     const ActorPtr&     GetLastSpawnedActor() { return m_last_spawned_actor; } //!< Last actor spawned by user and still alive.
-    void                SetPrevPlayerActor(ActorPtr actor) { m_prev_player_actor = actor; }
+    void                SetPrevPlayerActor(ActorPtr actor);
     void                ChangePlayerActor(ActorPtr actor);
 
     void                ShowLoaderGUI(int type, const Ogre::String& instance, const Ogre::String& box);
@@ -188,12 +190,12 @@ class GameContext
 
     // Actors (physics and netcode)
     ActorManager        m_actor_manager;
-    ActorPtr            m_player_actor = nullptr;           //!< Actor (vehicle or machine) mounted and controlled by player
-    ActorPtr            m_prev_player_actor = nullptr;      //!< Previous actor (vehicle or machine) mounted and controlled by player
-    ActorPtr            m_last_spawned_actor = nullptr;     //!< Last actor spawned by user and still alive.
+    ActorPtr            m_player_actor;           //!< Actor (vehicle or machine) mounted and controlled by player
+    ActorPtr            m_prev_player_actor;      //!< Previous actor (vehicle or machine) mounted and controlled by player
+    ActorPtr            m_last_spawned_actor;     //!< Last actor spawned by user and still alive.
 
-    CacheEntryPtr       m_last_cache_selection = nullptr;   //!< Vehicle/load
-    CacheEntryPtr       m_last_skin_selection = nullptr;
+    CacheEntryPtr       m_last_cache_selection;   //!< Vehicle/load
+    CacheEntryPtr       m_last_skin_selection;
     Ogre::String        m_last_section_config;
     ActorSpawnRequest   m_current_selection;                //!< Context of the loader UI
     CacheEntryPtr       m_dummy_cache_selection;

diff --git a/source/main/audio/SoundScriptManager.h b/source/main/audio/SoundScriptManager.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "Actor.h"
 #include "AngelScriptBindings.h"
 #include "Application.h"
 #include "RefCountingObjectPtr.h"

diff --git a/source/main/gameplay/Character.cpp b/source/main/gameplay/Character.cpp
@@ -544,6 +544,8 @@ void Character::SetActorCoupling(bool enabled, ActorPtr actor)
 #endif // USE_SOCKETW
 }
 
+ActorPtr Character::GetActorCoupling() { return m_actor_coupling; }
+
 // --------------------------------
 // GfxCharacter
 

diff --git a/source/main/gameplay/Character.h b/source/main/gameplay/Character.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include "Actor.h"
 #include "ForwardDeclarations.h"
 #include "SurveyMapEntity.h"
 
@@ -53,7 +52,7 @@ class Character
     std::string const &    GetAnimName() const          { return m_anim_name; }
     float          GetAnimTime() const                  { return m_anim_time; }
     Ogre::Radian   getRotation() const                  { return m_character_rotation; }
-    ActorPtr       GetActorCoupling()                   { return m_actor_coupling; }
+    ActorPtr       GetActorCoupling();
     void           setColour(int color)                 { this->m_color_number = color; }
     Ogre::Vector3  getPosition();
     void           setPosition(Ogre::Vector3 position);

diff --git a/source/main/gameplay/CharacterFactory.cpp b/source/main/gameplay/CharacterFactory.cpp
@@ -21,6 +21,7 @@
 
 #include "CharacterFactory.h"
 
+#include "Actor.h"
 #include "Application.h"
 #include "Character.h"
 #include "GfxScene.h"

diff --git a/source/main/gameplay/EngineSim.h b/source/main/gameplay/EngineSim.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "Application.h"
-#include "Actor.h"
 
 namespace RoR {
 

diff --git a/source/main/gameplay/RepairMode.cpp b/source/main/gameplay/RepairMode.cpp
@@ -21,6 +21,7 @@
 
 #include "RepairMode.h"
 
+#include "Actor.h"
 #include "GameContext.h"
 #include "InputEngine.h"
 

diff --git a/source/main/gameplay/SceneMouse.h b/source/main/gameplay/SceneMouse.h
@@ -28,7 +28,6 @@
 
 #include "Application.h"
 #include "SimData.h"
-#include <OIS.h>
 
 #include <OIS.h>
 #include <Ogre.h>

diff --git a/source/main/gfx/EnvironmentMap.h b/source/main/gfx/EnvironmentMap.h
@@ -44,8 +44,6 @@ class GfxEnvmap
 
     static const unsigned int NUM_FACES = 6;
 
-    void InitEnvMap(Ogre::Vector3 center);
-
     Ogre::Camera*        m_cameras[NUM_FACES];
     Ogre::RenderTarget*  m_render_targets[NUM_FACES];
     Ogre::TexturePtr     m_rtt_texture;

diff --git a/source/main/gfx/GfxActor.cpp b/source/main/gfx/GfxActor.cpp
@@ -194,6 +194,11 @@ RoR::GfxActor::~GfxActor()
     }
 }
 
+ActorPtr RoR::GfxActor::GetActor()
+{
+    return m_actor;
+}
+
 void RoR::GfxActor::SetMaterialFlareOn(int flare_index, bool state_on)
 {
     for (FlareMaterial& entry: m_flare_materials)

diff --git a/source/main/gfx/GfxActor.h b/source/main/gfx/GfxActor.h
@@ -26,7 +26,6 @@
 
 #pragma once
 
-#include "Actor.h"
 #include "AutoPilot.h"
 #include "Differentials.h"
 #include "ForwardDeclarations.h"
@@ -138,7 +137,7 @@ class GfxActor
     VideoCamState        GetVideoCamState() const { return m_vidcam_state; }
     DebugViewType        GetDebugView() const { return m_debug_view; }
     Ogre::String         GetResourceGroup() { return m_custom_resource_group; }
-    ActorPtr             GetActor() { return m_actor; } // Watch out for multithreading with this!
+    ActorPtr             GetActor(); // Watch out for multithreading with this!
     Ogre::TexturePtr     GetHelpTex() { return m_help_tex; }
     Ogre::MaterialPtr    GetHelpMat() { return m_help_mat; }
     int                  FetchNumBeams() const ;

diff --git a/source/main/gfx/GfxData.cpp b/source/main/gfx/GfxData.cpp
@@ -0,0 +1,36 @@
+/*
+    This source file is part of Rigs of Rods
+    Copyright 2005-2012 Pierre-Michel Ricordel
+    Copyright 2007-2012 Thomas Fischer
+    Copyright 2013-2023 Petr Ohlidal
+
+    For more information, see http://www.rigsofrods.org/
+
+    Rigs of Rods is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 3, as
+    published by the Free Software Foundation.
+
+    Rigs of Rods is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "SimBuffers.h"
+
+#include "Actor.h"
+
+using namespace RoR;
+
+BeamGfx::BeamGfx()
+{
+    // Constructs `ActorPtr` - doesn't compile without `#include Actor.h` - not pretty if in header (even if auto-generated by C++).
+}
+
+BeamGfx::~BeamGfx()
+{
+    // Destructs `ActorPtr` - doesn't compile without `#include Actor.h` - not pretty if in header (even if auto-generated by C++).
+}
diff --git a/source/main/gfx/GfxData.h b/source/main/gfx/GfxData.h
@@ -265,14 +265,17 @@ struct NodeGfx
 /// Visuals of softbody beam (`beam_t` struct); Partially updated along with SimBuffer
 struct BeamGfx
 {
+    BeamGfx();
+    ~BeamGfx();
+
     // We don't keep pointer to the Ogre::Entity - we rely on the SceneNode keeping it attached all the time.
     Ogre::SceneNode* rod_scenenode       = nullptr;
     uint16_t         rod_beam_index      = 0;
     uint16_t         rod_diameter_mm     = 0;                    //!< Diameter in millimeters
 
     NodeNum_t        rod_node1           = NODENUM_INVALID;  //!< Node index - may change during simulation!
     NodeNum_t        rod_node2           = NODENUM_INVALID;  //!< Node index - may change during simulation!
-    ActorPtr           rod_target_actor    = nullptr;
+    ActorPtr         rod_target_actor;
     bool             rod_is_visible      = false;
 };
 

diff --git a/source/main/gfx/SimBuffers.cpp b/source/main/gfx/SimBuffers.cpp
@@ -0,0 +1,36 @@
+/*
+    This source file is part of Rigs of Rods
+    Copyright 2005-2012 Pierre-Michel Ricordel
+    Copyright 2007-2012 Thomas Fischer
+    Copyright 2013-2023 Petr Ohlidal
+
+    For more information, see http://www.rigsofrods.org/
+
+    Rigs of Rods is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 3, as
+    published by the Free Software Foundation.
+
+    Rigs of Rods is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "SimBuffers.h"
+
+#include "Actor.h"
+
+using namespace RoR;
+
+GameContextSB::GameContextSB()
+{
+    // Constructs `ActorPtr` - doesn't compile without `#include Actor.h` - not pretty if in header (even if auto-generated by C++).
+}
+
+GameContextSB::~GameContextSB()
+{
+    // Destructs `ActorPtr` - doesn't compile without `#include Actor.h` - not pretty if in header (even if auto-generated by C++).
+}
diff --git a/source/main/gfx/SimBuffers.h b/source/main/gfx/SimBuffers.h
@@ -194,6 +194,9 @@ struct ActorSB
 
 struct GameContextSB
 {
+    GameContextSB();
+    ~GameContextSB();
+
     ActorPtr          simbuf_player_actor;
     Ogre::Vector3     simbuf_character_pos            = Ogre::Vector3::ZERO;
     bool              simbuf_sim_paused               = false;

diff --git a/source/main/gui/GUIManager.cpp b/source/main/gui/GUIManager.cpp
@@ -24,11 +24,13 @@
 
 #include "GUIManager.h"
 
+#include "Actor.h"
 #include "AppContext.h"
 #include "ActorManager.h"
 #include "CameraManager.h"
 #include "ContentManager.h"
 #include "GameContext.h"
+#include "GfxActor.h"
 #include "GfxScene.h"
 #include "GUIUtils.h"
 #include "InputEngine.h"

diff --git a/source/main/gui/panels/GUI_FlexbodyDebug.cpp b/source/main/gui/panels/GUI_FlexbodyDebug.cpp
@@ -22,6 +22,7 @@
 
 #include "GUI_FlexbodyDebug.h"
 
+#include "Actor.h"
 #include "Application.h"
 #include "SimData.h"
 #include "Collisions.h"

diff --git a/source/main/gui/panels/GUI_MainSelector.h b/source/main/gui/panels/GUI_MainSelector.h
@@ -61,7 +61,7 @@ class MainSelector
     {
         DisplayEntry(CacheEntryPtr entry);
 
-        CacheEntryPtr sde_entry = nullptr;
+        CacheEntryPtr sde_entry;
         Str<50>     sde_filetime_str;  // pre-formatted
         Str<50>     sde_addtime_str;   // pre-formatted
         Str<50>     sde_driveable_str; // pre-formatted

diff --git a/source/main/physics/Actor.h b/source/main/physics/Actor.h
@@ -42,8 +42,6 @@ namespace RoR {
 /// @addtogroup Physics
 /// @{
 
-typedef std::vector<ActorPtr> ActorPtrVec;
-
 /// Softbody object; can be anything from soda can to a space shuttle
 /// Former name: `Beam` (that's why scripting uses `BeamClass`)
 class Actor : public RefCountingObject<Actor>
@@ -563,8 +561,8 @@ ActorPtrVec                        ar_linked_actors;              //!< Sim state
     float             m_load_mass = 0.f;             //!< Physics attr; predefined load mass in Kg
     int               m_masscount = 0;             //!< Physics attr; Number of nodes loaded with l option
     float             m_dry_mass = 0.f;              //!< Physics attr;
-    std::unique_ptr<Buoyance> m_buoyance;      //!< Physics
-    CacheEntryPtr       m_used_skin_entry = nullptr;       //!< Graphics
+    std::unique_ptr<Buoyance> m_buoyance;              //!< Physics
+    CacheEntryPtr     m_used_skin_entry;               //!< Graphics
     Skidmark*         m_skid_trails[MAX_WHEELS*2] = {};
     bool              m_antilockbrake = false;         //!< GUI state
     bool              m_tractioncontrol = false;       //!< GUI state

diff --git a/source/main/physics/ActorManager.h b/source/main/physics/ActorManager.h
@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include "Actor.h"
 #include "Application.h"
 #include "SimData.h"
 #include "CmdKeyInertia.h"