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

3 files changed, 63 insertions, 9 deletions

diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 0e2d5e2..f62414e 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -20,4 +20,5 @@ add_example(rendering_particle)
 add_example(game)
 add_example(button)
 add_example(loadfont)
+add_example(FontExample)
 add_example(AITest)
diff --git a/src/example/FontExample.cpp b/src/example/FontExample.cpp
new file mode 100644
index 0000000..3f5af48
--- /dev/null
+++ b/src/example/FontExample.cpp
@@ -0,0 +1,52 @@
+#include <SDL2/SDL_ttf.h>
+#include <chrono>
+#include <crepe/api/Camera.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/LoopManager.h>
+#include <crepe/api/Scene.h>
+#include <crepe/api/Script.h>
+#include <crepe/api/Text.h>
+#include <crepe/facade/Font.h>
+#include <crepe/facade/SDLContext.h>
+#include <crepe/manager/EventManager.h>
+#include <crepe/manager/Mediator.h>
+#include <crepe/manager/ResourceManager.h>
+#include <exception>
+#include <iostream>
+#include <memory>
+using namespace crepe;
+using namespace std;
+using namespace std::chrono;
+class TestScript : public Script {
+public:
+	steady_clock::time_point start_time;
+	virtual void init() override { start_time = steady_clock::now(); }
+	virtual void update() override {
+		auto now = steady_clock::now();
+		auto elapsed = duration_cast<seconds>(now - start_time).count();
+
+		if (elapsed >= 5) {
+			Mediator & med = mediator;
+			EventManager & event_mgr = med.event_manager;
+			event_mgr.trigger_event<ShutDownEvent>();
+		}
+	}
+};
+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), "test test", "Noto Sans",
+										Text::Data{});
+		text_object.add_component<BehaviorScript>().set_script<TestScript>();
+		text_object.add_component<Camera>(ivec2{300, 300}, vec2{100, 100}, Camera::Data{});
+	}
+	std::string get_name() const override { return "hey"; }
+};
+int main() {
+	LoopManager engine;
+	engine.add_scene<TestScene>();
+	engine.start();
+
+	return 0;
+}
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
index 35afdf7..ce287b4 100644
--- a/src/example/loadfont.cpp
+++ b/src/example/loadfont.cpp
@@ -1,5 +1,5 @@
-#include <crepe/api/Text.h>
 #include <SDL2/SDL_ttf.h>
+#include <crepe/api/Text.h>
 #include <crepe/facade/Font.h>
 #include <crepe/facade/SDLContext.h>
 #include <crepe/manager/Mediator.h>
@@ -13,6 +13,7 @@ int main() {
 	// SDLFontContext font_facade;
 	Mediator mediator;
 	SDLContext sdl_context{mediator};
+	// ComponentManager component_manager{mediator};
 	ResourceManager resource_manager{mediator};
 	try {
 		// Correct way to create a unique pointer for Text
@@ -24,14 +25,14 @@ int main() {
 			= std::make_unique<Text>(1, vec2(100, 100), vec2(0, 0), "test test",
 									 "fsaafdafsdafsdafsdasfdds", Text::Data{});
 		std::cout << "Path: " << label2->font.get_path() << std::endl;
-	ResourceManager & resource_mgr = mediator.resource_manager;
-	const Font & res = resource_manager.get<Font>(label->font);
-	TTF_Font * test_font = res.get_font();
-	if(test_font == NULL){
-		std::cout << "error with font" << std::endl;
-	}else{
-		std::cout << "correct font retrieved" << std::endl;
-	}
+		ResourceManager & resource_mgr = mediator.resource_manager;
+		const Font & res = resource_manager.get<Font>(label->font);
+		TTF_Font * test_font = res.get_font();
+		if (test_font == NULL) {
+			std::cout << "error with font" << std::endl;
+		} else {
+			std::cout << "correct font retrieved" << std::endl;
+		}
 	} catch (const std::exception & e) {
 		std::cout << "Standard exception thrown: " << e.what() << std::endl;
 	}