Merge branch 'wouter/text-component' into niels/UI

2 files changed, 8 insertions, 7 deletions

diff --git a/src/example/FontExample.cpp b/src/example/FontExample.cpp
index 7b2dadb..6a334b1 100644
--- a/src/example/FontExample.cpp
+++ b/src/example/FontExample.cpp
@@ -1,6 +1,7 @@
 #include <SDL2/SDL_ttf.h>
 #include <chrono>
 #include <crepe/api/Camera.h>
+#include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/LoopManager.h>
 #include <crepe/api/Scene.h>
@@ -11,7 +12,6 @@
 #include <crepe/manager/EventManager.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/manager/ResourceManager.h>
-#include <crepe/api/Config.h>
 #include <exception>
 #include <iostream>
 #include <memory>
@@ -37,7 +37,8 @@ class TestScene : public Scene {
 public:
 	void load_scene() override {
 		GameObject text_object = this->new_object("test", "test", vec2{0, 0}, 0, 1);
-		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{});
+		text_object.add_component<Text>(vec2(100, 100), vec2(0, 0), "OpenSymbol",
+										Text::Data{});
 		text_object.add_component<BehaviorScript>().set_script<TestScript>();
 		text_object.add_component<Camera>(ivec2{300, 300}, vec2{100, 100}, Camera::Data{});
 	}
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 36d00dd..ed67ffa 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -1,14 +1,14 @@
 #include <SDL2/SDL_ttf.h>
+#include <crepe/api/Asset.h>
 #include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
 #include <crepe/facade/SDLContext.h>
-#include <crepe/api/Asset.h>
 #include <crepe/manager/Mediator.h>
 #include <crepe/manager/ResourceManager.h>
 #include <exception>
 #include <iostream>
-#include <optional>
 #include <memory>
+#include <optional>
 using namespace crepe;
 int main() {
 
@@ -20,11 +20,11 @@ int main() {
 	try {
 		// Correct way to create a unique pointer for Text
 		std::unique_ptr<Text> label = std::make_unique<Text>(
-			1, vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{},"test text", Asset(""));
+			1, vec2(100, 100), vec2(0, 0), "OpenSymbol", Text::Data{}, "test text", Asset(""));
 		// std::cout << "Path: " << label->font.get_path() << std::endl;
 
-		std::unique_ptr<Text> label2
-			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0),"fsaafdafsdafsdafsdasfdds", Text::Data{});
+		std::unique_ptr<Text> label2 = std::make_unique<Text>(
+			1, vec2(100, 100), vec2(0, 0), "fsaafdafsdafsdafsdasfdds", Text::Data{});
 		Asset asset = Asset("test test");
 		label->font = asset;
 		std::cout << label->font.value().get_path() << std::endl;