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

more style refactoring

Browse Source
This commit is contained in:
Justin Scofield
2022-06-12 21:08:53 -04:00
parent 9bbc4b95c9
commit 41643a7fd4
5 changed files with 112 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Application/Core/constants.h
View File

@@ -25,6 +25,32 @@ namespace Constants {
using ushort = unsigned short; using ushort = unsigned short;
//===========================================================================================
// 65816 LanguageDefinition
//===========================================================================================
static const char *const kKeywords[] = {
"ADC", "AND", "ASL", "BCC", "BCS", "BEQ", "BIT", "BMI", "BNE",
"BPL", "BRA", "BRL", "BVC", "BVS", "CLC", "CLD", "CLI", "CLV",
"CMP", "CPX", "CPY", "DEC", "DEX", "DEY", "EOR", "INC", "INX",
"INY", "JMP", "JSR", "JSL", "LDA", "LDX", "LDY", "LSR", "MVN",
"NOP", "ORA", "PEA", "PER", "PHA", "PHB", "PHD", "PHP", "PHX",
"PHY", "PLA", "PLB", "PLD", "PLP", "PLX", "PLY", "REP", "ROL",
"ROR", "RTI", "RTL", "RTS", "SBC", "SEC", "SEI", "SEP", "STA",
"STP", "STX", "STY", "STZ", "TAX", "TAY", "TCD", "TCS", "TDC",
"TRB", "TSB", "TSC", "TSX", "TXA", "TXS", "TXY", "TYA", "TYX",
"WAI", "WDM", "XBA", "XCE", "ORG", "LOROM", "HIROM", "NAMESPACE", "DB"};
static const char *const kIdentifiers[] = {
"abort", "abs", "acos", "asin", "atan", "atexit",
"atof", "atoi", "atol", "ceil", "clock", "cosh",
"ctime", "div", "exit", "fabs", "floor", "fmod",
"getchar", "getenv", "isalnum", "isalpha", "isdigit", "isgraph",
"ispunct", "isspace", "isupper", "kbhit", "log10", "log2",
"log", "memcmp", "modf", "pow", "putchar", "putenv",
"puts", "rand", "remove", "rename", "sinh", "sqrt",
"srand", "strcat", "strcmp", "strerror", "time", "tolower",
"toupper"};
//=========================================================================================== //===========================================================================================
// Magic numbers // Magic numbers
//=========================================================================================== //===========================================================================================

20
src/Application/Core/controller.cc
View File

@@ -4,9 +4,9 @@
#include <imgui/imgui.h> #include <imgui/imgui.h>
#include <imgui/imgui_internal.h> #include <imgui/imgui_internal.h>
#include "core/renderer.h" #include "Core/renderer.h"
#include "core/window.h" #include "Core/window.h"
#include "editor/editor.h" #include "Editor/editor.h"
namespace yaze { namespace yaze {
namespace Application { namespace Application {
@@ -29,8 +29,11 @@ void Controller::onEntry() {
void Controller::onInput() { void Controller::onInput() {
int wheel = 0; int wheel = 0;
int mouseX;
int mouseY;
SDL_Event event; SDL_Event event;
ImGuiIO &io = ImGui::GetIO(); ImGuiIO &io = ImGui::GetIO();
const int buttons = SDL_GetMouseState(&mouseX, &mouseY);
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
switch (event.type) { switch (event.type) {
@@ -62,7 +65,7 @@ void Controller::onInput() {
case SDL_WINDOWEVENT: case SDL_WINDOWEVENT:
switch (event.window.event) { switch (event.window.event) {
case SDL_WINDOWEVENT_CLOSE: case SDL_WINDOWEVENT_CLOSE:
active_ = false; quit();
break; break;
case SDL_WINDOWEVENT_SIZE_CHANGED: case SDL_WINDOWEVENT_SIZE_CHANGED:
io.DisplaySize.x = static_cast<float>(event.window.data1); io.DisplaySize.x = static_cast<float>(event.window.data1);
@@ -82,10 +85,6 @@ void Controller::onInput() {
break; break;
} }
} }
int mouseX;
int mouseY;
const int buttons = SDL_GetMouseState(&mouseX, &mouseY);
io.DeltaTime = 1.0f / 60.0f; io.DeltaTime = 1.0f / 60.0f;
io.MousePos = ImVec2(static_cast<float>(mouseX), static_cast<float>(mouseY)); io.MousePos = ImVec2(static_cast<float>(mouseX), static_cast<float>(mouseY));
io.MouseDown[0] = buttons & SDL_BUTTON(SDL_BUTTON_LEFT); io.MouseDown[0] = buttons & SDL_BUTTON(SDL_BUTTON_LEFT);
@@ -95,10 +94,7 @@ void Controller::onInput() {
void Controller::onLoad() { editor_.UpdateScreen(); } void Controller::onLoad() { editor_.UpdateScreen(); }
void Controller::doRender() { void Controller::doRender() { renderer_.Render(); }
SDL_Delay(10);
renderer_.Render();
}
void Controller::onExit() { void Controller::onExit() {
ImGui_ImplSDLRenderer_Shutdown(); ImGui_ImplSDLRenderer_Shutdown();

6
src/Application/Core/controller.h
View File

@@ -6,9 +6,9 @@
#include <imgui/imgui.h> #include <imgui/imgui.h>
#include <imgui/imgui_internal.h> #include <imgui/imgui_internal.h>
#include "core/renderer.h" #include "Core/renderer.h"
#include "core/window.h" #include "Core/window.h"
#include "editor/editor.h" #include "Editor/editor.h"
int main(int argc, char** argv); int main(int argc, char** argv);

170
src/Application/Editor/editor.cc
View File

@@ -1,4 +1,4 @@
#include "Editor.h" #include "editor.h"
namespace yaze { namespace yaze {
namespace Application { namespace Application {
@@ -7,97 +7,65 @@ namespace Editor {
using namespace Core; using namespace Core;
Editor::Editor() { Editor::Editor() {
static bool inited = false; for (auto &k : Core::Constants::kKeywords)
if (!inited) { language_65816_.mKeywords.emplace(k);
static const char *const keywords[] = {
"ADC", "AND", "ASL", "BCC", "BCS", "BEQ", "BIT", "BMI", "BNE",
"BPL", "BRA", "BRL", "BVC", "BVS", "CLC", "CLD", "CLI", "CLV",
"CMP", "CPX", "CPY", "DEC", "DEX", "DEY", "EOR", "INC", "INX",
"INY", "JMP", "JSR", "JSL", "LDA", "LDX", "LDY", "LSR", "MVN",
"NOP", "ORA", "PEA", "PER", "PHA", "PHB", "PHD", "PHP", "PHX",
"PHY", "PLA", "PLB", "PLD", "PLP", "PLX", "PLY", "REP", "ROL",
"ROR", "RTI", "RTL", "RTS", "SBC", "SEC", "SEI", "SEP", "STA",
"STP", "STX", "STY", "STZ", "TAX", "TAY", "TCD", "TCS", "TDC",
"TRB", "TSB", "TSC", "TSX", "TXA", "TXS", "TXY", "TYA", "TYX",
"WAI", "WDM", "XBA", "XCE", "ORG", "LOROM", "HIROM", "NAMESPACE", "DB"};
for (auto &k : keywords) language65816Def.mKeywords.emplace(k);
static const char *const identifiers[] = { for (auto &k : Core::Constants::kIdentifiers) {
"abort", "abs", "acos", "asin", "atan", "atexit", TextEditor::Identifier id;
"atof", "atoi", "atol", "ceil", "clock", "cosh", id.mDeclaration = "Built-in function";
"ctime", "div", "exit", "fabs", "floor", "fmod", language_65816_.mIdentifiers.insert(std::make_pair(std::string(k), id));
"getchar", "getenv", "isalnum", "isalpha", "isdigit", "isgraph",
"ispunct", "isspace", "isupper", "kbhit", "log10", "log2",
"log", "memcmp", "modf", "pow", "putchar", "putenv",
"puts", "rand", "remove", "rename", "sinh", "sqrt",
"srand", "strcat", "strcmp", "strerror", "time", "tolower",
"toupper"};
for (auto &k : identifiers) {
TextEditor::Identifier id;
id.mDeclaration = "Built-in function";
language65816Def.mIdentifiers.insert(std::make_pair(std::string(k), id));
}
language65816Def.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[ \\t]*#[ \\t]*[a-zA-Z_]+",
TextEditor::PaletteIndex::Preprocessor));
language65816Def.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"L?\\\"(\\\\.|[^\\\"])*\\\"", TextEditor::PaletteIndex::String));
language65816Def.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"\\'\\\\?[^\\']\\'", TextEditor::PaletteIndex::CharLiteral));
language65816Def.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[+-]?([0-9]+([.][0-9]*)?|[.][0-9]+)([eE][+-]?[0-9]+)?[fF]?",
TextEditor::PaletteIndex::Number));
language65816Def.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[+-]?[0-9]+[Uu]?[lL]?[lL]?", TextEditor::PaletteIndex::Number));
language65816Def.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"0[0-7]+[Uu]?[lL]?[lL]?", TextEditor::PaletteIndex::Number));
language65816Def.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"0[xX][0-9a-fA-F]+[uU]?[lL]?[lL]?",
TextEditor::PaletteIndex::Number));
language65816Def.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[a-zA-Z_][a-zA-Z0-9_]*", TextEditor::PaletteIndex::Identifier));
language65816Def.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[\\[\\]\\{\\}\\!\\%\\^\\&\\*\\(\\)\\-\\+\\=\\~\\|\\<\\>\\?\\/"
"\\;\\,\\.]",
TextEditor::PaletteIndex::Punctuation));
language65816Def.mCommentStart = "/*";
language65816Def.mCommentEnd = "*/";
language65816Def.mSingleLineComment = ";";
language65816Def.mCaseSensitive = false;
language65816Def.mAutoIndentation = true;
language65816Def.mName = "65816";
inited = true;
} }
asm_editor_.SetLanguageDefinition(language65816Def);
language_65816_.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[ \\t]*#[ \\t]*[a-zA-Z_]+", TextEditor::PaletteIndex::Preprocessor));
language_65816_.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"L?\\\"(\\\\.|[^\\\"])*\\\"", TextEditor::PaletteIndex::String));
language_65816_.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"\\'\\\\?[^\\']\\'", TextEditor::PaletteIndex::CharLiteral));
language_65816_.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[+-]?([0-9]+([.][0-9]*)?|[.][0-9]+)([eE][+-]?[0-9]+)?[fF]?",
TextEditor::PaletteIndex::Number));
language_65816_.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[+-]?[0-9]+[Uu]?[lL]?[lL]?", TextEditor::PaletteIndex::Number));
language_65816_.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"0[0-7]+[Uu]?[lL]?[lL]?", TextEditor::PaletteIndex::Number));
language_65816_.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"0[xX][0-9a-fA-F]+[uU]?[lL]?[lL]?",
TextEditor::PaletteIndex::Number));
language_65816_.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[a-zA-Z_][a-zA-Z0-9_]*", TextEditor::PaletteIndex::Identifier));
language_65816_.mTokenRegexStrings.push_back(
std::make_pair<std::string, TextEditor::PaletteIndex>(
"[\\[\\]\\{\\}\\!\\%\\^\\&\\*\\(\\)\\-\\+\\=\\~\\|\\<\\>\\?\\/"
"\\;\\,\\.]",
TextEditor::PaletteIndex::Punctuation));
language_65816_.mCommentStart = "/*";
language_65816_.mCommentEnd = "*/";
language_65816_.mSingleLineComment = ";";
language_65816_.mCaseSensitive = false;
language_65816_.mAutoIndentation = true;
language_65816_.mName = "65816";
asm_editor_.SetLanguageDefinition(language_65816_);
asm_editor_.SetPalette(TextEditor::GetDarkPalette()); asm_editor_.SetPalette(TextEditor::GetDarkPalette());
current_set_.bpp = 4; current_set_.bpp = 4;
current_set_.pcTilesLocation = 0x80000; current_set_.pcTilesLocation = 0x80000;
current_set_.SNESTilesLocation = 0; current_set_.SNESTilesLocation = 0x0000;
current_set_.length = 28672; current_set_.length = 28672;
current_set_.pcPaletteLocation = 0xDD326; current_set_.pcPaletteLocation = 0xDD326;
current_set_.SNESPaletteLocation = 0; current_set_.SNESPaletteLocation = 0x0000;
current_set_.compression = "zelda3"; current_set_.compression = "zelda3";
current_palette_.colors.push_back(ImVec4(0.0f, 0.0f, 0.0f, 1.0f));
current_palette_.colors.push_back(ImVec4(0.0f, 0.5f, 0.0f, 1.0f));
current_palette_.colors.push_back(ImVec4(0.0f, 0.0f, 0.4f, 1.0f));
current_palette_.colors.push_back(ImVec4(0.3f, 0.0f, 0.0f, 1.0f));
current_palette_.colors.push_back(ImVec4(0.3f, 0.7f, 0.9f, 1.0f));
current_palette_.colors.push_back(ImVec4(0.5f, 0.5f, 0.5f, 1.0f));
} }
void Editor::UpdateScreen() { void Editor::UpdateScreen() {
@@ -106,12 +74,8 @@ void Editor::UpdateScreen() {
ImGui::SetNextWindowPos(ImVec2(0, 0)); ImGui::SetNextWindowPos(ImVec2(0, 0));
ImVec2 dimensions(io.DisplaySize.x, io.DisplaySize.y); ImVec2 dimensions(io.DisplaySize.x, io.DisplaySize.y);
ImGui::SetNextWindowSize(dimensions, ImGuiCond_Always); ImGui::SetNextWindowSize(dimensions, ImGuiCond_Always);
ImGuiWindowFlags flags =
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse |
ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoScrollbar |
ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoTitleBar;
if (!ImGui::Begin("##YazeMain", nullptr, flags)) { if (!ImGui::Begin("##YazeMain", nullptr, main_editor_flags_)) {
ImGui::End(); ImGui::End();
return; return;
} }
@@ -138,18 +102,14 @@ void Editor::DrawYazeMenu() {
DrawHelpMenu(); DrawHelpMenu();
END_MENU_BAR(); END_MENU_BAR();
// display
if (ImGuiFileDialog::Instance()->Display("ChooseFileDlgKey")) { if (ImGuiFileDialog::Instance()->Display("ChooseFileDlgKey")) {
// action if OK
if (ImGuiFileDialog::Instance()->IsOk()) { if (ImGuiFileDialog::Instance()->IsOk()) {
std::string filePathName = ImGuiFileDialog::Instance()->GetFilePathName(); std::string filePathName = ImGuiFileDialog::Instance()->GetFilePathName();
std::string filePath = ImGuiFileDialog::Instance()->GetCurrentPath(); std::string filePath = ImGuiFileDialog::Instance()->GetCurrentPath();
rom.LoadFromFile(filePathName); rom_.LoadFromFile(filePathName);
overworld_editor_.SetRom(rom); overworld_editor_.SetRom(rom_);
rom_data_ = (void *)rom.GetRawData(); rom_data_ = (void *)rom_.GetRawData();
} }
// close
ImGuiFileDialog::Instance()->Close(); ImGuiFileDialog::Instance()->Close();
} }
} }
@@ -157,13 +117,11 @@ void Editor::DrawYazeMenu() {
void Editor::DrawFileMenu() const { void Editor::DrawFileMenu() const {
if (ImGui::BeginMenu("File")) { if (ImGui::BeginMenu("File")) {
if (ImGui::MenuItem("Open", "Ctrl+O")) { if (ImGui::MenuItem("Open", "Ctrl+O")) {
// TODO: Add the ability to open ALTTP ROM
ImGuiFileDialog::Instance()->OpenDialog("ChooseFileDlgKey", "Open ROM", ImGuiFileDialog::Instance()->OpenDialog("ChooseFileDlgKey", "Open ROM",
".sfc,.smc", "."); ".sfc,.smc", ".");
} }
if (ImGui::BeginMenu("Open Recent")) { if (ImGui::BeginMenu("Open Recent")) {
ImGui::MenuItem("alttp.sfc"); ImGui::MenuItem("alttp.sfc");
// TODO: Display recently accessed files here
ImGui::EndMenu(); ImGui::EndMenu();
} }
if (ImGui::MenuItem("Save", "Ctrl+S")) { if (ImGui::MenuItem("Save", "Ctrl+S")) {
@@ -232,7 +190,7 @@ void Editor::DrawViewMenu() {
if (show_memory_editor) { if (show_memory_editor) {
static MemoryEditor mem_edit; static MemoryEditor mem_edit;
mem_edit.DrawWindow("Memory Editor", rom_data_, rom.getSize()); mem_edit.DrawWindow("Memory Editor", rom_data_, rom_.getSize());
} }
if (show_imgui_demo) { if (show_imgui_demo) {
@@ -304,9 +262,9 @@ void Editor::DrawProjectEditor() {
ImGui::TableSetupColumn("##outputs"); ImGui::TableSetupColumn("##outputs");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("Title: %s", rom.getTitle()); ImGui::Text("Title: %s", rom_.getTitle());
ImGui::Text("Version: %d", rom.getVersion()); ImGui::Text("Version: %d", rom_.getVersion());
ImGui::Text("ROM Size: %ld", rom.getSize()); ImGui::Text("ROM Size: %ld", rom_.getSize());
ImGui::InputInt("PC Tile Location", &current_set_.pcTilesLocation); ImGui::InputInt("PC Tile Location", &current_set_.pcTilesLocation);
// 1, 100, ImGuiInputTextFlags_CharsHexadecimal); // 1, 100, ImGuiInputTextFlags_CharsHexadecimal);
@@ -327,14 +285,14 @@ void Editor::DrawProjectEditor() {
(void *)&current_set_.SNESPaletteLocation); (void *)&current_set_.SNESPaletteLocation);
BASIC_BUTTON("ExtractTiles") { BASIC_BUTTON("ExtractTiles") {
if (rom.isLoaded()) { if (rom_.isLoaded()) {
tiles_ = rom.ExtractTiles(current_set_); tiles_ = rom_.ExtractTiles(current_set_);
} }
} }
BASIC_BUTTON("BuildSurface") { BASIC_BUTTON("BuildSurface") {
if (rom.isLoaded()) { if (rom_.isLoaded()) {
current_palette_ = rom.ExtractPalette(current_set_); current_palette_ = rom_.ExtractPalette(current_set_);
current_scene_.buildSurface(tiles_, current_palette_, current_scene_.buildSurface(tiles_, current_palette_,
current_set_.tilesPattern); current_set_.tilesPattern);
} }
@@ -441,7 +399,7 @@ void Editor::DrawOverworldEditor() {
void Editor::DrawDungeonEditor() { void Editor::DrawDungeonEditor() {
if (ImGui::BeginTabItem("Dungeon")) { if (ImGui::BeginTabItem("Dungeon")) {
if (ImGui::BeginTable("DWToolset", 9, toolset_table_flags, ImVec2(0, 0))) { if (ImGui::BeginTable("DWToolset", 9, toolset_table_flags_, ImVec2(0, 0))) {
ImGui::TableSetupColumn("#undoTool"); ImGui::TableSetupColumn("#undoTool");
ImGui::TableSetupColumn("#redoTool"); ImGui::TableSetupColumn("#redoTool");
ImGui::TableSetupColumn("#history"); ImGui::TableSetupColumn("#history");

20
src/Application/Editor/editor.h
View File

@@ -7,12 +7,10 @@
#include <imgui/imgui_memory_editor.h> #include <imgui/imgui_memory_editor.h>
#include <imgui/misc/cpp/imgui_stdlib.h> #include <imgui/misc/cpp/imgui_stdlib.h>
#include <memory>
#include "Core/constants.h" #include "Core/constants.h"
#include "Data/rom.h" #include "Data/rom.h"
#include "Editor/overworld_editor.h"
#include "Graphics/icons.h" #include "Graphics/icons.h"
#include "overworld_editor.h"
namespace yaze { namespace yaze {
namespace Application { namespace Application {
@@ -38,20 +36,24 @@ class Editor {
void DrawScreenEditor(); void DrawScreenEditor();
void *rom_data_; void *rom_data_;
bool isLoaded = true; bool is_loaded_ = true;
Data::ROM rom; std::vector<tile8> tiles_;
Data::ROM rom_;
TextEditor asm_editor_; TextEditor asm_editor_;
TextEditor::LanguageDefinition language65816Def; TextEditor::LanguageDefinition language_65816_;
OverworldEditor overworld_editor_; OverworldEditor overworld_editor_;
Graphics::Scene current_scene_; Graphics::Scene current_scene_;
Graphics::SNESPalette current_palette_; Graphics::SNESPalette current_palette_;
Graphics::TilePreset current_set_; Graphics::TilePreset current_set_;
std::vector<tile8> tiles_; ImGuiWindowFlags main_editor_flags_ =
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse |
ImGuiTableFlags toolset_table_flags = ImGuiTableFlags_SizingFixedFit; ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoScrollbar |
ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoTitleBar;
ImGuiTableFlags toolset_table_flags_ = ImGuiTableFlags_SizingFixedFit;
}; };
} // namespace Editor } // namespace Editor