follow up[F: sorted includes

andreasdr · Jan 21, 2025 · e360428 · e360428
1 parent 0c9e2a2
commit e360428
Show file tree

Hide file tree

Showing 55 changed files with 141 additions and 143 deletions.
diff --git a/src/tdme/application/Application.cpp b/src/tdme/application/Application.cpp
@@ -34,16 +34,17 @@
 #include <memory>
 #include <string>
 
-#include <agui/gui/GUIEventHandler.h>
+#include <agui/agui.h>
 #include <agui/gui/renderer/ApplicationGL3Renderer.h>
 #include <agui/gui/renderer/GUIRendererBackend.h>
+#include <agui/gui/GUIEventHandler.h>
 
 #include <tdme/tdme.h>
 #include <tdme/application/Application.h>
 #include <tdme/audio/Audio.h>
-#include <tdme/engine/Texture.h>
 #include <tdme/engine/fileio/textures/TextureReader.h>
 #include <tdme/engine/subsystems/renderer/RendererBackend.h>
+#include <tdme/engine/Texture.h>
 #include <tdme/os/filesystem/FileSystem.h>
 #include <tdme/os/filesystem/FileSystemInterface.h>
 #include <tdme/os/threading/Thread.h>
@@ -59,20 +60,20 @@
 
 using std::array;
 using std::make_unique;
-using std::unique_ptr;
 using std::shared_ptr;
 using std::string;
 using std::to_string;
+using std::unique_ptr;
 
-using agui::gui::GUIEventHandler;
 using agui::gui::renderer::ApplicationGL3Renderer;
 using agui::gui::renderer::GUIRendererBackend;
+using agui::gui::GUIEventHandler;
 
 using tdme::application::Application;
 using tdme::audio::Audio;
-using tdme::engine::Texture;
 using tdme::engine::fileio::textures::TextureReader;
 using tdme::engine::subsystems::renderer::RendererBackend;
+using tdme::engine::Texture;
 using tdme::os::filesystem::FileSystem;
 using tdme::os::filesystem::FileSystemInterface;
 using tdme::os::threading::Thread;

diff --git a/src/tdme/application/Application.h b/src/tdme/application/Application.h
@@ -21,9 +21,9 @@
 #include <vector>
 
 #include <agui/agui.h>
+#include <agui/gui/renderer/GUIRendererBackend.h>
 #include <agui/gui/GUIApplication.h>
 #include <agui/gui/GUIEventHandler.h>
-#include <agui/gui/renderer/GUIRendererBackend.h>
 
 #include <tdme/tdme.h>
 #include <tdme/application/fwd-tdme.h>
@@ -37,9 +37,9 @@ using std::unordered_set;
 using std::vector;
 
 // namespaces
+using agui::gui::renderer::GUIRendererBackend;
 using agui::gui::GUIApplication;
 using agui::gui::GUIEventHandler;
-using agui::gui::renderer::GUIRendererBackend;
 
 using tdme::engine::subsystems::renderer::RendererBackend;
 

diff --git a/src/tdme/engine/SceneConnector.cpp b/src/tdme/engine/SceneConnector.cpp
@@ -56,6 +56,7 @@
 #include <tdme/engine/subsystems/particlesystem/CircleParticleEmitterPlaneVelocity.h>
 #include <tdme/engine/subsystems/particlesystem/PointParticleEmitter.h>
 #include <tdme/engine/subsystems/particlesystem/SphereParticleEmitter.h>
+#include <tdme/engine/tools/FileSystemTools.h>
 #include <tdme/engine/Color4.h>
 #include <tdme/engine/Decal.h>
 #include <tdme/engine/Engine.h>
@@ -77,7 +78,6 @@
 #include <tdme/math/Math.h>
 #include <tdme/math/Vector3.h>
 #include <tdme/math/Vector4.h>
-#include <tdme/engine/tools/FileSystemTools.h>
 #include <tdme/utilities/Console.h>
 #include <tdme/utilities/ModelTools.h>
 #include <tdme/utilities/StringTools.h>
@@ -137,6 +137,7 @@ using tdme::engine::subsystems::particlesystem::CircleParticleEmitter;
 using tdme::engine::subsystems::particlesystem::CircleParticleEmitterPlaneVelocity;
 using tdme::engine::subsystems::particlesystem::PointParticleEmitter;
 using tdme::engine::subsystems::particlesystem::SphereParticleEmitter;
+using tdme::engine::tools::FileSystemTools;
 using tdme::engine::Color4;
 using tdme::engine::Decal;
 using tdme::engine::Engine;
@@ -158,7 +159,6 @@ using tdme::engine::Transform;
 using tdme::math::Math;
 using tdme::math::Vector3;
 using tdme::math::Vector4;
-using tdme::engine::tools::FileSystemTools;
 using tdme::utilities::Console;
 using tdme::utilities::ModelTools;
 using tdme::utilities::StringTools;

diff --git a/src/tdme/engine/fileio/models/TMWriter.cpp b/src/tdme/engine/fileio/models/TMWriter.cpp
@@ -28,14 +28,14 @@
 #include <tdme/engine/primitives/BoundingBox.h>
 #include <tdme/engine/prototype/Prototype.h>
 #include <tdme/engine/prototype/Prototype_Type.h>
+#include <tdme/engine/tools/ThumbnailTool.h>
 #include <tdme/engine/Color4.h>
 #include <tdme/engine/Texture.h>
 #include <tdme/math/Matrix4x4.h>
 #include <tdme/math/Vector2.h>
 #include <tdme/math/Vector3.h>
 #include <tdme/os/filesystem/FileSystem.h>
 #include <tdme/os/filesystem/FileSystemInterface.h>
-#include <tdme/engine/tools/ThumbnailTool.h>
 #include <tdme/utilities/Console.h>
 #include <tdme/utilities/Exception.h>
 
@@ -70,14 +70,14 @@ using tdme::engine::model::UpVector;
 using tdme::engine::primitives::BoundingBox;
 using tdme::engine::prototype::Prototype;
 using tdme::engine::prototype::Prototype_Type;
+using tdme::engine::tools::ThumbnailTool;
 using tdme::engine::Color4;
 using tdme::engine::Texture;
 using tdme::math::Matrix4x4;
 using tdme::math::Vector2;
 using tdme::math::Vector3;
 using tdme::os::filesystem::FileSystem;
 using tdme::os::filesystem::FileSystemInterface;
-using tdme::engine::tools::ThumbnailTool;
 using tdme::utilities::Console;
 using tdme::utilities::Exception;
 

diff --git a/src/tdme/engine/fileio/prototypes/PrototypeReader.cpp b/src/tdme/engine/fileio/prototypes/PrototypeReader.cpp
@@ -31,6 +31,7 @@
 #include <tdme/engine/prototype/PrototypePhysics.h>
 #include <tdme/engine/prototype/PrototypePhysics_BodyType.h>
 #include <tdme/engine/prototype/PrototypeTerrain.h>
+#include <tdme/engine/tools/FileSystemTools.h>
 #include <tdme/engine/Color4.h>
 #include <tdme/engine/EntityShaderParameters.h>
 #include <tdme/engine/LODObject.h>
@@ -40,7 +41,6 @@
 #include <tdme/os/filesystem/FileSystem.h>
 #include <tdme/os/filesystem/FileSystemException.h>
 #include <tdme/os/filesystem/FileSystemInterface.h>
-#include <tdme/engine/tools/FileSystemTools.h>
 #include <tdme/utilities/Base64.h>
 #include <tdme/utilities/Console.h>
 #include <tdme/utilities/Exception.h>
@@ -82,6 +82,7 @@ using tdme::engine::prototype::PrototypeParticleSystem_Type;
 using tdme::engine::prototype::PrototypePhysics;
 using tdme::engine::prototype::PrototypePhysics_BodyType;
 using tdme::engine::prototype::PrototypeTerrain;
+using tdme::engine::tools::FileSystemTools;
 using tdme::engine::Color4;
 using tdme::engine::EntityShaderParameters;
 using tdme::engine::LODObject;
@@ -91,7 +92,6 @@ using tdme::math::Vector3;
 using tdme::os::filesystem::FileSystem;
 using tdme::os::filesystem::FileSystemException;
 using tdme::os::filesystem::FileSystemInterface;
-using tdme::engine::tools::FileSystemTools;
 using tdme::utilities::Base64;
 using tdme::utilities::Console;
 using tdme::utilities::Exception;

diff --git a/src/tdme/engine/fileio/prototypes/PrototypeWriter.cpp b/src/tdme/engine/fileio/prototypes/PrototypeWriter.cpp
@@ -39,13 +39,13 @@
 #include <tdme/engine/prototype/PrototypeTerrain.h>
 #include <tdme/engine/prototype/PrototypeTerrainBrush.h>
 #include <tdme/engine/prototype/PrototypeTerrainBrushPrototype.h>
+#include <tdme/engine/tools/FileSystemTools.h>
+#include <tdme/engine/tools/ThumbnailTool.h>
 #include <tdme/engine/Color4.h>
 #include <tdme/engine/Engine.h>
 #include <tdme/engine/EntityShaderParameters.h>
 #include <tdme/engine/LODObject.h>
 #include <tdme/engine/ShaderParameter.h>
-#include <tdme/engine/tools/ThumbnailTool.h>
-#include <tdme/engine/tools/FileSystemTools.h>
 #include <tdme/math/Vector3.h>
 #include <tdme/os/filesystem/FileSystem.h>
 #include <tdme/os/filesystem/FileSystemInterface.h>
@@ -94,13 +94,13 @@ using tdme::engine::prototype::PrototypePhysics_BodyType;
 using tdme::engine::prototype::PrototypeTerrain;
 using tdme::engine::prototype::PrototypeTerrainBrush;
 using tdme::engine::prototype::PrototypeTerrainBrushPrototype;
+using tdme::engine::tools::FileSystemTools;
+using tdme::engine::tools::ThumbnailTool;
 using tdme::engine::Color4;
 using tdme::engine::Engine;
 using tdme::engine::EntityShaderParameters;
 using tdme::engine::LODObject;
 using tdme::engine::ShaderParameter;
-using tdme::engine::tools::ThumbnailTool;
-using tdme::engine::tools::FileSystemTools;
 using tdme::math::Vector3;
 using tdme::os::filesystem::FileSystem;
 using tdme::os::filesystem::FileSystemInterface;

diff --git a/src/tdme/engine/fileio/scenes/SceneReader.cpp b/src/tdme/engine/fileio/scenes/SceneReader.cpp
@@ -22,6 +22,7 @@
 #include <tdme/engine/scene/SceneLibrary.h>
 #include <tdme/engine/scene/SceneLight.h>
 #include <tdme/engine/subsystems/rendering/ModelStatistics.h>
+#include <tdme/engine/tools/FileSystemTools.h>
 #include <tdme/engine/Color4.h>
 #include <tdme/engine/ModelUtilities.h>
 #include <tdme/engine/Transform.h>
@@ -30,7 +31,6 @@
 #include <tdme/math/Vector4.h>
 #include <tdme/os/filesystem/FileSystem.h>
 #include <tdme/os/filesystem/FileSystemInterface.h>
-#include <tdme/engine/tools/FileSystemTools.h>
 #include <tdme/utilities/Console.h>
 #include <tdme/utilities/Exception.h>
 #include <tdme/utilities/Float.h>
@@ -69,6 +69,7 @@ using tdme::engine::scene::SceneEntity;
 using tdme::engine::scene::SceneLibrary;
 using tdme::engine::scene::SceneLight;
 using tdme::engine::subsystems::rendering::ModelStatistics;
+using tdme::engine::tools::FileSystemTools;
 using tdme::engine::Color4;
 using tdme::engine::ModelUtilities;
 using tdme::engine::Transform;
@@ -77,7 +78,6 @@ using tdme::math::Vector3;
 using tdme::math::Vector4;
 using tdme::os::filesystem::FileSystem;
 using tdme::os::filesystem::FileSystemInterface;
-using tdme::engine::tools::FileSystemTools;
 using tdme::utilities::Console;
 using tdme::utilities::Exception;
 using tdme::utilities::Float;

diff --git a/src/tdme/engine/logics/MinitScriptLogic.h b/src/tdme/engine/logics/MinitScriptLogic.h
@@ -16,12 +16,12 @@
 #include <tdme/engine/model/Model.h>
 #include <tdme/engine/model/RotationOrder.h>
 #include <tdme/engine/prototype/Prototype.h>
+#include <tdme/engine/tools/FileSystemTools.h>
 #include <tdme/engine/Engine.h>
 #include <tdme/engine/EntityHierarchy.h>
 #include <tdme/engine/SceneConnector.h>
 #include <tdme/engine/Transform.h>
 #include <tdme/minitscript/EngineMinitScript.h>
-#include <tdme/engine/tools/FileSystemTools.h>
 #include <tdme/utilities/Console.h>
 
 using std::make_unique;
@@ -39,12 +39,12 @@ using tdme::engine::logics::Logic;
 using tdme::engine::model::Model;
 using tdme::engine::model::RotationOrder;
 using tdme::engine::prototype::Prototype;
+using tdme::engine::tools::FileSystemTools;
 using tdme::engine::Engine;
 using tdme::engine::EntityHierarchy;
 using tdme::engine::SceneConnector;
 using tdme::engine::Transform;
 using tdme::minitscript::EngineMinitScript;
-using tdme::engine::tools::FileSystemTools;
 using tdme::utilities::Console;
 
 /**

diff --git a/src/tdme/engine/prototype/PrototypeDecal.cpp b/src/tdme/engine/prototype/PrototypeDecal.cpp
@@ -4,14 +4,14 @@
 
 #include <tdme/tdme.h>
 #include <tdme/engine/fileio/textures/TextureReader.h>
-#include <tdme/engine/Texture.h>
 #include <tdme/engine/tools/FileSystemTools.h>
+#include <tdme/engine/Texture.h>
 
 using std::string;
 
 using tdme::engine::fileio::textures::TextureReader;
-using tdme::engine::Texture;
 using tdme::engine::tools::FileSystemTools;
+using tdme::engine::Texture;
 
 using tdme::engine::prototype::PrototypeDecal;
 

diff --git a/src/tdme/engine/prototype/PrototypeParticleSystem_FogParticleSystem.cpp b/src/tdme/engine/prototype/PrototypeParticleSystem_FogParticleSystem.cpp
@@ -4,14 +4,14 @@
 
 #include <tdme/tdme.h>
 #include <tdme/engine/fileio/textures/TextureReader.h>
-#include <tdme/engine/Texture.h>
 #include <tdme/engine/tools/FileSystemTools.h>
+#include <tdme/engine/Texture.h>
 
 using std::string;
 
 using tdme::engine::fileio::textures::TextureReader;
-using tdme::engine::Texture;
 using tdme::engine::tools::FileSystemTools;
+using tdme::engine::Texture;
 
 using tdme::engine::prototype::PrototypeParticleSystem_FogParticleSystem;
 

diff --git a/src/tdme/engine/prototype/PrototypeParticleSystem_ObjectParticleSystem.cpp b/src/tdme/engine/prototype/PrototypeParticleSystem_ObjectParticleSystem.cpp
@@ -6,8 +6,8 @@
 #include <tdme/tdme.h>
 #include <tdme/engine/fileio/models/ModelReader.h>
 #include <tdme/engine/model/Model.h>
-#include <tdme/math/Vector3.h>
 #include <tdme/engine/tools/FileSystemTools.h>
+#include <tdme/math/Vector3.h>
 #include <tdme/utilities/ExceptionBase.h>
 #include <tdme/utilities/StringTools.h>
 
@@ -17,8 +17,8 @@ using std::unique_ptr;
 using tdme::engine::fileio::models::ModelReader;
 using tdme::engine::model::Model;
 using tdme::engine::prototype::PrototypeParticleSystem_ObjectParticleSystem;
-using tdme::math::Vector3;
 using tdme::engine::tools::FileSystemTools;
+using tdme::math::Vector3;
 using tdme::utilities::ExceptionBase;
 using tdme::utilities::StringTools;
 

diff --git a/src/tdme/engine/prototype/PrototypeParticleSystem_PointParticleSystem.cpp b/src/tdme/engine/prototype/PrototypeParticleSystem_PointParticleSystem.cpp
@@ -4,14 +4,14 @@
 
 #include <tdme/tdme.h>
 #include <tdme/engine/fileio/textures/TextureReader.h>
-#include <tdme/engine/Texture.h>
 #include <tdme/engine/tools/FileSystemTools.h>
+#include <tdme/engine/Texture.h>
 
 using std::string;
 
 using tdme::engine::fileio::textures::TextureReader;
-using tdme::engine::Texture;
 using tdme::engine::tools::FileSystemTools;
+using tdme::engine::Texture;
 
 using tdme::engine::prototype::PrototypeParticleSystem_PointParticleSystem;
 

diff --git a/src/tdme/engine/tools/CameraRotationInputHandler.cpp b/src/tdme/engine/tools/CameraRotationInputHandler.cpp
@@ -7,29 +7,29 @@
 
 #include <tdme/tdme.h>
 #include <tdme/engine/primitives/BoundingBox.h>
+#include <tdme/engine/tools/fwd-tdme.h>
+#include <tdme/engine/tools/CameraRotationInputHandlerEventHandler.h>
 #include <tdme/engine/Camera.h>
 #include <tdme/engine/Engine.h>
 #include <tdme/engine/Entity.h>
 #include <tdme/engine/Transform.h>
 #include <tdme/math/Matrix4x4.h>
 #include <tdme/math/Quaternion.h>
 #include <tdme/math/Vector3.h>
-#include <tdme/engine/tools/fwd-tdme.h>
-#include <tdme/engine/tools/CameraRotationInputHandlerEventHandler.h>
 #include <tdme/utilities/Character.h>
 
 using agui::gui::events::GUIKeyboardEvent;
 using agui::gui::events::GUIMouseEvent;
 using agui::gui::GUI;
 
+using tdme::engine::tools::CameraRotationInputHandler;
+using tdme::engine::tools::CameraRotationInputHandlerEventHandler;
 using tdme::engine::Camera;
 using tdme::engine::Engine;
 using tdme::engine::Transform;
 using tdme::math::Matrix4x4;
 using tdme::math::Quaternion;
 using tdme::math::Vector3;
-using tdme::engine::tools::CameraRotationInputHandler;
-using tdme::engine::tools::CameraRotationInputHandlerEventHandler;
 using tdme::utilities::Character;
 
 CameraRotationInputHandler::CameraRotationInputHandler(Engine* engine, CameraRotationInputHandlerEventHandler* eventHandler)

diff --git a/src/tdme/engine/tools/CameraRotationInputHandler.h b/src/tdme/engine/tools/CameraRotationInputHandler.h
@@ -6,15 +6,15 @@
 #include <tdme/tdme.h>
 #include <tdme/engine/fwd-tdme.h>
 #include <tdme/engine/primitives/BoundingBox.h>
-#include <tdme/engine/Transform.h>
 #include <tdme/engine/tools/fwd-tdme.h>
+#include <tdme/engine/Transform.h>
 
 using agui::gui::events::GUIInputEventHandler;
 
 using tdme::engine::primitives::BoundingBox;
+using tdme::engine::tools::CameraRotationInputHandlerEventHandler;
 using tdme::engine::Engine;
 using tdme::engine::Transform;
-using tdme::engine::tools::CameraRotationInputHandlerEventHandler;
 
 /**
  * Camera Rotation Input Handler

diff --git a/src/tdme/engine/tools/FileSystemTools.cpp b/src/tdme/engine/tools/FileSystemTools.cpp
@@ -17,7 +17,6 @@ using tdme::engine::tools::FileSystemTools;
 
 using tdme::application::Application;
 using tdme::engine::Engine;
-using tdme::utilities::StringTools;
 using tdme::os::filesystem::FileSystem;
 using tdme::os::filesystem::FileSystemInterface;
 using tdme::utilities::Integer;