From a849c199d970e153580c312a24cfdfa099bc7b69 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Sat, 9 Apr 2022 13:29:41 -0700 Subject: Changeset: 4 More work on editor --- source/App.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source/App.cpp') diff --git a/source/App.cpp b/source/App.cpp index 3907af9..ff0a5a5 100644 --- a/source/App.cpp +++ b/source/App.cpp @@ -1,5 +1,4 @@ #include "App.hpp" -#include "GLFW/glfw3.h" #include @@ -18,16 +17,13 @@ void App::Init() { } mCurrentWorld->Awaken(); - mEditor = EditorInstance_Alloc(this, mCurrentWorld.get()); + mEditor = std::make_unique(this, mCurrentWorld.get()); } void App::Shutdown() { if (!mInitialized) return; mInitialized = false; - - EditorInstance_Free(mEditor); mEditor = nullptr; - mCurrentWorld->Resleep(); mCurrentWorld = nullptr; mPlayers.clear(); @@ -37,7 +33,7 @@ void App::Show() { mCurrentWorld->Draw(); if (mEditorShown) { - EditorInstance_Show(mEditor); + mEditor->Show(); } } -- cgit v1.2.3-70-g09d2