Merge remote-tracking branch 'origin/master' into jaro/collision-system-handeling

4 files changed, 119 insertions, 26 deletions

diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 187ed46..f62414e 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -19,4 +19,6 @@ endfunction()
 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..6a334b1
--- /dev/null
+++ b/src/example/FontExample.cpp
@@ -0,0 +1,55 @@
+#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>
+#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), "OpenSymbol",
+										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() {
+	// Config& config = Config::get_instance();
+	// config.log.level = Log::Level::TRACE;
+	LoopManager engine;
+	engine.add_scene<TestScene>();
+	engine.start();
+
+	return 0;
+}
diff --git a/src/example/button.cpp b/src/example/button.cpp
index 00bdc28..4220588 100644
--- a/src/example/button.cpp
+++ b/src/example/button.cpp
@@ -1,52 +1,39 @@
 #include <SDL2/SDL_timer.h>
 #include <chrono>
 #include <crepe/Component.h>
-#include <crepe/ComponentManager.h>
 #include <crepe/api/Animator.h>
 #include <crepe/api/Button.h>
 #include <crepe/api/Camera.h>
 #include <crepe/api/Color.h>
-#include <crepe/api/EventManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Sprite.h>
 #include <crepe/api/Texture.h>
 #include <crepe/api/Transform.h>
+#include <crepe/facade/SDLContext.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/EventManager.h>
 #include <crepe/system/AnimatorSystem.h>
 #include <crepe/system/InputSystem.h>
 #include <crepe/system/RenderSystem.h>
 #include <crepe/types.h>
-#include <iostream>
 using namespace crepe;
 using namespace std;
 
 int main(int argc, char * argv[]) {
-	ComponentManager mgr;
-	RenderSystem sys{mgr};
-	EventManager & event_mgr = EventManager::get_instance();
-	InputSystem input_sys{mgr};
-	AnimatorSystem asys{mgr};
-	GameObject camera_obj = mgr.new_object("", "", vec2{1000, 1000}, 0, 1);
-	camera_obj.add_component<Camera>(Color::WHITE, ivec2{1080, 720}, vec2{2000, 2000}, 1.0f);
-
-	GameObject button_obj = mgr.new_object("body", "person", vec2{0, 0}, 0, 1);
-	auto s2 = Texture("asset/texture/test_ap43.png");
-	bool button_clicked = false;
-	auto & sprite2 = button_obj.add_component<Sprite>(
-		s2, Color::GREEN, Sprite::FlipSettings{false, false}, 2, 1, 100);
-	std::function<void()> on_click = [&]() { std::cout << "button clicked" << std::endl; };
-	std::function<void()> on_enter = [&]() { std::cout << "enter" << std::endl; };
-	std::function<void()> on_exit = [&]() { std::cout << "exit" << std::endl; };
-	auto & button
-		= button_obj.add_component<Button>(vec2{100, 100}, vec2{0, 0}, on_click, false);
-	button.on_mouse_enter = on_enter;
-	button.on_mouse_exit = on_exit;
-	button.is_toggle = true;
-	button.active = true;
+	Mediator mediator;
+	ComponentManager mgr{mediator};
+	RenderSystem sys{mediator};
+	EventManager event_mgr{mediator};
+	InputSystem input_sys{mediator};
+	SDLContext sdl_context{mediator};
+	GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1);
+	auto & camera = obj.add_component<Camera>(
+		ivec2{500, 500}, vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f});
 	auto start = std::chrono::steady_clock::now();
 	while (true) {
+		const keyboard_state_t & keyboard_state = sdl_context.get_keyboard_state();
 		input_sys.update();
 		sys.update();
-		asys.update();
 		event_mgr.dispatch_events();
 		SDL_Delay(30);
 	}
diff --git a/src/example/loadfont.cpp b/src/example/loadfont.cpp
new file mode 100644
index 0000000..e459332
--- /dev/null
+++ b/src/example/loadfont.cpp
@@ -0,0 +1,49 @@
+#include <SDL2/SDL_ttf.h>
+#include <crepe/api/Asset.h>
+#include <crepe/api/Text.h>
+#include <crepe/facade/Font.h>
+#include <crepe/facade/FontFacade.h>
+#include <crepe/facade/SDLContext.h>
+#include <crepe/manager/Mediator.h>
+#include <crepe/manager/ResourceManager.h>
+#include <exception>
+#include <iostream>
+#include <memory>
+#include <optional>
+using namespace crepe;
+int main() {
+
+	// SDLFontContext font_facade;
+	Mediator mediator;
+	FontFacade font_facade{};
+	SDLContext sdl_context{mediator};
+	// ComponentManager component_manager{mediator};
+	ResourceManager resource_manager{mediator};
+	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");
+		// std::cout << "Path: " << label->font.get_path() << std::endl;
+		Asset asset1 = font_facade.get_font_asset("OpenSymbol");
+		std::cout << asset1.get_path() << std::endl;
+		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.emplace(asset);
+		std::cout << label->font.value().get_path() << std::endl;
+		// label2->font = std::make_optional(asset);
+		// std::cout << "Path: " << label2->font.get_path() << std::endl;
+		ResourceManager & resource_mgr = mediator.resource_manager;
+		const Font & res = resource_manager.get<Font>(label->font.value());
+		// 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;
+	}
+
+	return 0;
+}