scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

standardize imgui headers as user instead of system

Browse Source
This commit is contained in:
scawful
2024-07-30 23:33:12 -04:00
parent 95ba7630b8
commit 7c708519ac
55 changed files with 122 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/core/common.cc
View File

@@ -1,6 +1,6 @@
#include "common.h" #include "common.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <chrono> #include <chrono>
#include <cstdint> #include <cstdint>
@@ -174,13 +174,12 @@ uint16_t ldle16b_i(uint8_t const *const p_arr, size_t const p_index) {
// Initialize the static member // Initialize the static member
std::stack<ImGuiID> ImGuiIdIssuer::idStack; std::stack<ImGuiID> ImGuiIdIssuer::idStack;
int Get24LocalFromPC(uint8_t *data, int addr, bool pc) { uint32_t Get24LocalFromPC(uint8_t *data, int addr, bool pc) {
int ret = (PcToSnes(addr) & 0xFF0000) | (data[addr + 1] << 8) | data[addr]; uint32_t ret = (PcToSnes(addr) & 0xFF0000) | (data[addr + 1] << 8) | data[addr];
if (pc) { if (pc) {
return SnesToPc(ret); return SnesToPc(ret);
} else {
return ret;
} }
return ret;
} }
} // namespace core } // namespace core

11
src/app/core/common.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_CORE_COMMON_H #ifndef YAZE_CORE_COMMON_H
#define YAZE_CORE_COMMON_H #define YAZE_CORE_COMMON_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <chrono> #include <chrono>
#include <cstdint> #include <cstdint>
@@ -187,6 +187,11 @@ class Logger {
static std::ofstream fout("log.txt", std::ios::out | std::ios::app); static std::ofstream fout("log.txt", std::ios::out | std::ios::app);
fout << message << std::endl; fout << message << std::endl;
} }
// log to console
static void logc(std::string message) { logs.emplace_back(message); }
static std::vector<std::string> logs;
}; };
std::string UppercaseHexByte(uint8_t byte, bool leading = false); std::string UppercaseHexByte(uint8_t byte, bool leading = false);
@@ -220,10 +225,10 @@ struct FolderItem {
typedef struct FolderItem FolderItem; typedef struct FolderItem FolderItem;
int Get24LocalFromPC(uint8_t *data, int addr, bool pc = true); uint32_t Get24LocalFromPC(uint8_t *data, int addr, bool pc = true);
} // namespace core } // namespace core
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif #endif

8
src/app/core/controller.cc
View File

@@ -1,10 +1,10 @@
#include "controller.h" #include "controller.h"
#include <SDL.h> #include <SDL.h>
#include <imgui/backends/imgui_impl_sdl2.h> #include "imgui/backends/imgui_impl_sdl2.h"
#include <imgui/backends/imgui_impl_sdlrenderer2.h> #include "imgui/backends/imgui_impl_sdlrenderer2.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/imgui_internal.h> #include "imgui/imgui_internal.h"
#include <imgui_test_engine/imgui_te_context.h> #include <imgui_test_engine/imgui_te_context.h>
#include <memory> #include <memory>

10
src/app/core/controller.h
View File

@@ -2,11 +2,11 @@
#define YAZE_APP_CORE_CONTROLLER_H #define YAZE_APP_CORE_CONTROLLER_H
#include <SDL.h> #include <SDL.h>
#include <imgui/backends/imgui_impl_sdl2.h> #include "imgui/backends/imgui_impl_sdl2.h"
#include <imgui/backends/imgui_impl_sdlrenderer2.h> #include "imgui/backends/imgui_impl_sdlrenderer2.h"
#include <imgui/imconfig.h> #include "imgui/imconfig.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/imgui_internal.h> #include "imgui/imgui_internal.h"
#include <memory> #include <memory>

4
src/app/core/labeling.cc
View File

@@ -1,7 +1,7 @@
#include "app/core/labeling.h" #include "app/core/labeling.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/misc/cpp/imgui_stdlib.h> #include "imgui/misc/cpp/imgui_stdlib.h"
#include <cstdint> #include <cstdint>
#include <fstream> #include <fstream>

4
src/app/core/project.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_CORE_PROJECT_H #ifndef YAZE_APP_CORE_PROJECT_H
#define YAZE_APP_CORE_PROJECT_H #define YAZE_APP_CORE_PROJECT_H
#include <abseil-cpp/absl/strings/match.h> #include "absl/strings/match.h"
#include <fstream> #include <fstream>
#include <string> #include <string>
@@ -135,4 +135,4 @@ struct Project : public core::ExperimentFlags {
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif // YAZE_APP_CORE_PROJECT_H #endif // YAZE_APP_CORE_PROJECT_H

4
src/app/editor/code/assembly_editor.cc
View File

@@ -1,6 +1,6 @@
#include "assembly_editor.h" #include "assembly_editor.h"
#include <ImGuiColorTextEdit/TextEditor.h> #include "ImGuiColorTextEdit/TextEditor.h"
#include "app/core/platform/file_dialog.h" #include "app/core/platform/file_dialog.h"
#include "app/gui/icons.h" #include "app/gui/icons.h"
@@ -364,4 +364,4 @@ absl::Status AssemblyEditor::Update() { return absl::OkStatus(); }
} // namespace editor } // namespace editor
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

6
src/app/editor/code/assembly_editor.h
View File

@@ -1,8 +1,8 @@
#ifndef YAZE_APP_EDITOR_ASSEMBLY_EDITOR_H #ifndef YAZE_APP_EDITOR_ASSEMBLY_EDITOR_H
#define YAZE_APP_EDITOR_ASSEMBLY_EDITOR_H #define YAZE_APP_EDITOR_ASSEMBLY_EDITOR_H
#include <ImGuiColorTextEdit/TextEditor.h> #include "ImGuiColorTextEdit/TextEditor.h"
#include <ImGuiFileDialog/ImGuiFileDialog.h> #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include <fstream> #include <fstream>
#include <istream> #include <istream>
@@ -76,4 +76,4 @@ class AssemblyEditor : public Editor {
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif #endif

8
src/app/editor/code/memory_editor.h
View File

@@ -1,9 +1,9 @@
#ifndef YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H #ifndef YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H
#define YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H #define YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/misc/cpp/imgui_stdlib.h> #include "imgui/misc/cpp/imgui_stdlib.h"
#include <imgui_memory_editor.h> #include "imgui_memory_editor.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h" #include "app/core/common.h"
@@ -85,4 +85,4 @@ struct MemoryEditorWithDiffChecker : public SharedRom {
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif // YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H #endif // YAZE_APP_EDITOR_CODE_MEMORY_EDITOR_H

2
src/app/editor/dungeon/dungeon_editor.cc
View File

@@ -1,6 +1,6 @@
#include "dungeon_editor.h" #include "dungeon_editor.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "app/core/common.h" #include "app/core/common.h"
#include "app/core/labeling.h" #include "app/core/labeling.h"

2
src/app/editor/dungeon/dungeon_editor.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_DUNGEONEDITOR_H #ifndef YAZE_APP_EDITOR_DUNGEONEDITOR_H
#define YAZE_APP_EDITOR_DUNGEONEDITOR_H #define YAZE_APP_EDITOR_DUNGEONEDITOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "app/core/common.h" #include "app/core/common.h"
#include "app/core/labeling.h" #include "app/core/labeling.h"

2
src/app/editor/graphics/gfx_group_editor.cc
View File

@@ -1,6 +1,6 @@
#include "gfx_group_editor.h" #include "gfx_group_editor.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>

2
src/app/editor/graphics/gfx_group_editor.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H #ifndef YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
#define YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H #define YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>

10
src/app/editor/graphics/graphics_editor.cc
View File

@@ -1,9 +1,9 @@
#include "graphics_editor.h" #include "graphics_editor.h"
#include <ImGuiFileDialog/ImGuiFileDialog.h> #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/misc/cpp/imgui_stdlib.h> #include "imgui/misc/cpp/imgui_stdlib.h"
#include <imgui_memory_editor.h> #include "imgui_memory_editor.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
@@ -841,4 +841,4 @@ absl::Status GraphicsEditor::DecompressSuperDonkey() {
} // namespace editor } // namespace editor
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

10
src/app/editor/graphics/graphics_editor.h
View File

@@ -1,10 +1,10 @@
#ifndef YAZE_APP_EDITOR_GRAPHICS_EDITOR_H #ifndef YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
#define YAZE_APP_EDITOR_GRAPHICS_EDITOR_H #define YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
#include <ImGuiFileDialog/ImGuiFileDialog.h> #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/misc/cpp/imgui_stdlib.h> #include "imgui/misc/cpp/imgui_stdlib.h"
#include <imgui_memory_editor.h> #include "imgui_memory_editor.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
@@ -202,4 +202,4 @@ class GraphicsEditor : public SharedRom, public Editor {
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif // YAZE_APP_EDITOR_GRAPHICS_EDITOR_H #endif // YAZE_APP_EDITOR_GRAPHICS_EDITOR_H

2
src/app/editor/graphics/palette_editor.cc
View File

@@ -1,6 +1,6 @@
#include "palette_editor.h" #include "palette_editor.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"

2
src/app/editor/graphics/palette_editor.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_PALETTE_EDITOR_H #ifndef YAZE_APP_EDITOR_PALETTE_EDITOR_H
#define YAZE_APP_EDITOR_PALETTE_EDITOR_H #define YAZE_APP_EDITOR_PALETTE_EDITOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/editor/graphics/gfx_group_editor.h" #include "app/editor/graphics/gfx_group_editor.h"

4
src/app/editor/graphics/screen_editor.cc
View File

@@ -1,6 +1,6 @@
#include "screen_editor.h" #include "screen_editor.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <algorithm> #include <algorithm>
#include <fstream> #include <fstream>
@@ -434,4 +434,4 @@ void ScreenEditor::DrawToolset() {
} // namespace editor } // namespace editor
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

4
src/app/editor/graphics/screen_editor.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_SCREEN_EDITOR_H #ifndef YAZE_APP_EDITOR_SCREEN_EDITOR_H
#define YAZE_APP_EDITOR_SCREEN_EDITOR_H #define YAZE_APP_EDITOR_SCREEN_EDITOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <array> #include <array>
@@ -103,4 +103,4 @@ class ScreenEditor : public SharedRom, public Editor {
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif #endif

6
src/app/editor/graphics/tile16_editor.cc
View File

@@ -1,7 +1,7 @@
#include "tile16_editor.h" #include "tile16_editor.h"
#include <ImGuiFileDialog/ImGuiFileDialog.h> #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>
@@ -397,4 +397,4 @@ absl::Status Tile16Editor::SetCurrentTile(int id) {
} // namespace editor } // namespace editor
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

2
src/app/editor/graphics/tile16_editor.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_TILE16EDITOR_H #ifndef YAZE_APP_EDITOR_TILE16EDITOR_H
#define YAZE_APP_EDITOR_TILE16EDITOR_H #define YAZE_APP_EDITOR_TILE16EDITOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>

2
src/app/editor/music/music_editor.cc
View File

@@ -1,6 +1,6 @@
#include "music_editor.h" #include "music_editor.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "app/editor/code/assembly_editor.h" #include "app/editor/code/assembly_editor.h"

2
src/app/editor/music/music_editor.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_MUSIC_EDITOR_H #ifndef YAZE_APP_EDITOR_MUSIC_EDITOR_H
#define YAZE_APP_EDITOR_MUSIC_EDITOR_H #define YAZE_APP_EDITOR_MUSIC_EDITOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "app/editor/code/assembly_editor.h" #include "app/editor/code/assembly_editor.h"

2
src/app/editor/overworld/entity.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_OVERWORLD_ENTITY_H #ifndef YAZE_APP_EDITOR_OVERWORLD_ENTITY_H
#define YAZE_APP_EDITOR_OVERWORLD_ENTITY_H #define YAZE_APP_EDITOR_OVERWORLD_ENTITY_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "app/editor/overworld_editor.h" #include "app/editor/overworld_editor.h"
#include "app/zelda3/common.h" #include "app/zelda3/common.h"

6
src/app/editor/overworld_editor.cc
View File

@@ -1,7 +1,7 @@
#include "overworld_editor.h" #include "overworld_editor.h"
#include <ImGuiFileDialog/ImGuiFileDialog.h> #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>
#include <unordered_map> #include <unordered_map>
@@ -1362,4 +1362,4 @@ void OverworldEditor::DrawDebugWindow() {
} // namespace editor } // namespace editor
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

2
src/app/editor/overworld_editor.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_OVERWORLDEDITOR_H #ifndef YAZE_APP_EDITOR_OVERWORLDEDITOR_H
#define YAZE_APP_EDITOR_OVERWORLDEDITOR_H #define YAZE_APP_EDITOR_OVERWORLDEDITOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>
#include <unordered_map> #include <unordered_map>

2
src/app/editor/settings_editor.cc
View File

@@ -1,5 +1,5 @@
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/editor/utils/flags.h" #include "app/editor/utils/flags.h"

4
src/app/editor/settings_editor.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_SETTINGS_EDITOR_H #ifndef YAZE_APP_EDITOR_SETTINGS_EDITOR_H
#define YAZE_APP_EDITOR_SETTINGS_EDITOR_H #define YAZE_APP_EDITOR_SETTINGS_EDITOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/editor/utils/editor.h" #include "app/editor/utils/editor.h"
@@ -229,4 +229,4 @@ class SettingsEditor : public Editor {
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif // YAZE_APP_EDITOR_SETTINGS_EDITOR_H_ #endif // YAZE_APP_EDITOR_SETTINGS_EDITOR_H_

2
src/app/editor/sprite/zsprite.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_SPRITE_ZSPRITE_H #ifndef YAZE_APP_EDITOR_SPRITE_ZSPRITE_H
#define YAZE_APP_EDITOR_SPRITE_ZSPRITE_H #define YAZE_APP_EDITOR_SPRITE_ZSPRITE_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <algorithm> #include <algorithm>
#include <cstdint> #include <cstdint>

2
src/app/editor/utils/flags.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_UTILS_FLAGS_H #ifndef YAZE_APP_EDITOR_UTILS_FLAGS_H
#define YAZE_APP_EDITOR_UTILS_FLAGS_H #define YAZE_APP_EDITOR_UTILS_FLAGS_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include "core/common.h" #include "core/common.h"

2
src/app/editor/utils/gfx_context.cc
View File

@@ -1,6 +1,6 @@
#include "app/editor/utils/gfx_context.h" #include "app/editor/utils/gfx_context.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>

2
src/app/editor/utils/gfx_context.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_VRAM_CONTEXT_H #ifndef YAZE_APP_EDITOR_VRAM_CONTEXT_H
#define YAZE_APP_EDITOR_VRAM_CONTEXT_H #define YAZE_APP_EDITOR_VRAM_CONTEXT_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>
#include <vector> #include <vector>

4
src/app/editor/utils/keyboard_shortcuts.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H #ifndef YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H
#define YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H #define YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
@@ -22,4 +22,4 @@ struct KeyboardShortcuts {
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif // YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H_ #endif // YAZE_APP_EDITOR_UTILS_KEYBOARD_SHORTCUTS_H_

12
src/app/emu/debug/emu.cc
View File

@@ -5,12 +5,10 @@
#endif #endif
#include <SDL.h> #include <SDL.h>
#include <absl/status/status.h> #include "absl/status/status.h"
#include <absl/strings/str_format.h> #include "absl/strings/str_format.h"
#include <failure_signal_handler.h> #include "imgui/imgui.h"
#include <imgui/imgui.h> #include "imgui_memory_editor.h"
#include <imgui_memory_editor.h>
#include <rom.h>
#include <memory> #include <memory>
#include <string> #include <string>
@@ -214,4 +212,4 @@ int main(int argc, char **argv) {
SDL_Quit(); SDL_Quit();
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

4
src/app/emu/emulator.cc
View File

@@ -1,7 +1,7 @@
#include "app/emu/emulator.h" #include "app/emu/emulator.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui_memory_editor.h> #include "imgui_memory_editor.h"
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>

2
src/app/emu/emulator.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_CORE_EMULATOR_H #ifndef YAZE_APP_CORE_EMULATOR_H
#define YAZE_APP_CORE_EMULATOR_H #define YAZE_APP_CORE_EMULATOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>

2
src/app/emu/memory/memory.cc
View File

@@ -1,6 +1,6 @@
#include "app/emu/memory/memory.h" #include "app/emu/memory/memory.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cstdint> #include <cstdint>
#include <iostream> #include <iostream>

4
src/app/gfx/snes_color.cc
View File

@@ -1,7 +1,7 @@
#include "app/gfx/snes_color.h" #include "app/gfx/snes_color.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
@@ -101,4 +101,4 @@ std::vector<SnesColor> GetColFileData(uint8_t* data) {
} // namespace gfx } // namespace gfx
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

2
src/app/gfx/snes_color.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_GFX_SNES_COLOR_H_ #ifndef YAZE_APP_GFX_SNES_COLOR_H_
#define YAZE_APP_GFX_SNES_COLOR_H_ #define YAZE_APP_GFX_SNES_COLOR_H_
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>

4
src/app/gfx/snes_palette.cc
View File

@@ -1,7 +1,7 @@
#include "snes_palette.h" #include "snes_palette.h"
#include <SDL.h> #include <SDL.h>
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cstdint> #include <cstdint>
#include <cstdlib> #include <cstdlib>
@@ -389,4 +389,4 @@ absl::Status LoadAllPalettes(const Bytes& rom_data, PaletteGroupMap& groups) {
} // namespace gfx } // namespace gfx
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

4
src/app/gfx/snes_palette.h
View File

@@ -2,7 +2,7 @@
#define YAZE_APP_GFX_PALETTE_H #define YAZE_APP_GFX_PALETTE_H
#include <SDL.h> #include <SDL.h>
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cstdint> #include <cstdint>
#include <cstdlib> #include <cstdlib>
@@ -433,4 +433,4 @@ struct Paletteset {
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif // YAZE_APP_GFX_PALETTE_H #endif // YAZE_APP_GFX_PALETTE_H

4
src/app/gui/asset_browser.cc
View File

@@ -1,5 +1,7 @@
#include "asset_browser.h" #include "asset_browser.h"
#include "absl/strings/str_format.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
namespace gui { namespace gui {
@@ -340,4 +342,4 @@ void GfxSheetAssetBrowser::Draw(gfx::BitmapManager* bmp_manager) {
} // namespace gui } // namespace gui
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

2
src/app/gui/asset_browser.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_GUI_ASSET_BROWSER_H #ifndef YAZE_APP_GUI_ASSET_BROWSER_H
#define YAZE_APP_GUI_ASSET_BROWSER_H #define YAZE_APP_GUI_ASSET_BROWSER_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <string> #include <string>

2
src/app/gui/canvas.cc
View File

@@ -1,6 +1,6 @@
#include "canvas.h" #include "canvas.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>
#include <string> #include <string>

4
src/app/gui/canvas.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_GUI_CANVAS_H #ifndef YAZE_GUI_CANVAS_H
#define YAZE_GUI_CANVAS_H #define YAZE_GUI_CANVAS_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>
#include <string> #include <string>
@@ -236,4 +236,4 @@ void BitmapCanvasPipeline(gui::Canvas& canvas, const gfx::Bitmap& bitmap,
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif #endif

7
src/app/gui/color.cc
View File

@@ -1,13 +1,13 @@
#include "color.h" #include "color.h"
#include <gfx/snes_color.h> #include "imgui/imgui.h"
#include <imgui/imgui.h>
#include <cmath> #include <cmath>
#include <string> #include <string>
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
#include "app/gfx/snes_color.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
@@ -123,6 +123,7 @@ absl::Status DisplayPalette(app::gfx::SnesPalette& palette, bool loaded) {
ImGui::ColorPicker4("##picker", (float*)&color, ImGui::ColorPicker4("##picker", (float*)&color,
misc_flags | ImGuiColorEditFlags_NoSidePreview | misc_flags | ImGuiColorEditFlags_NoSidePreview |
ImGuiColorEditFlags_NoSmallPreview); ImGuiColorEditFlags_NoSmallPreview);
return absl::OkStatus();
} }
void SelectablePalettePipeline(uint64_t& palette_id, bool& refresh_graphics, void SelectablePalettePipeline(uint64_t& palette_id, bool& refresh_graphics,
@@ -170,4 +171,4 @@ void SelectablePalettePipeline(uint64_t& palette_id, bool& refresh_graphics,
} // namespace gui } // namespace gui
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

4
src/app/gui/color.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_GUI_COLOR_H #ifndef YAZE_GUI_COLOR_H
#define YAZE_GUI_COLOR_H #define YAZE_GUI_COLOR_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cmath> #include <cmath>
#include <string> #include <string>
@@ -37,4 +37,4 @@ void SelectablePalettePipeline(uint64_t& palette_id, bool& refresh_graphics,
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif #endif

10
src/app/gui/input.cc
View File

@@ -1,9 +1,9 @@
#include "input.h" #include "input.h"
#include <ImGuiFileDialog/ImGuiFileDialog.h> #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/imgui_internal.h> #include "imgui/imgui_internal.h"
#include <imgui/misc/cpp/imgui_stdlib.h> #include "imgui/misc/cpp/imgui_stdlib.h"
#include <functional> #include <functional>
#include <optional> #include <optional>
@@ -271,4 +271,4 @@ void FileDialogPipeline(absl::string_view display_key,
} // namespace gui } // namespace gui
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

8
src/app/gui/input.h
View File

@@ -3,9 +3,9 @@
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/misc/cpp/imgui_stdlib.h> #include "imgui/misc/cpp/imgui_stdlib.h"
#include <imgui_memory_editor.h> #include "imgui_memory_editor.h"
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
@@ -66,4 +66,4 @@ void FileDialogPipeline(absl::string_view display_key,
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif #endif

4
src/app/gui/style.cc
View File

@@ -1,7 +1,7 @@
#include "style.h" #include "style.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/imgui_internal.h> #include "imgui/imgui_internal.h"
namespace yaze { namespace yaze {
namespace app { namespace app {

8
src/app/gui/style.h
View File

@@ -1,9 +1,9 @@
#ifndef YAZE_APP_CORE_STYLE_H #ifndef YAZE_APP_CORE_STYLE_H
#define YAZE_APP_CORE_STYLE_H #define YAZE_APP_CORE_STYLE_H
#include <ImGuiColorTextEdit/TextEditor.h> #include "ImGuiColorTextEdit/TextEditor.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <imgui/misc/cpp/imgui_stdlib.h> #include "imgui/misc/cpp/imgui_stdlib.h"
#include <functional> #include <functional>
#include <vector> #include <vector>
@@ -148,4 +148,4 @@ struct MultiSelectWithClipper {
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze
#endif #endif

2
src/app/gui/zeml.cc
View File

@@ -1,7 +1,7 @@
#include "app/gui/zeml.h" #include "app/gui/zeml.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cctype> #include <cctype>
#include <fstream> #include <fstream>

2
src/app/gui/zeml.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_GUI_ZEML_H #ifndef YAZE_APP_GUI_ZEML_H
#define YAZE_APP_GUI_ZEML_H #define YAZE_APP_GUI_ZEML_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cctype> #include <cctype>
#include <functional> #include <functional>

2
src/app/zelda3/overworld/overworld_map.cc
View File

@@ -1,6 +1,6 @@
#include "overworld_map.h" #include "overworld_map.h"
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>

2
src/app/zelda3/overworld/overworld_map.h
View File

@@ -1,7 +1,7 @@
#ifndef YAZE_APP_ZELDA3_OVERWORLD_MAP_H #ifndef YAZE_APP_ZELDA3_OVERWORLD_MAP_H
#define YAZE_APP_ZELDA3_OVERWORLD_MAP_H #define YAZE_APP_ZELDA3_OVERWORLD_MAP_H
#include <imgui/imgui.h> #include "imgui/imgui.h"
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>