Header cleanup

- Add profiler/Profiler.h to various .cpp files which didn't include it prior - Remove some unneeded includes - Ensure GalaxyGenerator.h doesn't require a prior include of Galaxy.h - Don't query for equality to Pi::player in Ship-AI.cpp (removes need for Pi.h and Player.h includes)
robothauler · Nov 14, 2024 · e5ec9df · e5ec9df
1 parent c564366
commit e5ec9df
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 22 deletions.
diff --git a/src/Beam.cpp b/src/Beam.cpp
@@ -26,6 +26,8 @@
 #include "lua/LuaEvent.h"
 #include "lua/LuaUtils.h"
 
+#include "profiler/Profiler.h"
+
 namespace {
 	static float lifetime = 0.1f;
 }

diff --git a/src/Body.cpp b/src/Body.cpp
@@ -20,6 +20,8 @@
 #include "core/Log.h"
 #include "lua/LuaEvent.h"
 
+#include "profiler/Profiler.h"
+
 Body::Body() :
 	PropertiedObject(),
 	m_interpPos(0.0),

diff --git a/src/Camera.cpp b/src/Camera.cpp
@@ -11,11 +11,14 @@
 #include "Player.h"
 #include "Sfx.h"
 #include "Space.h"
+#include "SpaceStation.h"
+
 #include "galaxy/StarSystem.h"
 #include "graphics/TextureBuilder.h"
 #include "graphics/Types.h"
 #include "graphics/RenderState.h"
-#include "SpaceStation.h"
+
+#include "profiler/Profiler.h"
 
 using namespace Graphics;
 

diff --git a/src/DeathView.cpp b/src/DeathView.cpp
@@ -11,6 +11,8 @@
 #include "graphics/Graphics.h"
 #include "graphics/Renderer.h"
 
+#include "profiler/Profiler.h"
+
 DeathView::DeathView(Game *game) :
 	View(),
 	m_game(game)

diff --git a/src/HudTrail.cpp b/src/HudTrail.cpp
@@ -11,6 +11,8 @@
 #include "graphics/Renderer.h"
 #include "graphics/Types.h"
 
+#include "profiler/Profiler.h"
+
 const float UPDATE_INTERVAL = 0.1f;
 const Uint16 MAX_POINTS = 100;
 

diff --git a/src/Projectile.cpp b/src/Projectile.cpp
@@ -26,6 +26,8 @@
 #include "lua/LuaEvent.h"
 #include "lua/LuaUtils.h"
 
+#include "profiler/Profiler.h"
+
 std::unique_ptr<Graphics::MeshObject> Projectile::s_sideMesh;
 std::unique_ptr<Graphics::MeshObject> Projectile::s_glowMesh;
 std::unique_ptr<Graphics::Material> Projectile::s_sideMat;

diff --git a/src/SectorView.cpp b/src/SectorView.cpp
@@ -24,10 +24,11 @@
 #include "lua/LuaRef.h"
 #include "lua/LuaTable.h"
 #include "matrix4x4.h"
-#include <assert.h>
-#include <cmath>
-#include <sstream>
 
+#include "profiler/Profiler.h"
+
+#include <cassert>
+#include <cmath>
 #include <unordered_set>
 
 SectorView::~SectorView() {}

diff --git a/src/Sensors.cpp b/src/Sensors.cpp
@@ -10,6 +10,8 @@
 #include "Ship.h"
 #include "Space.h"
 
+#include "profiler/Profiler.h"
+
 Sensors::RadarContact::RadarContact() :
 	body(0),
 	trail(0),
@@ -62,7 +64,7 @@ Body* Sensors::ChooseTarget(TargetingCriteria crit, const Body* oldTarget )
 
 	if(!m_owner->IsType(ObjectType::PLAYER))
 		return nullptr;
-		
+
 	const Body* currTarget = oldTarget;
 
 	m_radarContacts.sort(ContactDistanceSort);

diff --git a/src/Sfx.cpp b/src/Sfx.cpp
@@ -11,7 +11,8 @@
 #include "JsonUtils.h"
 #include "ModelBody.h"
 #include "Pi.h"
-#include "StringF.h"
+#include "matrix4x4.h"
+
 #include "core/IniConfig.h"
 #include "graphics/Drawables.h"
 #include "graphics/Graphics.h"
@@ -21,7 +22,8 @@
 #include "graphics/TextureBuilder.h"
 #include "graphics/Types.h"
 #include "graphics/VertexArray.h"
-#include "matrix4x4.h"
+
+#include "profiler/Profiler.h"
 
 using namespace Graphics;
 

diff --git a/src/Shields.cpp b/src/Shields.cpp
@@ -15,6 +15,8 @@
 #include "scenegraph/StaticGeometry.h"
 #include "scenegraph/Node.h"
 
+#include "profiler/Profiler.h"
+
 #include <SDL_timer.h>
 
 REGISTER_COMPONENT_TYPE(Shields) {

diff --git a/src/Ship-AI.cpp b/src/Ship-AI.cpp
@@ -3,17 +3,13 @@
 
 #include "EnumStrings.h"
 #include "Frame.h"
-#include "Pi.h"
-#include "Planet.h"
-#include "Player.h"
 #include "Ship.h"
 #include "ShipAICmd.h"
 #include "Space.h"
 #include "SpaceStation.h"
-#include "lua/LuaConstants.h"
 #include "lua/LuaEvent.h"
-#include "perlin.h"
-#include "ship/Propulsion.h"
+
+#include "profiler/Profiler.h"
 
 // returns true if command is complete
 bool Ship::AITimeStep(float timeStep)
@@ -24,7 +20,7 @@ bool Ship::AITimeStep(float timeStep)
 
 	m_decelerating = false;
 	if (!m_curAICmd) {
-		if (this == Pi::player) return true;
+		if (this->IsType(ObjectType::PLAYER)) return true;
 
 		// just in case the AI left it on
 		ClearThrusterState();

diff --git a/src/Space.cpp b/src/Space.cpp
@@ -22,11 +22,12 @@
 #include "collider/CollisionSpace.h"
 #include "core/Log.h"
 #include "galaxy/Galaxy.h"
-#include "graphics/Graphics.h"
 #include "lua/LuaEvent.h"
 #include "lua/LuaTimer.h"
+
+#include "profiler/Profiler.h"
+
 #include <algorithm>
-#include <functional>
 
 //#define DEBUG_CACHE
 

diff --git a/src/SpeedLines.cpp b/src/SpeedLines.cpp
@@ -10,6 +10,7 @@
 #include "core/IniConfig.h"
 #include "graphics/RenderState.h"
 #include "graphics/Renderer.h"
+#include "profiler/Profiler.h"
 
 // default values
 float SpeedLines::BOUNDS = 2000.f;

diff --git a/src/SystemView.cpp b/src/SystemView.cpp
@@ -29,6 +29,7 @@
 #include "graphics/Types.h"
 
 #include "imgui/imgui.h"
+#include "profiler/Profiler.h"
 #include "SDL_keycode.h"
 
 using namespace Graphics;

diff --git a/src/core/Property.cpp b/src/core/Property.cpp
@@ -5,6 +5,7 @@
 
 #include "Json.h"
 #include "JsonUtils.h"
+#include "StringHash.h"
 
 PropertyMapWrapper::PropertyMapWrapper(PropertyMap *m) :
 	m_map(m)

diff --git a/src/core/Property.h b/src/core/Property.h
@@ -11,6 +11,8 @@
 #include "vector2.h"
 #include "vector3.h"
 
+#include "FNV1a.h"
+
 #include <string>
 #include <string_view>
 #include <type_traits>

diff --git a/src/editor/UndoSystem.cpp b/src/editor/UndoSystem.cpp
@@ -2,6 +2,7 @@
 // Licensed under the terms of the GPL v3. See licenses/GPL-3.txt
 
 #include "UndoSystem.h"
+#include "core/StringHash.h"
 #include "utils.h"
 
 #define XXH_INLINE_ALL

diff --git a/src/editor/system/GalaxyEditAPI.cpp b/src/editor/system/GalaxyEditAPI.cpp
@@ -7,12 +7,12 @@
 #include "SystemEditorHelpers.h"
 
 #include "core/Log.h"
+#include "core/StringHash.h"
 #include "core/macros.h"
 #include "editor/UndoStepType.h"
 #include "editor/EditorDraw.h"
 
 #include "galaxy/Factions.h"
-#include "galaxy/Galaxy.h"
 #include "galaxy/NameGenerator.h"
 #include "galaxy/Sector.h"
 #include "galaxy/StarSystemGenerator.h"

diff --git a/src/galaxy/GalaxyGenerator.h b/src/galaxy/GalaxyGenerator.h
@@ -4,6 +4,7 @@
 #ifndef GALAXYGENERATOR_H
 #define GALAXYGENERATOR_H
 
+#include "Galaxy.h"
 #include "RefCounted.h"
 #include "Sector.h"
 #include "StarSystem.h"

diff --git a/src/lua/Lua.cpp b/src/lua/Lua.cpp
@@ -5,7 +5,6 @@
 #include "Pi.h"
 
 #include "LuaColor.h"
-#include "LuaConsole.h"
 #include "LuaConstants.h"
 #include "LuaDev.h"
 #include "LuaEconomy.h"
@@ -35,9 +34,10 @@
 #include "SystemView.h"
 
 #include "galaxy/StarSystem.h"
-#include "pigui/LuaPiGui.h"
 #include "scenegraph/Lua.h"
 
+#include "profiler/Profiler.h"
+
 namespace Lua {
 
 	LuaManager *manager = 0;

diff --git a/src/lua/LuaStarSystem.cpp b/src/lua/LuaStarSystem.cpp
@@ -5,12 +5,10 @@
 #include "FileSystem.h"
 #include "Game.h"
 #include "GameSaveError.h"
-#include "LuaConstants.h"
 #include "LuaObject.h"
 #include "LuaTable.h"
 #include "LuaUtils.h"
 #include "Pi.h"
-#include "Planet.h"
 #include "Space.h"
 #include "SpaceStation.h"
 #include "Star.h"
@@ -21,6 +19,8 @@
 #include "galaxy/Sector.h"
 #include "galaxy/StarSystem.h"
 
+#include "profiler/Profiler.h"
+
 /*
  * Class: StarSystem
  *

diff --git a/src/test/TestProperty.cpp b/src/test/TestProperty.cpp
@@ -5,10 +5,11 @@
 #include "Quaternion.h"
 #include "core/Log.h"
 #include "core/Property.h"
+#include "profiler/Profiler.h"
 
 #include <algorithm>
-#include <string>
 #include <iostream>
+#include <string>
 #include "doctest.h"
 
 static constexpr uint32_t ITERATIONS = 10000;

diff --git a/src/test/TestStringName.cpp b/src/test/TestStringName.cpp
@@ -3,6 +3,7 @@
 
 #include "core/FNV1a.h"
 #include "core/Log.h"
+#include "core/StringHash.h"
 #include "core/StringName.h"
 #include "profiler/Profiler.h"