Skip to content

Commit e360428

Browse files
andreasdrandreasdr
committed
follow up[F: sorted includes
1 parent 0c9e2a2 commit e360428

File tree

55 files changed

+141
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+141
-143
lines changed

‎src/tdme/application/Application.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,17 @@
3434
#include <memory>
3535
#include <string>
3636

37-
#include <agui/gui/GUIEventHandler.h>
37+
#include <agui/agui.h>
3838
#include <agui/gui/renderer/ApplicationGL3Renderer.h>
3939
#include <agui/gui/renderer/GUIRendererBackend.h>
40+
#include <agui/gui/GUIEventHandler.h>
4041

4142
#include <tdme/tdme.h>
4243
#include <tdme/application/Application.h>
4344
#include <tdme/audio/Audio.h>
44-
#include <tdme/engine/Texture.h>
4545
#include <tdme/engine/fileio/textures/TextureReader.h>
4646
#include <tdme/engine/subsystems/renderer/RendererBackend.h>
47+
#include <tdme/engine/Texture.h>
4748
#include <tdme/os/filesystem/FileSystem.h>
4849
#include <tdme/os/filesystem/FileSystemInterface.h>
4950
#include <tdme/os/threading/Thread.h>
@@ -59,20 +60,20 @@
5960

6061
using std::array;
6162
using std::make_unique;
62-
using std::unique_ptr;
6363
using std::shared_ptr;
6464
using std::string;
6565
using std::to_string;
66+
using std::unique_ptr;
6667

67-
using agui::gui::GUIEventHandler;
6868
using agui::gui::renderer::ApplicationGL3Renderer;
6969
using agui::gui::renderer::GUIRendererBackend;
70+
using agui::gui::GUIEventHandler;
7071

7172
using tdme::application::Application;
7273
using tdme::audio::Audio;
73-
using tdme::engine::Texture;
7474
using tdme::engine::fileio::textures::TextureReader;
7575
using tdme::engine::subsystems::renderer::RendererBackend;
76+
using tdme::engine::Texture;
7677
using tdme::os::filesystem::FileSystem;
7778
using tdme::os::filesystem::FileSystemInterface;
7879
using tdme::os::threading::Thread;

‎src/tdme/application/Application.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#include <vector>
2222

2323
#include <agui/agui.h>
24+
#include <agui/gui/renderer/GUIRendererBackend.h>
2425
#include <agui/gui/GUIApplication.h>
2526
#include <agui/gui/GUIEventHandler.h>
26-
#include <agui/gui/renderer/GUIRendererBackend.h>
2727

2828
#include <tdme/tdme.h>
2929
#include <tdme/application/fwd-tdme.h>
@@ -37,9 +37,9 @@ using std::unordered_set;
3737
using std::vector;
3838

3939
// namespaces
40+
using agui::gui::renderer::GUIRendererBackend;
4041
using agui::gui::GUIApplication;
4142
using agui::gui::GUIEventHandler;
42-
using agui::gui::renderer::GUIRendererBackend;
4343

4444
using tdme::engine::subsystems::renderer::RendererBackend;
4545

‎src/tdme/engine/SceneConnector.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
#include <tdme/engine/subsystems/particlesystem/CircleParticleEmitterPlaneVelocity.h>
5757
#include <tdme/engine/subsystems/particlesystem/PointParticleEmitter.h>
5858
#include <tdme/engine/subsystems/particlesystem/SphereParticleEmitter.h>
59+
#include <tdme/engine/tools/FileSystemTools.h>
5960
#include <tdme/engine/Color4.h>
6061
#include <tdme/engine/Decal.h>
6162
#include <tdme/engine/Engine.h>
@@ -77,7 +78,6 @@
7778
#include <tdme/math/Math.h>
7879
#include <tdme/math/Vector3.h>
7980
#include <tdme/math/Vector4.h>
80-
#include <tdme/engine/tools/FileSystemTools.h>
8181
#include <tdme/utilities/Console.h>
8282
#include <tdme/utilities/ModelTools.h>
8383
#include <tdme/utilities/StringTools.h>
@@ -137,6 +137,7 @@ using tdme::engine::subsystems::particlesystem::CircleParticleEmitter;
137137
using tdme::engine::subsystems::particlesystem::CircleParticleEmitterPlaneVelocity;
138138
using tdme::engine::subsystems::particlesystem::PointParticleEmitter;
139139
using tdme::engine::subsystems::particlesystem::SphereParticleEmitter;
140+
using tdme::engine::tools::FileSystemTools;
140141
using tdme::engine::Color4;
141142
using tdme::engine::Decal;
142143
using tdme::engine::Engine;
@@ -158,7 +159,6 @@ using tdme::engine::Transform;
158159
using tdme::math::Math;
159160
using tdme::math::Vector3;
160161
using tdme::math::Vector4;
161-
using tdme::engine::tools::FileSystemTools;
162162
using tdme::utilities::Console;
163163
using tdme::utilities::ModelTools;
164164
using tdme::utilities::StringTools;

‎src/tdme/engine/fileio/models/TMWriter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
#include <tdme/engine/primitives/BoundingBox.h>
2929
#include <tdme/engine/prototype/Prototype.h>
3030
#include <tdme/engine/prototype/Prototype_Type.h>
31+
#include <tdme/engine/tools/ThumbnailTool.h>
3132
#include <tdme/engine/Color4.h>
3233
#include <tdme/engine/Texture.h>
3334
#include <tdme/math/Matrix4x4.h>
3435
#include <tdme/math/Vector2.h>
3536
#include <tdme/math/Vector3.h>
3637
#include <tdme/os/filesystem/FileSystem.h>
3738
#include <tdme/os/filesystem/FileSystemInterface.h>
38-
#include <tdme/engine/tools/ThumbnailTool.h>
3939
#include <tdme/utilities/Console.h>
4040
#include <tdme/utilities/Exception.h>
4141

@@ -70,14 +70,14 @@ using tdme::engine::model::UpVector;
7070
using tdme::engine::primitives::BoundingBox;
7171
using tdme::engine::prototype::Prototype;
7272
using tdme::engine::prototype::Prototype_Type;
73+
using tdme::engine::tools::ThumbnailTool;
7374
using tdme::engine::Color4;
7475
using tdme::engine::Texture;
7576
using tdme::math::Matrix4x4;
7677
using tdme::math::Vector2;
7778
using tdme::math::Vector3;
7879
using tdme::os::filesystem::FileSystem;
7980
using tdme::os::filesystem::FileSystemInterface;
80-
using tdme::engine::tools::ThumbnailTool;
8181
using tdme::utilities::Console;
8282
using tdme::utilities::Exception;
8383

‎src/tdme/engine/fileio/prototypes/PrototypeReader.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <tdme/engine/prototype/PrototypePhysics.h>
3232
#include <tdme/engine/prototype/PrototypePhysics_BodyType.h>
3333
#include <tdme/engine/prototype/PrototypeTerrain.h>
34+
#include <tdme/engine/tools/FileSystemTools.h>
3435
#include <tdme/engine/Color4.h>
3536
#include <tdme/engine/EntityShaderParameters.h>
3637
#include <tdme/engine/LODObject.h>
@@ -40,7 +41,6 @@
4041
#include <tdme/os/filesystem/FileSystem.h>
4142
#include <tdme/os/filesystem/FileSystemException.h>
4243
#include <tdme/os/filesystem/FileSystemInterface.h>
43-
#include <tdme/engine/tools/FileSystemTools.h>
4444
#include <tdme/utilities/Base64.h>
4545
#include <tdme/utilities/Console.h>
4646
#include <tdme/utilities/Exception.h>
@@ -82,6 +82,7 @@ using tdme::engine::prototype::PrototypeParticleSystem_Type;
8282
using tdme::engine::prototype::PrototypePhysics;
8383
using tdme::engine::prototype::PrototypePhysics_BodyType;
8484
using tdme::engine::prototype::PrototypeTerrain;
85+
using tdme::engine::tools::FileSystemTools;
8586
using tdme::engine::Color4;
8687
using tdme::engine::EntityShaderParameters;
8788
using tdme::engine::LODObject;
@@ -91,7 +92,6 @@ using tdme::math::Vector3;
9192
using tdme::os::filesystem::FileSystem;
9293
using tdme::os::filesystem::FileSystemException;
9394
using tdme::os::filesystem::FileSystemInterface;
94-
using tdme::engine::tools::FileSystemTools;
9595
using tdme::utilities::Base64;
9696
using tdme::utilities::Console;
9797
using tdme::utilities::Exception;

‎src/tdme/engine/fileio/prototypes/PrototypeWriter.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
#include <tdme/engine/prototype/PrototypeTerrain.h>
4040
#include <tdme/engine/prototype/PrototypeTerrainBrush.h>
4141
#include <tdme/engine/prototype/PrototypeTerrainBrushPrototype.h>
42+
#include <tdme/engine/tools/FileSystemTools.h>
43+
#include <tdme/engine/tools/ThumbnailTool.h>
4244
#include <tdme/engine/Color4.h>
4345
#include <tdme/engine/Engine.h>
4446
#include <tdme/engine/EntityShaderParameters.h>
4547
#include <tdme/engine/LODObject.h>
4648
#include <tdme/engine/ShaderParameter.h>
47-
#include <tdme/engine/tools/ThumbnailTool.h>
48-
#include <tdme/engine/tools/FileSystemTools.h>
4949
#include <tdme/math/Vector3.h>
5050
#include <tdme/os/filesystem/FileSystem.h>
5151
#include <tdme/os/filesystem/FileSystemInterface.h>
@@ -94,13 +94,13 @@ using tdme::engine::prototype::PrototypePhysics_BodyType;
9494
using tdme::engine::prototype::PrototypeTerrain;
9595
using tdme::engine::prototype::PrototypeTerrainBrush;
9696
using tdme::engine::prototype::PrototypeTerrainBrushPrototype;
97+
using tdme::engine::tools::FileSystemTools;
98+
using tdme::engine::tools::ThumbnailTool;
9799
using tdme::engine::Color4;
98100
using tdme::engine::Engine;
99101
using tdme::engine::EntityShaderParameters;
100102
using tdme::engine::LODObject;
101103
using tdme::engine::ShaderParameter;
102-
using tdme::engine::tools::ThumbnailTool;
103-
using tdme::engine::tools::FileSystemTools;
104104
using tdme::math::Vector3;
105105
using tdme::os::filesystem::FileSystem;
106106
using tdme::os::filesystem::FileSystemInterface;

‎src/tdme/engine/fileio/scenes/SceneReader.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <tdme/engine/scene/SceneLibrary.h>
2323
#include <tdme/engine/scene/SceneLight.h>
2424
#include <tdme/engine/subsystems/rendering/ModelStatistics.h>
25+
#include <tdme/engine/tools/FileSystemTools.h>
2526
#include <tdme/engine/Color4.h>
2627
#include <tdme/engine/ModelUtilities.h>
2728
#include <tdme/engine/Transform.h>
@@ -30,7 +31,6 @@
3031
#include <tdme/math/Vector4.h>
3132
#include <tdme/os/filesystem/FileSystem.h>
3233
#include <tdme/os/filesystem/FileSystemInterface.h>
33-
#include <tdme/engine/tools/FileSystemTools.h>
3434
#include <tdme/utilities/Console.h>
3535
#include <tdme/utilities/Exception.h>
3636
#include <tdme/utilities/Float.h>
@@ -69,6 +69,7 @@ using tdme::engine::scene::SceneEntity;
6969
using tdme::engine::scene::SceneLibrary;
7070
using tdme::engine::scene::SceneLight;
7171
using tdme::engine::subsystems::rendering::ModelStatistics;
72+
using tdme::engine::tools::FileSystemTools;
7273
using tdme::engine::Color4;
7374
using tdme::engine::ModelUtilities;
7475
using tdme::engine::Transform;
@@ -77,7 +78,6 @@ using tdme::math::Vector3;
7778
using tdme::math::Vector4;
7879
using tdme::os::filesystem::FileSystem;
7980
using tdme::os::filesystem::FileSystemInterface;
80-
using tdme::engine::tools::FileSystemTools;
8181
using tdme::utilities::Console;
8282
using tdme::utilities::Exception;
8383
using tdme::utilities::Float;

‎src/tdme/engine/logics/MinitScriptLogic.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
#include <tdme/engine/model/Model.h>
1717
#include <tdme/engine/model/RotationOrder.h>
1818
#include <tdme/engine/prototype/Prototype.h>
19+
#include <tdme/engine/tools/FileSystemTools.h>
1920
#include <tdme/engine/Engine.h>
2021
#include <tdme/engine/EntityHierarchy.h>
2122
#include <tdme/engine/SceneConnector.h>
2223
#include <tdme/engine/Transform.h>
2324
#include <tdme/minitscript/EngineMinitScript.h>
24-
#include <tdme/engine/tools/FileSystemTools.h>
2525
#include <tdme/utilities/Console.h>
2626

2727
using std::make_unique;
@@ -39,12 +39,12 @@ using tdme::engine::logics::Logic;
3939
using tdme::engine::model::Model;
4040
using tdme::engine::model::RotationOrder;
4141
using tdme::engine::prototype::Prototype;
42+
using tdme::engine::tools::FileSystemTools;
4243
using tdme::engine::Engine;
4344
using tdme::engine::EntityHierarchy;
4445
using tdme::engine::SceneConnector;
4546
using tdme::engine::Transform;
4647
using tdme::minitscript::EngineMinitScript;
47-
using tdme::engine::tools::FileSystemTools;
4848
using tdme::utilities::Console;
4949

5050
/**

‎src/tdme/engine/prototype/PrototypeDecal.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
#include <tdme/tdme.h>
66
#include <tdme/engine/fileio/textures/TextureReader.h>
7-
#include <tdme/engine/Texture.h>
87
#include <tdme/engine/tools/FileSystemTools.h>
8+
#include <tdme/engine/Texture.h>
99

1010
using std::string;
1111

1212
using tdme::engine::fileio::textures::TextureReader;
13-
using tdme::engine::Texture;
1413
using tdme::engine::tools::FileSystemTools;
14+
using tdme::engine::Texture;
1515

1616
using tdme::engine::prototype::PrototypeDecal;
1717

‎src/tdme/engine/prototype/PrototypeParticleSystem_FogParticleSystem.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
#include <tdme/tdme.h>
66
#include <tdme/engine/fileio/textures/TextureReader.h>
7-
#include <tdme/engine/Texture.h>
87
#include <tdme/engine/tools/FileSystemTools.h>
8+
#include <tdme/engine/Texture.h>
99

1010
using std::string;
1111

1212
using tdme::engine::fileio::textures::TextureReader;
13-
using tdme::engine::Texture;
1413
using tdme::engine::tools::FileSystemTools;
14+
using tdme::engine::Texture;
1515

1616
using tdme::engine::prototype::PrototypeParticleSystem_FogParticleSystem;
1717

0 commit comments

Comments
 (0)