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

Add status macros and refactor overworld

Browse Source
This commit is contained in:
scawful
2022-08-23 13:26:06 -05:00
parent 86b36b1ba0
commit 6dd4c390fe
4 changed files with 65 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/app/core/constants.h
View File

@@ -25,16 +25,43 @@
#define MENU_ITEM(w) if (ImGui::MenuItem(w))
#define MENU_ITEM2(w, v) if (ImGui::MenuItem(w, v))
#define CHECK_STATUS(w) \
if (!w.ok()) { \
return w; \
#define RETURN_IF_ERROR(expression) \
{ \
auto error = expression; \
if (!error.ok()) { \
return error; \
} \
}
#define ASSIGN_OR_RETURN(type_variable_name, expression) \
ASSIGN_OR_RETURN_IMPL(APPEND_NUMBER(error_or_value, __LINE__), \
type_variable_name, expression)
#define ASSIGN_OR_RETURN_IMPL(error_or_value, type_variable_name, expression) \
auto error_or_value = expression; \
if (!error_or_value.ok()) { \
return error_or_value.status(); \
} \
type_variable_name = std::move(*error_or_value);
#define APPEND_NUMBER(expression, number) \
APPEND_NUMBER_INNER(expression, number)
#define APPEND_NUMBER_INNER(expression, number) expression##number
using ushort = unsigned short;
using uint = unsigned int;
using uchar = unsigned char;
using Bytes = std::vector<uchar>;
using OWBlockset = std::vector<std::vector<ushort>>;
struct OWMapTiles {
OWBlockset light_world; // 64 maps
OWBlockset dark_world; // 64 maps
OWBlockset special_world; // 32 maps
};
using OWMapTiles = struct OWMapTiles;
namespace yaze {
namespace app {
namespace core {

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

@@ -80,9 +80,9 @@ void HandleMouseMovement(int &wheel) {
bool Controller::isActive() const { return active_; }
absl::Status Controller::onEntry() {
CHECK_STATUS(CreateWindow())
CHECK_STATUS(CreateRenderer())
CHECK_STATUS(CreateGuiContext())
RETURN_IF_ERROR(CreateWindow())
RETURN_IF_ERROR(CreateRenderer())
RETURN_IF_ERROR(CreateGuiContext())
InitializeKeymap();
master_editor_.SetupScreen(renderer_);
active_ = true;

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

@@ -46,13 +46,13 @@ absl::Status Overworld::Load(ROM &rom, uchar *ow_blockset) {
auto size = tiles16.size();
for (int i = 0; i < core::kNumOverworldMaps; ++i) {
if (i < 64) {
CHECK_STATUS(overworld_maps_[i].BuildMap(
RETURN_IF_ERROR(overworld_maps_[i].BuildMap(
size, game_state_, 0, map_parent_, map_tiles_.light_world))
} else if (i < 0x80 && i >= 0x40) {
CHECK_STATUS(overworld_maps_[i].BuildMap(
RETURN_IF_ERROR(overworld_maps_[i].BuildMap(
size, game_state_, 1, map_parent_, map_tiles_.dark_world))
} else {
CHECK_STATUS(overworld_maps_[i].BuildMap(
RETURN_IF_ERROR(overworld_maps_[i].BuildMap(
size, game_state_, 2, map_parent_, map_tiles_.special_world))
}
@@ -114,8 +114,8 @@ void Overworld::AssembleMap16Tiles() {
}
}
void Overworld::AssignWorldTiles(OWBlockset &world, int x, int y, int sx,
int sy, int tpos) {
void Overworld::AssignWorldTiles(int x, int y, int sx, int sy, int tpos,
OWBlockset &world) {
int position_x1 = (x * 2) + (sx * 32);
int position_y1 = (y * 2) + (sy * 32);
int position_x2 = (x * 2) + 1 + (sx * 32);
@@ -126,6 +126,26 @@ void Overworld::AssignWorldTiles(OWBlockset &world, int x, int y, int sx,
world[position_x2][position_y2] = tiles32[tpos].tile3_;
}
void Overworld::OrganizeMapTiles(Bytes &bytes, Bytes &bytes2, OWBlockset &world,
int i, int sx, int sy, int &ttpos) {
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
auto tidD = (ushort)((bytes2[ttpos] << 8) + bytes[ttpos]);
int tpos = tidD;
if (tpos < tiles32.size()) {
if (i < 64) {
AssignWorldTiles(x, y, sx, sy, tpos, map_tiles_.light_world);
} else if (i < 128 && i >= 64) {
AssignWorldTiles(x, y, sx, sy, tpos, map_tiles_.dark_world);
} else {
AssignWorldTiles(x, y, sx, sy, tpos, map_tiles_.special_world);
}
}
ttpos += 1;
}
}
}
absl::Status Overworld::DecompressAllMapTiles() {
int lowest = 0x0FFFFF;
int highest = 0x0F8000;
@@ -151,34 +171,9 @@ absl::Status Overworld::DecompressAllMapTiles() {
lowest = p2;
}
auto status_bytes = rom_.DecompressOverworld(p2, 1000);
if (!status_bytes.ok()) {
return status_bytes.status();
}
auto bytes = std::move(*status_bytes);
auto status_bytes2 = rom_.DecompressOverworld(p1, 1000);
if (!status_bytes2.ok()) {
return status_bytes2.status();
}
auto bytes2 = std::move(*status_bytes2);
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 16; x++) {
auto tidD = (ushort)((bytes2[ttpos] << 8) + bytes[ttpos]);
int tpos = tidD;
if (tpos < tiles32.size()) {
if (i < 64) {
AssignWorldTiles(map_tiles_.light_world, x, y, sx, sy, tpos);
} else if (i < 128 && i >= 64) {
AssignWorldTiles(map_tiles_.dark_world, x, y, sx, sy, tpos);
} else {
AssignWorldTiles(map_tiles_.special_world, x, y, sx, sy, tpos);
}
}
ttpos += 1;
}
}
ASSIGN_OR_RETURN(auto bytes, rom_.DecompressOverworld(p2, 1000))
ASSIGN_OR_RETURN(auto bytes2, rom_.DecompressOverworld(p1, 1000))
OrganizeMapTiles(bytes, bytes2, map_tiles_.light_world, i, sx, sy, ttpos);
sx++;
if (sx >= 8) {

6
src/app/zelda3/overworld.h
View File

@@ -39,8 +39,10 @@ class Overworld {
ushort GenerateTile32(int i, int k, int dimension);
void AssembleMap32Tiles();
void AssembleMap16Tiles();
void AssignWorldTiles(OWBlockset &world, int x, int y, int sx, int sy,
int tpos);
void AssignWorldTiles(int x, int y, int sx, int sy,
int tpos, OWBlockset &world);
void OrganizeMapTiles(Bytes &bytes, Bytes &bytes2, OWBlockset &world, int i,
int sx, int sy, int &ttpos);
absl::Status DecompressAllMapTiles();
void FetchLargeMaps();