From c0ea84d90a9f2b34da53001ece6f8620f4d43b07 Mon Sep 17 00:00:00 2001 From: Ben Kyd Date: Tue, 3 Oct 2023 23:13:08 +0100 Subject: [PATCH] turms out :cdo isn't the best --- src/inferno.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/inferno.cpp b/src/inferno.cpp index cb67def..d9a35c6 100644 --- a/src/inferno.cpp +++ b/src/inferno.cpp @@ -22,12 +22,12 @@ namespace inferno { -std::unique_ptr inferno_create() +InfernoApp* inferno_create() { // MOTD yolo::info("INFERNO HART v" INFERNO_VERSION); - std::unique_ptr app = new InfernoApp; + InfernoApp* app = new InfernoApp; app->Input = new InfernoInput; // Create window @@ -36,11 +36,11 @@ std::unique_ptr inferno_create() // setup the scene scene::Material basicMaterial("basic"); - std::unique_ptr basicShader = graphics::shader_create(); + graphics::Shader* basicShader = graphics::shader_create(); graphics::shader_load(basicShader, "res/shaders/basic.glsl"); graphics::shader_link(basicShader); - std::unique_ptr object = scene::scene_object_create(); + scene::SceneObject* object = scene::scene_object_create(); scene::Mesh cornell; cornell.loadOBJ("res/cornell-box.obj"); @@ -54,7 +54,7 @@ std::unique_ptr inferno_create() return app; } -void inferno_cleanup(std::unique_ptr& app) +void inferno_cleanup(InfernoApp* app) { graphics::window_cleanup(); app.reset(); @@ -72,7 +72,7 @@ static void inferno_gui_help_marker(const char* desc) } } -void inferno_preset_gui(std::unique_ptr& app) +void inferno_preset_gui(InfernoApp* app) { ImGuiID dockspace_id = ImGui::GetID("main"); @@ -89,7 +89,7 @@ void inferno_preset_gui(std::unique_ptr& app) yolo::info("LAYOUT SET TO DEFAULT"); } -void inferno_move_input(std::unique_ptr& app) +void inferno_move_input(InfernoApp* app) { static GLFWcursor* cursor = glfwCreateStandardCursor(GLFW_HAND_CURSOR); glfwSetCursor(graphics::window_get_glfw_window(), cursor); @@ -128,13 +128,13 @@ void inferno_move_input(std::unique_ptr& app) app->Input->MovementDelta |= 0b00000100; } -void inferno_stop_move_input(std::unique_ptr& app) +void inferno_stop_move_input(InfernoApp* app) { app->Input->MovementDelta = 0x0; app->Input->MouseDelta = { 0.0f, 0.0f }; } -int inferno_run(std::unique_ptr& app) +int inferno_run(InfernoApp* app) { while (true) { if (!graphics::window_new_frame())