From 3f3b455f3c236ea37b5a0f57775b2aa0f06ec0a6 Mon Sep 17 00:00:00 2001 From: raicool Date: Fri, 18 Aug 2023 09:18:45 -0400 Subject: [PATCH] moved ghost enums to common/type.h --- src/app.cpp | 18 ++++++------ src/app.h | 2 +- src/common/type.h | 68 +++++++++++++++++++++++++++++++++++++++++++ src/core/panel.cpp | 2 +- src/core/panel.h | 4 +-- src/core/window.cpp | 10 +++---- src/core/window.h | 2 +- src/file/ghost.h | 68 ------------------------------------------- src/file/spotpass.cpp | 1 - src/gfx/texture.cpp | 2 +- 10 files changed, 88 insertions(+), 89 deletions(-) diff --git a/src/app.cpp b/src/app.cpp index f390928..dc92bfb 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -7,11 +7,11 @@ void app::init() { - sdlwindow.init(this, "MK7 Spotpass Ghost Manager v0.2.2", 848, 480, 0, SDL_WINDOW_MAXIMIZED | SDL_WINDOW_RESIZABLE); + main_window.init(this, "MK7 Spotpass Ghost Manager v0.2.2", 848, 480, 0, SDL_WINDOW_MAXIMIZED | SDL_WINDOW_RESIZABLE); logger::init_logger(); - texture_manager.current_renderer = sdlwindow.sdlrenderer; + texture_manager.current_renderer = main_window.sdlrenderer; texture_manager.load_ghost_textures(); } @@ -19,22 +19,22 @@ int app::update() { while (1) { - sdlwindow.deltatime.before = std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(); + main_window.deltatime.before = std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(); - SDL_PollEvent(&sdlwindow.sdlevent); - ImGui_ImplSDL2_ProcessEvent(&sdlwindow.sdlevent); + SDL_PollEvent(&main_window.sdlevent); + ImGui_ImplSDL2_ProcessEvent(&main_window.sdlevent); - switch (sdlwindow.sdlevent.type) + switch (main_window.sdlevent.type) { case SDL_QUIT: return 0; } - sdlwindow.update(); + main_window.update(); - SDL_RenderPresent(sdlwindow.sdlrenderer); + SDL_RenderPresent(main_window.sdlrenderer); - sdlwindow.deltatime.apply_delay((uint32_t)((1.0f / sdlwindow.framerate) * 1000.0f)); + main_window.deltatime.apply_delay((uint32_t)((1.0f / main_window.framerate) * 1000.0f)); } } diff --git a/src/app.h b/src/app.h index a71d682..90d00aa 100644 --- a/src/app.h +++ b/src/app.h @@ -6,7 +6,7 @@ struct app { - window sdlwindow; + window main_window; texture texture_manager; spotpass* spotpass_files[8]{ nullptr }; // 8 file managers for 8 different spotpass cups diff --git a/src/common/type.h b/src/common/type.h index 79e2ab4..1962126 100644 --- a/src/common/type.h +++ b/src/common/type.h @@ -41,4 +41,72 @@ struct rgb struct rgba { uint8_t r, g, b, a; +}; + +enum character +{ + CHAR_BOWSER = 0x00, + CHAR_DAISY = 0x01, + CHAR_DONKEY_KONG = 0x02, + CHAR_HONEY_QUEEN = 0x03, + CHAR_KOOPA_TROOPA = 0x04, + CHAR_LAKITU = 0x05, + CHAR_LUIGI = 0x06, + CHAR_MARIO = 0x07, + CHAR_METAL_MARIO = 0x08, + CHAR_MII_MALE = 0x09, + CHAR_MII_FEMALE = 0x0a, + CHAR_PEACH = 0x0b, + CHAR_ROSALINA = 0x0c, + CHAR_SHY_GUY = 0x0d, + CHAR_TOAD = 0x0e, + CHAR_WARIO = 0x0f, + CHAR_WIGGLER = 0x10, + CHAR_YOSHI = 0x11 +}; + +enum kart +{ + KART_STANDARD = 0x00, + KART_BOLT_BUGGY = 0x01, + KART_BIRTHDAY_GIRL = 0x02, + KART_EGG_1 = 0x03, + KART_BDASHER = 0x04, + KART_ZUCCHINI = 0x05, + KART_KOOPA_CLOWN = 0x06, + KART_TINY_TUG = 0x07, + KART_BUMBLE_V = 0x08, + KART_CACT_X = 0x09, + KART_BRUISER = 0x0a, + KART_PIPE_FRAME = 0x0b, + KART_BARREL_TRAIN = 0x0c, + KART_CLOUD_9 = 0x0d, + KART_BLUE_SEVEN = 0x0e, + KART_SODA_JET = 0x0f, + KART_GOLD_STANDARD = 0x10, +}; + +enum tire +{ + TIRE_STANDARD = 0x00, + TIRE_MONSTER = 0x01, + TIRE_ROLLER = 0x02, + TIRE_SLICK = 0x03, + TIRE_SLIM = 0x04, + TIRE_SPONGE = 0x05, + TIRE_GOLD_TIRES = 0x06, + TIRE_WOOD = 0x07, + TIRE_RED_MONSTER = 0x08, + TIRE_MUSHROOM = 0x09, +}; + +enum glider +{ + WING_SUPER_GLIDER = 0x00, + WING_PARAGLIDER = 0x01, + WING_PEACH_PARASOL = 0x02, + WING_FLOWER_GLIDER = 0x03, + WING_SWOOPER = 0x04, + WING_BEAST_GLIDER = 0x05, + WING_GOLD_GLIDER = 0x06, }; \ No newline at end of file diff --git a/src/core/panel.cpp b/src/core/panel.cpp index d9ba53f..c5d742c 100644 --- a/src/core/panel.cpp +++ b/src/core/panel.cpp @@ -20,7 +20,7 @@ void panel::render() { static int w; static int h; - SDL_GetWindowSize(window_ptr->sdlwindow, &w, &h); + SDL_GetWindowSize(window_ptr->main_window, &w, &h); if (panel_flags & panels::PANEL_MENU_BAR) { diff --git a/src/core/panel.h b/src/core/panel.h index 34582f2..04d7d22 100644 --- a/src/core/panel.h +++ b/src/core/panel.h @@ -15,8 +15,8 @@ enum panels struct panel { - panel(window* sdlwindow) - : window_ptr(sdlwindow) {}; + panel(window* main_window) + : window_ptr(main_window) {}; panel() {}; diff --git a/src/core/window.cpp b/src/core/window.cpp index 0574973..b1d0bc4 100644 --- a/src/core/window.cpp +++ b/src/core/window.cpp @@ -10,11 +10,11 @@ void window::init(app* application, const char* window_title, uint16_t win_width height = win_height; framerate = win_framerate; - sdlwindow = SDL_CreateWindow(window_title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, win_width, win_height, flags); - sdlrenderer = SDL_CreateRenderer(sdlwindow, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC); + main_window = SDL_CreateWindow(window_title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, win_width, win_height, flags); + sdlrenderer = SDL_CreateRenderer(main_window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC); SDL_SetHint(SDL_HINT_RENDER_LOGICAL_SIZE_MODE, "overscan"); - if (!sdlwindow) + if (!main_window) { // LOG_ERROR("SDL Window could not be created {}", SDL_GetError()); } @@ -25,7 +25,7 @@ void window::init(app* application, const char* window_title, uint16_t win_width ImGui::CreateContext(); ImGui::StyleColorsDark(); - ImGui_ImplSDL2_InitForSDLRenderer(sdlwindow, sdlrenderer); + ImGui_ImplSDL2_InitForSDLRenderer(main_window, sdlrenderer); ImGui_ImplSDLRenderer2_Init(sdlrenderer); // TODO: find 3ds' entire unicode range @@ -50,7 +50,7 @@ void window::update() void window::render_panels() { - ImGui_ImplSDL2_NewFrame(sdlwindow); + ImGui_ImplSDL2_NewFrame(main_window); ImGui_ImplSDLRenderer2_NewFrame(); ImGui::NewFrame(); diff --git a/src/core/window.h b/src/core/window.h index 1b922b2..e7a90b1 100644 --- a/src/core/window.h +++ b/src/core/window.h @@ -12,7 +12,7 @@ struct window panel* panels; SDL_Event sdlevent; - SDL_Window* sdlwindow; + SDL_Window* main_window; SDL_Renderer* sdlrenderer; frame deltatime; diff --git a/src/file/ghost.h b/src/file/ghost.h index ee49bb8..1af88c6 100644 --- a/src/file/ghost.h +++ b/src/file/ghost.h @@ -1,73 +1,5 @@ #pragma once -enum character -{ - CHAR_BOWSER = 0x00, - CHAR_DAISY = 0x01, - CHAR_DONKEY_KONG = 0x02, - CHAR_HONEY_QUEEN = 0x03, - CHAR_KOOPA_TROOPA = 0x04, - CHAR_LAKITU = 0x05, - CHAR_LUIGI = 0x06, - CHAR_MARIO = 0x07, - CHAR_METAL_MARIO = 0x08, - CHAR_MII_MALE = 0x09, - CHAR_MII_FEMALE = 0x0a, - CHAR_PEACH = 0x0b, - CHAR_ROSALINA = 0x0c, - CHAR_SHY_GUY = 0x0d, - CHAR_TOAD = 0x0e, - CHAR_WARIO = 0x0f, - CHAR_WIGGLER = 0x10, - CHAR_YOSHI = 0x11 -}; - -enum kart -{ - KART_STANDARD = 0x00, - KART_BOLT_BUGGY = 0x01, - KART_BIRTHDAY_GIRL = 0x02, - KART_EGG_1 = 0x03, - KART_BDASHER = 0x04, - KART_ZUCCHINI = 0x05, - KART_KOOPA_CLOWN = 0x06, - KART_TINY_TUG = 0x07, - KART_BUMBLE_V = 0x08, - KART_CACT_X = 0x09, - KART_BRUISER = 0x0a, - KART_PIPE_FRAME = 0x0b, - KART_BARREL_TRAIN = 0x0c, - KART_CLOUD_9 = 0x0d, - KART_BLUE_SEVEN = 0x0e, - KART_SODA_JET = 0x0f, - KART_GOLD_STANDARD = 0x10, -}; - -enum tire -{ - TIRE_STANDARD = 0x00, - TIRE_MONSTER = 0x01, - TIRE_ROLLER = 0x02, - TIRE_SLICK = 0x03, - TIRE_SLIM = 0x04, - TIRE_SPONGE = 0x05, - TIRE_GOLD_TIRES = 0x06, - TIRE_WOOD = 0x07, - TIRE_RED_MONSTER = 0x08, - TIRE_MUSHROOM = 0x09, -}; - -enum glider -{ - WING_SUPER_GLIDER = 0x00, - WING_PARAGLIDER = 0x01, - WING_PEACH_PARASOL = 0x02, - WING_FLOWER_GLIDER = 0x03, - WING_SWOOPER = 0x04, - WING_BEAST_GLIDER = 0x05, - WING_GOLD_GLIDER = 0x06, -}; - struct ghost { uint32_t file_offset = 0; //< where ghost's data starts in spotpass file (if applicable) diff --git a/src/file/spotpass.cpp b/src/file/spotpass.cpp index 0102ca8..5bcbe92 100644 --- a/src/file/spotpass.cpp +++ b/src/file/spotpass.cpp @@ -9,7 +9,6 @@ uint8_t spotpass::load(const char* dir) { uint32_t offset = 0; uint32_t u32buffer = 0; - uint8_t buffer = 0; file_directory = dir; diff --git a/src/gfx/texture.cpp b/src/gfx/texture.cpp index 3d70375..db27cc2 100644 --- a/src/gfx/texture.cpp +++ b/src/gfx/texture.cpp @@ -2,7 +2,7 @@ #include "texture.h" #include "common/log.h" -#include "file/ghost.h" +#include "common/type.h" void texture::load_ghost_textures() {