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

Update params for InputHex and InputHexShort

Browse Source 
From int to uint64_t and uint32_t respectively
This commit is contained in:
Justin Scofield
2023-08-02 19:04:02 -04:00
parent d4fdee6d32
commit b3458b56db
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,8 +122,6 @@ absl::Status GraphicsEditor::DrawCgxImport() {
} }
absl::Status GraphicsEditor::DrawFileImport() { absl::Status GraphicsEditor::DrawFileImport() {
static int size = 0;
gui::TextWithSeparators("BIN Import"); gui::TextWithSeparators("BIN Import");
ImGui::InputText("##ROMFile", file_path_, sizeof(file_path_)); ImGui::InputText("##ROMFile", file_path_, sizeof(file_path_));
@@ -142,11 +140,11 @@ absl::Status GraphicsEditor::DrawFileImport() {
[&]() -> auto { ImGui::SetClipboardText(file_path_); }); [&]() -> auto { ImGui::SetClipboardText(file_path_); });
gui::InputHex("BIN Offset", &current_offset_); gui::InputHex("BIN Offset", &current_offset_);
gui::InputHex("BIN Size", &size); gui::InputHex("BIN Size", &bin_size_);
if (ImGui::Button("Decompress BIN")) { if (ImGui::Button("Decompress BIN")) {
if (strlen(file_path_) > 0) { if (strlen(file_path_) > 0) {
RETURN_IF_ERROR(DecompressImportData(size)) RETURN_IF_ERROR(DecompressImportData(bin_size_))
} else { } else {
return absl::InvalidArgumentError( return absl::InvalidArgumentError(
"Please select a file before importing."); "Please select a file before importing.");

16
src/app/editor/graphics_editor.h
View File

@@ -80,15 +80,17 @@ class GraphicsEditor {
absl::Status DecompressSuperDonkey(); absl::Status DecompressSuperDonkey();
int current_offset_ = 0; uint64_t current_offset_ = 0;
int current_size_ = 0; uint64_t current_size_ = 0;
int current_palette_ = 0; int current_palette_ = 0;
int current_palette_index_ = 0; uint64_t current_palette_index_ = 0;
int num_sheets_to_load_ = 1;
int clipboard_offset_ = 0; uint64_t num_sheets_to_load_ = 1;
int clipboard_size_ = 0;
uint64_t bin_size_ = 0;
uint64_t clipboard_offset_ = 0;
uint64_t clipboard_size_ = 0;
bool open_memory_editor_ = false; bool open_memory_editor_ = false;
bool gfx_loaded_ = false; bool gfx_loaded_ = false;

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

@@ -138,8 +138,6 @@ void ScreenEditor::DrawMosaicEditor() {
ImGui::EndTable(); ImGui::EndTable();
} }
gui::InputHex("Routine Location", &overworldCustomMosaicASM);
END_TAB_ITEM() END_TAB_ITEM()
} }

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

@@ -11,13 +11,13 @@ namespace gui {
const int kStepOneHex = 0x01; const int kStepOneHex = 0x01;
const int kStepFastHex = 0x0F; const int kStepFastHex = 0x0F;
bool InputHex(const char* label, int* data) { bool InputHex(const char* label, uint64_t* data) {
return ImGui::InputScalar(label, ImGuiDataType_U64, data, &kStepOneHex, return ImGui::InputScalar(label, ImGuiDataType_U64, data, &kStepOneHex,
&kStepFastHex, "%06X", &kStepFastHex, "%06X",
ImGuiInputTextFlags_CharsHexadecimal); ImGuiInputTextFlags_CharsHexadecimal);
} }
bool InputHexShort(const char* label, int* data) { bool InputHexShort(const char* label, uint32_t* data) {
return ImGui::InputScalar(label, ImGuiDataType_U32, data, &kStepOneHex, return ImGui::InputScalar(label, ImGuiDataType_U32, data, &kStepOneHex,
&kStepFastHex, "%06X", &kStepFastHex, "%06X",
ImGuiInputTextFlags_CharsHexadecimal); ImGuiInputTextFlags_CharsHexadecimal);

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

@@ -15,8 +15,8 @@ namespace gui {
constexpr ImVec2 kDefaultModalSize = ImVec2(200, 0); constexpr ImVec2 kDefaultModalSize = ImVec2(200, 0);
constexpr ImVec2 kZeroPos = ImVec2(0, 0); constexpr ImVec2 kZeroPos = ImVec2(0, 0);
IMGUI_API bool InputHex(const char* label, int* data); IMGUI_API bool InputHex(const char* label, uint64_t* data);
IMGUI_API bool InputHexShort(const char* label, int* data); IMGUI_API bool InputHexShort(const char* label, uint32_t* data);
using ItemLabelFlags = enum ItemLabelFlag { using ItemLabelFlags = enum ItemLabelFlag {
Left = 1u << 0u, Left = 1u << 0u,