housekeeping

This commit is contained in:
Justin Scofield
2022-06-10 01:09:53 -04:00
parent d8af0138bf
commit af17086b20
3 changed files with 15 additions and 22 deletions

View File

@@ -1,22 +1,21 @@
#ifndef YAZE_APPLICATION_CORE_CONTROLLER_H
#define YAZE_APPLICATION_CORE_CONTROLLER_H
#include <memory>
#define SDL_MAIN_HANDLED
#include <SDL2/SDL.h>
#include "imgui/imgui.h"
#include "imgui/imgui_internal.h"
#include <memory>
#include "Events/Event.h"
#include "Renderer.h"
#include "Editor/Editor.h"
#include "Window.h"
#include "imgui/backends/imgui_impl_sdl.h"
#include "imgui/backends/imgui_impl_sdlrenderer.h"
#include "imgui/imgui.h"
#include "imgui/imgui_internal.h"
#include "imgui/misc/cpp/imgui_stdlib.h"
#include "Window.h"
#include "Renderer.h"
#include "Events/Event.h"
#include "View/Editor.h"
#include "View/Debug.h"
int main(int argc, char** argv);
namespace yaze {
@@ -36,9 +35,8 @@ class Controller {
void onExit();
private:
Window window;
Window window;
Renderer renderer;
View::Debug debug;
View::Editor editor;
bool active = false;
void quit() { active = false; }

View File

@@ -22,7 +22,7 @@ void Renderer::Create(SDL_Window* window) {
// Create the ImGui and ImPlot contexts
ImGui::CreateContext();
// Initialize ImGui for SDL
ImGui_ImplSDL2_InitForSDLRenderer(window, renderer);
ImGui_ImplSDLRenderer_Init(renderer);

View File

@@ -1,9 +1,3 @@
# Boost library --------------------------------------------------------------------------------------------------
set(Boost_USE_STATIC_LIBS ON)
find_package(Boost REQUIRED)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
# SDL libraries --------------------------------------------------------------------------------------------------
find_package(SDL2 REQUIRED)
@@ -31,9 +25,11 @@ add_executable(
Application/Core/Renderer.cc
Application/Core/Window.cc
Application/Data/Overworld.cc
Application/Data/OverworldMap.cc
Application/Data/Tile.cc
Application/Editor/Editor.cc
Application/Events/Event.cc
Application/View/Debug.cc
Application/View/Editor.cc
Application/Graphics/Bitmap.cc
Application/Utils/Compression.cc
Application/Utils/ROM.cc
# GUI libraries
@@ -55,7 +51,6 @@ target_include_directories(
target_link_libraries(
yaze
${BOOST_LIBRARIES}
${SDL2_LIBRARIES}
${OPENGL_LIBRARIES}
ImGui