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

big cleanup

Browse Source
This commit is contained in:
scawful
2024-08-20 22:10:35 -04:00
parent dc244ac02d
commit 7b33313281
31 changed files with 291 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,50 +55,12 @@ uint32_t crc32(const std::vector<uint8_t> &data) {
return ::crc32(crc, data.data(), data.size()); return ::crc32(crc, data.data(), data.size());
} }
} // namespace // "load little endian value at the given byte offset and shift to get its
// value relative to the base offset (powers of 256, essentially)"
std::shared_ptr<ExperimentFlags::Flags> ExperimentFlags::flags_; unsigned ldle(uint8_t const *const p_arr, unsigned const p_index) {
uint32_t v = p_arr[p_index];
// Initialize the static member v <<= (8 * p_index);
std::stack<ImGuiID> ImGuiIdIssuer::idStack; return v;
uint32_t Get24LocalFromPC(uint8_t *data, int addr, bool pc) {
uint32_t ret =
(PcToSnes(addr) & 0xFF0000) | (data[addr + 1] << 8) | data[addr];
if (pc) {
return SnesToPc(ret);
}
return ret;
}
// hextodec has been imported from SNESDisasm to parse hex numbers
int HexToDec(char *input, int length) {
int result = 0;
int value;
int ceiling = length - 1;
int power16 = 16;
int j = ceiling;
for (; j >= 0; j--) {
if (input[j] >= 'A' && input[j] <= 'F') {
value = input[j] - 'F';
value += 15;
} else {
value = input[j] - '9';
value += 9;
}
if (j == ceiling) {
result += value;
continue;
}
result += (value * power16);
power16 *= 16;
}
return result;
} }
void stle(uint8_t *const p_arr, size_t const p_index, unsigned const p_val) { void stle(uint8_t *const p_arr, size_t const p_index, unsigned const p_val) {
@@ -122,24 +84,6 @@ void stle2(uint8_t *const p_arr, unsigned const p_val) {
void stle3(uint8_t *const p_arr, unsigned const p_val) { void stle3(uint8_t *const p_arr, unsigned const p_val) {
stle(p_arr, 3, p_val); stle(p_arr, 3, p_val);
} }
void stle16b(uint8_t *const p_arr, uint16_t const p_val) {
stle0(p_arr, p_val);
stle1(p_arr, p_val);
}
void stle16b_i(uint8_t *const p_arr, size_t const p_index,
uint16_t const p_val) {
stle16b(p_arr + (p_index * 2), p_val);
}
// "load little endian value at the given byte offset and shift to get its
// value relative to the base offset (powers of 256, essentially)"
unsigned ldle(uint8_t const *const p_arr, unsigned const p_index) {
uint32_t v = p_arr[p_index];
v <<= (8 * p_index);
return v;
}
// Helper function to get the first byte in a little endian number // Helper function to get the first byte in a little endian number
uint32_t ldle0(uint8_t const *const p_arr) { return ldle(p_arr, 0); } uint32_t ldle0(uint8_t const *const p_arr) { return ldle(p_arr, 0); }
@@ -153,11 +97,32 @@ uint32_t ldle2(uint8_t const *const p_arr) { return ldle(p_arr, 2); }
// Helper function to get the third byte in a little endian number // Helper function to get the third byte in a little endian number
uint32_t ldle3(uint8_t const *const p_arr) { return ldle(p_arr, 3); } uint32_t ldle3(uint8_t const *const p_arr) { return ldle(p_arr, 3); }
} // namespace
std::shared_ptr<ExperimentFlags::Flags> ExperimentFlags::flags_;
uint32_t Get24LocalFromPC(uint8_t *data, int addr, bool pc) {
uint32_t ret =
(PcToSnes(addr) & 0xFF0000) | (data[addr + 1] << 8) | data[addr];
if (pc) {
return SnesToPc(ret);
}
return ret;
}
void stle16b_i(uint8_t *const p_arr, size_t const p_index,
uint16_t const p_val) {
stle16b(p_arr + (p_index * 2), p_val);
}
void stle16b(uint8_t *const p_arr, uint16_t const p_val) {
stle0(p_arr, p_val);
stle1(p_arr, p_val);
}
uint16_t ldle16b(uint8_t const *const p_arr) { uint16_t ldle16b(uint8_t const *const p_arr) {
uint16_t v = 0; uint16_t v = 0;
v |= (ldle0(p_arr) | ldle1(p_arr)); v |= (ldle0(p_arr) | ldle1(p_arr));
return v; return v;
} }
@@ -175,82 +140,83 @@ void CreateBpsPatch(const std::vector<uint8_t> &source,
encode(target.size(), patch); encode(target.size(), patch);
encode(0, patch); // No metadata encode(0, patch); // No metadata
size_t sourceOffset = 0; size_t source_offset = 0;
size_t targetOffset = 0; size_t target_offset = 0;
int64_t sourceRelOffset = 0; int64_t source_rel_offset = 0;
int64_t targetRelOffset = 0; int64_t target_rel_offset = 0;
while (targetOffset < target.size()) { while (target_offset < target.size()) {
if (sourceOffset < source.size() && if (source_offset < source.size() &&
source[sourceOffset] == target[targetOffset]) { source[source_offset] == target[target_offset]) {
size_t length = 0; size_t length = 0;
while (sourceOffset + length < source.size() && while (source_offset + length < source.size() &&
targetOffset + length < target.size() && target_offset + length < target.size() &&
source[sourceOffset + length] == target[targetOffset + length]) { source[source_offset + length] == target[target_offset + length]) {
length++; length++;
} }
encode((length - 1) << 2 | 0, patch); // SourceRead encode((length - 1) << 2 | 0, patch); // SourceRead
sourceOffset += length; source_offset += length;
targetOffset += length; target_offset += length;
} else { } else {
size_t length = 0; size_t length = 0;
while (targetOffset + length < target.size() && while (
(sourceOffset + length >= source.size() || target_offset + length < target.size() &&
source[sourceOffset + length] != target[targetOffset + length])) { (source_offset + length >= source.size() ||
source[source_offset + length] != target[target_offset + length])) {
length++; length++;
} }
if (length > 0) { if (length > 0) {
encode((length - 1) << 2 | 1, patch); // TargetRead encode((length - 1) << 2 | 1, patch); // TargetRead
for (size_t i = 0; i < length; i++) { for (size_t i = 0; i < length; i++) {
patch.push_back(target[targetOffset + i]); patch.push_back(target[target_offset + i]);
} }
targetOffset += length; target_offset += length;
} }
} }
// SourceCopy // SourceCopy
if (sourceOffset < source.size()) { if (source_offset < source.size()) {
size_t length = 0; size_t length = 0;
int64_t offset = sourceOffset - sourceRelOffset; int64_t offset = source_offset - source_rel_offset;
while (sourceOffset + length < source.size() && while (source_offset + length < source.size() &&
targetOffset + length < target.size() && target_offset + length < target.size() &&
source[sourceOffset + length] == target[targetOffset + length]) { source[source_offset + length] == target[target_offset + length]) {
length++; length++;
} }
if (length > 0) { if (length > 0) {
encode((length - 1) << 2 | 2, patch); encode((length - 1) << 2 | 2, patch);
encode((offset < 0 ? 1 : 0) | (abs(offset) << 1), patch); encode((offset < 0 ? 1 : 0) | (abs(offset) << 1), patch);
sourceOffset += length; source_offset += length;
targetOffset += length; target_offset += length;
sourceRelOffset = sourceOffset; source_rel_offset = source_offset;
} }
} }
// TargetCopy // TargetCopy
if (targetOffset > 0) { if (target_offset > 0) {
size_t length = 0; size_t length = 0;
int64_t offset = targetOffset - targetRelOffset; int64_t offset = target_offset - target_rel_offset;
while (targetOffset + length < target.size() && while (target_offset + length < target.size() &&
target[targetOffset - 1] == target[targetOffset + length]) { target[target_offset - 1] == target[target_offset + length]) {
length++; length++;
} }
if (length > 0) { if (length > 0) {
encode((length - 1) << 2 | 3, patch); encode((length - 1) << 2 | 3, patch);
encode((offset < 0 ? 1 : 0) | (abs(offset) << 1), patch); encode((offset < 0 ? 1 : 0) | (abs(offset) << 1), patch);
targetOffset += length; target_offset += length;
targetRelOffset = targetOffset; target_rel_offset = target_offset;
} }
} }
} }
patch.resize(patch.size() + 12); // Make space for the checksums patch.resize(patch.size() + 12); // Make space for the checksums
uint32_t sourceChecksum = crc32(source); uint32_t source_checksum = crc32(source);
uint32_t targetChecksum = crc32(target); uint32_t target_checksum = crc32(target);
uint32_t patchChecksum = crc32(patch); uint32_t patch_checksum = crc32(patch);
memcpy(patch.data() + patch.size() - 12, &sourceChecksum, sizeof(uint32_t)); memcpy(patch.data() + patch.size() - 12, &source_checksum, sizeof(uint32_t));
memcpy(patch.data() + patch.size() - 8, &targetChecksum, sizeof(uint32_t)); memcpy(patch.data() + patch.size() - 8, &target_checksum, sizeof(uint32_t));
memcpy(patch.data() + patch.size() - 4, &patchChecksum, sizeof(uint32_t)); memcpy(patch.data() + patch.size() - 4, &patch_checksum, sizeof(uint32_t));
} }
void ApplyBpsPatch(const std::vector<uint8_t> &source, void ApplyBpsPatch(const std::vector<uint8_t> &source,
@@ -261,48 +227,48 @@ void ApplyBpsPatch(const std::vector<uint8_t> &source,
throw std::runtime_error("Invalid patch format"); throw std::runtime_error("Invalid patch format");
} }
size_t patchOffset = 4; size_t patch_offset = 4;
uint64_t sourceSize = decode(patch, patchOffset); uint64_t source_size = decode(patch, patch_offset);
uint64_t targetSize = decode(patch, patchOffset); uint64_t target_size = decode(patch, patch_offset);
uint64_t metadataSize = decode(patch, patchOffset); uint64_t metadata_size = decode(patch, patch_offset);
patchOffset += metadataSize; patch_offset += metadata_size;
target.resize(targetSize); target.resize(target_size);
size_t sourceOffset = 0; size_t source_offset = 0;
size_t targetOffset = 0; size_t target_offset = 0;
int64_t sourceRelOffset = 0; int64_t source_rel_offset = 0;
int64_t targetRelOffset = 0; int64_t target_rel_offset = 0;
while (patchOffset < patch.size() - 12) { while (patch_offset < patch.size() - 12) {
uint64_t data = decode(patch, patchOffset); uint64_t data = decode(patch, patch_offset);
uint64_t command = data & 3; uint64_t command = data & 3;
uint64_t length = (data >> 2) + 1; uint64_t length = (data >> 2) + 1;
switch (command) { switch (command) {
case 0: // SourceRead case 0: // SourceRead
while (length--) { while (length--) {
target[targetOffset++] = source[sourceOffset++]; target[target_offset++] = source[source_offset++];
} }
break; break;
case 1: // TargetRead case 1: // TargetRead
while (length--) { while (length--) {
target[targetOffset++] = patch[patchOffset++]; target[target_offset++] = patch[patch_offset++];
} }
break; break;
case 2: // SourceCopy case 2: // SourceCopy
{ {
int64_t offsetData = decode(patch, patchOffset); int64_t offsetData = decode(patch, patch_offset);
sourceRelOffset += (offsetData & 1 ? -1 : +1) * (offsetData >> 1); source_rel_offset += (offsetData & 1 ? -1 : +1) * (offsetData >> 1);
while (length--) { while (length--) {
target[targetOffset++] = source[sourceRelOffset++]; target[target_offset++] = source[source_rel_offset++];
} }
} break; } break;
case 3: // TargetCopy case 3: // TargetCopy
{ {
uint64_t offsetData = decode(patch, patchOffset); uint64_t offsetData = decode(patch, patch_offset);
targetRelOffset += (offsetData & 1 ? -1 : +1) * (offsetData >> 1); target_rel_offset += (offsetData & 1 ? -1 : +1) * (offsetData >> 1);
while (length--) { while (length--) {
target[targetOffset++] = target[targetRelOffset++]; target[target_offset++] = target[target_rel_offset++];
} }
} }
default: default:
@@ -310,15 +276,15 @@ void ApplyBpsPatch(const std::vector<uint8_t> &source,
} }
} }
uint32_t sourceChecksum; uint32_t source_checksum;
uint32_t targetChecksum; uint32_t target_checksum;
uint32_t patchChecksum; uint32_t patch_checksum;
memcpy(&sourceChecksum, patch.data() + patch.size() - 12, sizeof(uint32_t)); memcpy(&source_checksum, patch.data() + patch.size() - 12, sizeof(uint32_t));
memcpy(&targetChecksum, patch.data() + patch.size() - 8, sizeof(uint32_t)); memcpy(&target_checksum, patch.data() + patch.size() - 8, sizeof(uint32_t));
memcpy(&patchChecksum, patch.data() + patch.size() - 4, sizeof(uint32_t)); memcpy(&patch_checksum, patch.data() + patch.size() - 4, sizeof(uint32_t));
if (sourceChecksum != crc32(source) || targetChecksum != crc32(target) || if (source_checksum != crc32(source) || target_checksum != crc32(target) ||
patchChecksum != patch_checksum !=
crc32(std::vector<uint8_t>(patch.begin(), patch.end() - 4))) { crc32(std::vector<uint8_t>(patch.begin(), patch.end() - 4))) {
throw std::runtime_error("Checksum mismatch"); throw std::runtime_error("Checksum mismatch");
} }

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

@@ -159,27 +159,6 @@ class NotifyValue {
T temp_value_; T temp_value_;
}; };
class ImGuiIdIssuer {
private:
static std::stack<ImGuiID> idStack;
public:
// Generate and push a new ID onto the stack
static ImGuiID GetNewID() {
static int counter = 1; // Start from 1 to ensure uniqueness
ImGuiID child_id = ImGui::GetID((void *)(intptr_t)counter++);
idStack.push(child_id);
return child_id;
}
// Pop all IDs from the stack (can be called explicitly or upon program exit)
static void Cleanup() {
while (!idStack.empty()) {
idStack.pop();
}
}
};
static bool log_to_console = false; static bool log_to_console = false;
static std::string log_file_out = "log.txt"; static std::string log_file_out = "log.txt";
@@ -236,23 +215,25 @@ inline uint32_t MapBankToWordAddress(uint8_t bank, uint16_t addr) noexcept {
uint32_t Get24LocalFromPC(uint8_t *data, int addr, bool pc = true); uint32_t Get24LocalFromPC(uint8_t *data, int addr, bool pc = true);
int HexToDec(char *input, int length); /**
* @brief Store little endian 16-bit value using a byte pointer, offset by an
// "Store little endian 16-bit value using a byte pointer, offset by an * index before dereferencing
// index before dereferencing" */
void stle16b_i(uint8_t *const p_arr, size_t const p_index, void stle16b_i(uint8_t *const p_arr, size_t const p_index,
uint16_t const p_val); uint16_t const p_val);
// Load little endian halfword (16-bit) dereferenced from an arrays of bytes. void stle16b(uint8_t *const p_arr, uint16_t const p_val);
// This version provides an index that will be multiplied by 2 and added to the
// base address. /**
* @brief Load little endian halfword (16-bit) dereferenced from an arrays of
* bytes. This version provides an index that will be multiplied by 2 and added
* to the base address.
*/
uint16_t ldle16b_i(uint8_t const *const p_arr, size_t const p_index); uint16_t ldle16b_i(uint8_t const *const p_arr, size_t const p_index);
// Load little endian halfword (16-bit) dereferenced from // Load little endian halfword (16-bit) dereferenced from
uint16_t ldle16b(uint8_t const *const p_arr); uint16_t ldle16b(uint8_t const *const p_arr);
void stle16b(uint8_t *const p_arr, uint16_t const p_val);
struct FolderItem { struct FolderItem {
std::string name; std::string name;
std::vector<FolderItem> subfolders; std::vector<FolderItem> subfolders;

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

@@ -11,7 +11,7 @@
#include "imgui/imgui.h" #include "imgui/imgui.h"
#include "imgui/imgui_internal.h" #include "imgui/imgui_internal.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/platform/renderer.h" #include "app/core/platform/renderer.h"
#include "app/editor/editor_manager.h" #include "app/editor/editor_manager.h"
#include "app/editor/utils/editor.h" #include "app/editor/utils/editor.h"

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

@@ -8,7 +8,7 @@
#include <vector> #include <vector>
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/gui/icons.h" #include "app/gui/icons.h"
#include "imgui/imgui.h" #include "imgui/imgui.h"

2
src/app/core/labeling.h
View File

@@ -10,7 +10,7 @@
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
namespace yaze { namespace yaze {

1
src/app/core/message.h
View File

@@ -21,6 +21,7 @@ struct Message {
void* sender; void* sender;
std::any payload; std::any payload;
Message() = default;
Message(const std::string& type, void* sender, const std::any& payload) Message(const std::string& type, void* sender, const std::any& payload)
: type(type), sender(sender), payload(payload) {} : type(type), sender(sender), payload(payload) {}
}; };

3
src/app/core/platform/renderer.h
View File

@@ -69,7 +69,8 @@ class Renderer : public ExperimentFlags {
} }
absl::Status CreateAndRenderBitmap(int width, int height, int depth, absl::Status CreateAndRenderBitmap(int width, int height, int depth,
const std::vector<uint8_t>& data, gfx::Bitmap& bitmap, const std::vector<uint8_t>& data,
gfx::Bitmap& bitmap,
gfx::SnesPalette& palette) { gfx::SnesPalette& palette) {
bitmap.Create(width, height, depth, data); bitmap.Create(width, height, depth, data);
RETURN_IF_ERROR(bitmap.ApplyPalette(palette)); RETURN_IF_ERROR(bitmap.ApplyPalette(palette));

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

@@ -1,13 +1,12 @@
#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 "ImGuiFileDialog/ImGuiFileDialog.h"
#include <fstream> #include <fstream>
#include <istream> #include <istream>
#include <string> #include <string>
#include "ImGuiColorTextEdit/TextEditor.h"
#include "ImGuiFileDialog/ImGuiFileDialog.h"
#include "app/core/common.h" #include "app/core/common.h"
#include "app/editor/utils/editor.h" #include "app/editor/utils/editor.h"
#include "app/gui/style.h" #include "app/gui/style.h"

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

@@ -1,12 +1,7 @@
#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/misc/cpp/imgui_stdlib.h"
#include "imgui_memory_editor.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/core/platform/file_dialog.h" #include "app/core/platform/file_dialog.h"
#include "app/core/project.h" #include "app/core/project.h"
@@ -30,6 +25,9 @@
#include "app/gui/input.h" #include "app/gui/input.h"
#include "app/gui/style.h" #include "app/gui/style.h"
#include "app/rom.h" #include "app/rom.h"
#include "imgui/imgui.h"
#include "imgui/misc/cpp/imgui_stdlib.h"
#include "imgui_memory_editor.h"
namespace yaze { namespace yaze {
namespace app { namespace app {

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

@@ -1,6 +1,5 @@
#include "dungeon_editor.h" #include "dungeon_editor.h"
#include "app/core/common.h"
#include "app/core/labeling.h" #include "app/core/labeling.h"
#include "app/core/platform/renderer.h" #include "app/core/platform/renderer.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"

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

@@ -4,7 +4,7 @@
#include "ImGuiFileDialog/ImGuiFileDialog.h" #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include "abseil-cpp/absl/strings/match.h" #include "abseil-cpp/absl/strings/match.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/core/platform/file_dialog.h" #include "app/core/platform/file_dialog.h"
#include "app/core/platform/renderer.h" #include "app/core/platform/renderer.h"

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

@@ -6,7 +6,7 @@
#include "ImGuiColorTextEdit/TextEditor.h" #include "ImGuiColorTextEdit/TextEditor.h"
#include "ImGuiFileDialog/ImGuiFileDialog.h" #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/core/message.h" #include "app/core/message.h"
#include "app/core/project.h" #include "app/core/project.h"

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

@@ -9,7 +9,7 @@
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/core/platform/renderer.h" #include "app/core/platform/renderer.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"

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

@@ -5,6 +5,7 @@
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "app/core/common.h"
#include "app/editor/graphics/palette_editor.h" #include "app/editor/graphics/palette_editor.h"
#include "app/editor/utils/editor.h" #include "app/editor/utils/editor.h"
#include "app/editor/utils/gfx_context.h" #include "app/editor/utils/gfx_context.h"

2
src/app/editor/message/message_editor.cc
View File

@@ -11,7 +11,7 @@
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "absl/strings/str_replace.h" #include "absl/strings/str_replace.h"
#include "absl/strings/str_split.h" #include "absl/strings/str_split.h"
#include "app/core/common.h"
#include "app/core/platform/renderer.h" #include "app/core/platform/renderer.h"
#include "app/editor/utils/editor.h" #include "app/editor/utils/editor.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"

2
src/app/editor/overworld/overworld_editor.cc
View File

@@ -8,7 +8,7 @@
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/core/platform/clipboard.h" #include "app/core/platform/clipboard.h"
#include "app/core/platform/renderer.h" #include "app/core/platform/renderer.h"

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

@@ -8,7 +8,7 @@
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "app/core/common.h"
#include "app/editor/graphics/gfx_group_editor.h" #include "app/editor/graphics/gfx_group_editor.h"
#include "app/editor/graphics/palette_editor.h" #include "app/editor/graphics/palette_editor.h"
#include "app/editor/graphics/tile16_editor.h" #include "app/editor/graphics/tile16_editor.h"

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

@@ -6,7 +6,7 @@
#include "ImGuiFileDialog/ImGuiFileDialog.h" #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "app/core/common.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
#include "app/gui/canvas.h" #include "app/gui/canvas.h"

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

@@ -15,7 +15,7 @@
#include <vector> #include <vector>
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "app/core/common.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
#include "app/gui/canvas.h" #include "app/gui/canvas.h"

31
src/app/zelda3/dungeon/room.cc
View File

@@ -3,7 +3,6 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
@@ -72,9 +71,8 @@ void Room::LoadHeader() {
// Existing room size address calculation... // Existing room size address calculation...
auto room_size_address = 0xF8000 + (room_id_ * 3); auto room_size_address = 0xF8000 + (room_id_ * 3);
if (flags()->kLogToConsole) std::cout << "Room #" << room_id_ << " Address: " << std::hex
std::cout << "Room #" << room_id_ << " Address: " << std::hex << room_size_address << std::endl;
<< room_size_address << std::endl;
// Reading bytes for long address construction // Reading bytes for long address construction
uint8_t low = rom()->data()[room_size_address]; uint8_t low = rom()->data()[room_size_address];
@@ -83,15 +81,13 @@ void Room::LoadHeader() {
// Constructing the long address // Constructing the long address
int long_address = (bank << 16) | (high << 8) | low; int long_address = (bank << 16) | (high << 8) | low;
if (flags()->kLogToConsole) std::cout << std::hex << std::setfill('0') << std::setw(6) << long_address
std::cout << std::hex << std::setfill('0') << std::setw(6) << long_address << std::endl;
<< std::endl;
room_size_pointer_ = long_address; room_size_pointer_ = long_address;
if (long_address == 0x0A8000) { if (long_address == 0x0A8000) {
// Blank room disregard in size calculation // Blank room disregard in size calculation
if (flags()->kLogToConsole) std::cout << "Size of Room #" << room_id_ << ": 0 bytes" << std::endl;
std::cout << "Size of Room #" << room_id_ << ": 0 bytes" << std::endl;
room_size_ = 0; room_size_ = 0;
} else { } else {
// use the long address to calculate the size of the room // use the long address to calculate the size of the room
@@ -100,9 +96,8 @@ void Room::LoadHeader() {
int next_room_address = 0xF8000 + ((room_id_ + 1) * 3); int next_room_address = 0xF8000 + ((room_id_ + 1) * 3);
if (flags()->kLogToConsole) std::cout << "Next Room Address: " << std::hex << next_room_address
std::cout << "Next Room Address: " << std::hex << next_room_address << std::endl;
<< std::endl;
// Reading bytes for long address construction // Reading bytes for long address construction
uint8_t next_low = rom()->data()[next_room_address]; uint8_t next_low = rom()->data()[next_room_address];
@@ -112,19 +107,17 @@ void Room::LoadHeader() {
// Constructing the long address // Constructing the long address
int next_long_address = (next_bank << 16) | (next_high << 8) | next_low; int next_long_address = (next_bank << 16) | (next_high << 8) | next_low;
if (flags()->kLogToConsole) std::cout << std::hex << std::setfill('0') << std::setw(6)
std::cout << std::hex << std::setfill('0') << std::setw(6) << next_long_address << std::endl;
<< next_long_address << std::endl;
// Calculate the size of the room // Calculate the size of the room
int room_size = next_long_address - long_address; int room_size = next_long_address - long_address;
room_size_ = room_size; room_size_ = room_size;
if (flags()->kLogToConsole) std::cout << "Size of Room #" << room_id_ << ": " << std::dec << room_size
std::cout << "Size of Room #" << room_id_ << ": " << std::dec << " bytes" << std::endl;
<< room_size << " bytes" << std::endl;
} }
} catch (const std::exception& e) { } catch (const std::exception& e) {
if (flags()->kLogToConsole) std::cout << "Error: " << e.what() << std::endl; std::cout << "Error: " << e.what() << std::endl;
} }
} }

3
src/app/zelda3/dungeon/room.h
View File

@@ -4,7 +4,6 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
@@ -118,7 +117,7 @@ struct ChestData {
struct StaircaseRooms {}; struct StaircaseRooms {};
class Room : public SharedRom, public core::ExperimentFlags { class Room : public SharedRom {
public: public:
Room() = default; Room() = default;
Room(int room_id) : room_id_(room_id) {} Room(int room_id) : room_id_(room_id) {}

2
src/app/zelda3/music/tracker.h
View File

@@ -7,7 +7,7 @@
#include <vector> #include <vector>
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_tile.h" #include "app/gfx/snes_tile.h"

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

@@ -11,7 +11,7 @@
#include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_map.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/compression.h" #include "app/gfx/compression.h"

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

@@ -6,7 +6,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "app/core/common.h"
#include "app/editor/utils/gfx_context.h" #include "app/editor/utils/gfx_context.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_tile.h" #include "app/gfx/snes_tile.h"

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

@@ -8,7 +8,7 @@
#include <vector> #include <vector>
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h"
#include "app/editor/utils/gfx_context.h" #include "app/editor/utils/gfx_context.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"

2
src/app/zelda3/screen/title_screen.cc
View File

@@ -2,7 +2,7 @@
#include <cstdint> #include <cstdint>
#include "app/core/common.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_tile.h" #include "app/gfx/snes_tile.h"
#include "app/rom.h" #include "app/rom.h"

2
src/app/zelda3/screen/title_screen.h
View File

@@ -3,7 +3,7 @@
#include <cstdint> #include <cstdint>
#include "app/core/common.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_tile.h" #include "app/gfx/snes_tile.h"
#include "app/rom.h" #include "app/rom.h"

1
src/cli/z3ed.cc
View File

@@ -9,7 +9,6 @@
#include <vector> #include <vector>
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/rom.h" #include "app/rom.h"
#include "cli/command_handler.h" #include "cli/command_handler.h"

1
src/test/CMakeLists.txt
View File

@@ -5,6 +5,7 @@ add_executable(
test/yaze_test.cc test/yaze_test.cc
# test/libc_test.cc # test/libc_test.cc
test/rom_test.cc test/rom_test.cc
test/core/message_test.cc
test/gfx/compression_test.cc test/gfx/compression_test.cc
test/gfx/snes_palette_test.cc test/gfx/snes_palette_test.cc
test/integration/test_editor.cc test/integration/test_editor.cc

137
src/test/core/message_test.cc Normal file
View File

@@ -0,0 +1,137 @@
#include "core/message.h"
#include <gtest/gtest.h>
namespace yaze {
namespace test {
namespace message_system {
using app::core::IMessageListener;
using app::core::IMessageProtocol;
using app::core::Message;
using app::core::MessageDispatcher;
using app::core::MessageFilter;
class TestListener : public IMessageListener {
public:
~TestListener() = default;
absl::Status OnMessageReceived(const Message& message) override {
last_message_ = message;
message_count_++;
return absl::OkStatus();
}
const Message& last_message() const { return last_message_; }
int message_count() const { return message_count_; }
private:
Message last_message_;
int message_count_ = 0;
};
class TestProtocol : public IMessageProtocol {
public:
bool CanHandleMessage(const Message& message) const override {
return message.type == "TestMessage";
}
};
class TestFilter : public MessageFilter {
public:
bool ShouldReceiveMessage(const Message& message) const override {
return std::any_cast<int>(message.payload) > 10;
}
};
class MessageDispatcherTest : public ::testing::Test {
protected:
void SetUp() override {
message_count_ = 0;
protocol_ = std::make_unique<TestProtocol>();
filter_ = std::make_unique<TestFilter>();
}
void TearDown() override {
protocol_.reset();
filter_.reset();
}
int message_count_ = 0;
int message_count1_ = 0;
int message_count2_ = 0;
TestListener listener1_;
TestListener listener2_;
std::unique_ptr<TestProtocol> protocol_;
std::unique_ptr<TestFilter> filter_;
};
TEST_F(MessageDispatcherTest, RegisterAndSendMessage) {
MessageDispatcher dispatcher;
dispatcher.RegisterListener("TestMessage", &listener1_);
Message message("TestMessage", nullptr, 42);
dispatcher.SendMessage(message);
EXPECT_EQ(listener1_.message_count(), 1);
EXPECT_EQ(std::any_cast<int>(listener1_.last_message().payload), 42);
}
TEST_F(MessageDispatcherTest, UnregisterListener) {
MessageDispatcher dispatcher;
dispatcher.RegisterListener("TestMessage", &listener1_);
dispatcher.UnregisterListener("TestMessage", &listener1_);
Message message("TestMessage", nullptr, 42);
dispatcher.SendMessage(message);
EXPECT_EQ(listener1_.message_count(), 0);
}
TEST_F(MessageDispatcherTest, MultipleListeners) {
MessageDispatcher dispatcher;
dispatcher.RegisterListener("TestMessage", &listener1_);
dispatcher.RegisterListener("TestMessage", &listener2_);
Message message("TestMessage", nullptr, 42);
dispatcher.SendMessage(message);
EXPECT_EQ(listener1_.message_count(), 1);
EXPECT_EQ(listener2_.message_count(), 1);
EXPECT_EQ(std::any_cast<int>(listener1_.last_message().payload), 42);
EXPECT_EQ(std::any_cast<int>(listener2_.last_message().payload), 42);
}
TEST_F(MessageDispatcherTest, ProtocolBasedHandling) {
MessageDispatcher dispatcher;
dispatcher.RegisterProtocol(protocol_.get());
dispatcher.RegisterListener("TestMessage", &listener1_);
Message message("TestMessage", nullptr, 42);
dispatcher.DispatchMessage(message);
EXPECT_EQ(listener1_.message_count(), 1);
EXPECT_EQ(std::any_cast<int>(listener1_.last_message().payload), 42);
}
TEST_F(MessageDispatcherTest, FilteredMessageHandling) {
MessageDispatcher dispatcher;
dispatcher.RegisterFilteredListener("TestMessage", &listener1_,
std::move(filter_));
Message valid_message("TestMessage", nullptr, 15);
dispatcher.DispatchMessage(valid_message);
EXPECT_EQ(listener1_.message_count(), 1);
Message invalid_message("TestMessage", nullptr, 5);
dispatcher.DispatchMessage(invalid_message);
EXPECT_EQ(listener1_.message_count(), 1);
}
} // namespace message_system
} // namespace test
} // namespace yaze

15
src/test/gfx/compression_test.cc
View File

@@ -33,7 +33,7 @@ using ::testing::TypedEq;
namespace { namespace {
Bytes ExpectCompressOk(Rom& rom, uchar* in, int in_size) { std::vector<uint8_t> ExpectCompressOk(Rom& rom, uchar* in, int in_size) {
auto load_status = rom.LoadFromPointer(in, in_size, false); auto load_status = rom.LoadFromPointer(in, in_size, false);
EXPECT_TRUE(load_status.ok()); EXPECT_TRUE(load_status.ok());
auto compression_status = CompressV3(rom.vector(), 0, in_size); auto compression_status = CompressV3(rom.vector(), 0, in_size);
@@ -42,7 +42,8 @@ Bytes ExpectCompressOk(Rom& rom, uchar* in, int in_size) {
return compressed_bytes; return compressed_bytes;
} }
Bytes ExpectDecompressBytesOk(Rom& rom, Bytes& in) { std::vector<uint8_t> ExpectDecompressBytesOk(Rom& rom,
std::vector<uint8_t>& in) {
auto load_status = rom.LoadFromBytes(in); auto load_status = rom.LoadFromBytes(in);
EXPECT_TRUE(load_status.ok()); EXPECT_TRUE(load_status.ok());
auto decompression_status = DecompressV2(rom.data(), 0, in.size()); auto decompression_status = DecompressV2(rom.data(), 0, in.size());
@@ -51,7 +52,7 @@ Bytes ExpectDecompressBytesOk(Rom& rom, Bytes& in) {
return decompressed_bytes; return decompressed_bytes;
} }
Bytes ExpectDecompressOk(Rom& rom, uchar* in, int in_size) { std::vector<uint8_t> ExpectDecompressOk(Rom& rom, uchar* in, int in_size) {
auto load_status = rom.LoadFromPointer(in, in_size, false); auto load_status = rom.LoadFromPointer(in, in_size, false);
EXPECT_TRUE(load_status.ok()); EXPECT_TRUE(load_status.ok());
auto decompression_status = DecompressV2(rom.data(), 0, in_size); auto decompression_status = DecompressV2(rom.data(), 0, in_size);
@@ -73,16 +74,16 @@ std::shared_ptr<CompressionPiece> ExpectNewCompressionPieceOk(
void AssertCompressionQuality( void AssertCompressionQuality(
const std::vector<uint8_t>& uncompressed_data, const std::vector<uint8_t>& uncompressed_data,
const std::vector<uint8_t>& expected_compressed_data) { const std::vector<uint8_t>& expected_compressed_data) {
absl::StatusOr<Bytes> result = absl::StatusOr<std::vector<uint8_t>> result =
CompressV3(uncompressed_data, 0, uncompressed_data.size(), 0, false); CompressV3(uncompressed_data, 0, uncompressed_data.size(), 0, false);
ASSERT_TRUE(result.ok()); ASSERT_TRUE(result.ok());
auto compressed_data = std::move(*result); auto compressed_data = std::move(*result);
EXPECT_THAT(compressed_data, ElementsAreArray(expected_compressed_data)); EXPECT_THAT(compressed_data, ElementsAreArray(expected_compressed_data));
} }
Bytes ExpectCompressV3Ok(const std::vector<uint8_t>& uncompressed_data, std::vector<uint8_t> ExpectCompressV3Ok(const std::vector<uint8_t>& uncompressed_data,
const std::vector<uint8_t>& expected_compressed_data) { const std::vector<uint8_t>& expected_compressed_data) {
absl::StatusOr<Bytes> result = absl::StatusOr<std::vector<uint8_t>> result =
CompressV3(uncompressed_data, 0, uncompressed_data.size(), 0, false); CompressV3(uncompressed_data, 0, uncompressed_data.size(), 0, false);
EXPECT_TRUE(result.ok()); EXPECT_TRUE(result.ok());
auto compressed_data = std::move(*result); auto compressed_data = std::move(*result);
@@ -396,7 +397,7 @@ TEST(CheckIncByteV3Test, NotAnIncreasingSequence) {
TEST(LC_LZ2_CompressionTest, DecompressionValidCommand) { TEST(LC_LZ2_CompressionTest, DecompressionValidCommand) {
Rom rom; Rom rom;
Bytes simple_copy_input = {BUILD_HEADER(0x00, 0x02), 0x2A, 0x45, 0xFF}; std::vector<uint8_t> simple_copy_input = {BUILD_HEADER(0x00, 0x02), 0x2A, 0x45, 0xFF};
uchar simple_copy_output[2] = {0x2A, 0x45}; uchar simple_copy_output[2] = {0x2A, 0x45};
auto decomp_result = ExpectDecompressBytesOk(rom, simple_copy_input); auto decomp_result = ExpectDecompressBytesOk(rom, simple_copy_input);
EXPECT_THAT(simple_copy_output, ElementsAreArray(decomp_result.data(), 2)); EXPECT_THAT(simple_copy_output, ElementsAreArray(decomp_result.data(), 2));