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

Refactor snes_palette.h for consistency and readability by adjusting reference styles and removing unnecessary includes

Browse Source
This commit is contained in:
scawful
2024-11-08 00:12:30 -05:00
parent 83949d23b5
commit fd881dc1d3
2 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,8 @@ absl::Status LoadOverworldMainPalettes(const std::vector<uint8_t>& rom_data,
} }
absl::Status LoadOverworldAuxiliaryPalettes( absl::Status LoadOverworldAuxiliaryPalettes(
const std::vector<uint8_t>& rom_data, gfx::PaletteGroupMap& palette_groups) { const std::vector<uint8_t> &rom_data,
gfx::PaletteGroupMap &palette_groups) {
auto data = rom_data.data(); auto data = rom_data.data();
for (int i = 0; i < 20; i++) { for (int i = 0; i < 20; i++) {
palette_groups.overworld_aux.AddPalette( palette_groups.overworld_aux.AddPalette(
@@ -48,7 +49,8 @@ absl::Status LoadOverworldAuxiliaryPalettes(
} }
absl::Status LoadOverworldAnimatedPalettes( absl::Status LoadOverworldAnimatedPalettes(
const std::vector<uint8_t>& rom_data, gfx::PaletteGroupMap& palette_groups) { const std::vector<uint8_t> &rom_data,
gfx::PaletteGroupMap &palette_groups) {
auto data = rom_data.data(); auto data = rom_data.data();
for (int i = 0; i < 14; i++) { for (int i = 0; i < 14; i++) {
palette_groups.overworld_animated.AddPalette(gfx::ReadPaletteFromRom( palette_groups.overworld_animated.AddPalette(gfx::ReadPaletteFromRom(
@@ -72,8 +74,8 @@ absl::Status LoadGlobalSpritePalettes(const std::vector<uint8_t>& rom_data,
auto data = rom_data.data(); auto data = rom_data.data();
palette_groups.global_sprites.AddPalette( palette_groups.global_sprites.AddPalette(
gfx::ReadPaletteFromRom(kGlobalSpritesLW, /*num_colors=*/60, data)); gfx::ReadPaletteFromRom(kGlobalSpritesLW, /*num_colors=*/60, data));
palette_groups.global_sprites.AddPalette( palette_groups.global_sprites.AddPalette(gfx::ReadPaletteFromRom(
gfx::ReadPaletteFromRom(kGlobalSpritePalettesDW, /*num_colors=*/60, data)); kGlobalSpritePalettesDW, /*num_colors=*/60, data));
return absl::OkStatus(); return absl::OkStatus();
} }
@@ -169,7 +171,8 @@ absl::Status Load3DObjectPalettes(const std::vector<uint8_t>& rom_data,
} }
absl::Status LoadOverworldMiniMapPalettes( absl::Status LoadOverworldMiniMapPalettes(
const std::vector<uint8_t>& rom_data, gfx::PaletteGroupMap& palette_groups) { const std::vector<uint8_t> &rom_data,
gfx::PaletteGroupMap &palette_groups) {
auto data = rom_data.data(); auto data = rom_data.data();
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
palette_groups.overworld_mini_map.AddPalette(gfx::ReadPaletteFromRom( palette_groups.overworld_mini_map.AddPalette(gfx::ReadPaletteFromRom(
@@ -327,7 +330,8 @@ absl::StatusOr<PaletteGroup> CreatePaletteGroupFromLargePalette(
using namespace palette_group_internal; using namespace palette_group_internal;
// TODO: Refactor LoadAllPalettes to use group names, move to zelda3 namespace // TODO: Refactor LoadAllPalettes to use group names, move to zelda3 namespace
absl::Status LoadAllPalettes(const std::vector<uint8_t>& rom_data, PaletteGroupMap& groups) { absl::Status LoadAllPalettes(const std::vector<uint8_t> &rom_data,
PaletteGroupMap &groups) {
RETURN_IF_ERROR(LoadOverworldMainPalettes(rom_data, groups)) RETURN_IF_ERROR(LoadOverworldMainPalettes(rom_data, groups))
RETURN_IF_ERROR(LoadOverworldAuxiliaryPalettes(rom_data, groups)) RETURN_IF_ERROR(LoadOverworldAuxiliaryPalettes(rom_data, groups))
RETURN_IF_ERROR(LoadOverworldAnimatedPalettes(rom_data, groups)) RETURN_IF_ERROR(LoadOverworldAnimatedPalettes(rom_data, groups))

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

@@ -5,16 +5,14 @@
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
#include <memory>
#include <vector> #include <vector>
#include "absl/base/casts.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/gfx/snes_color.h" #include "app/gfx/snes_color.h"
#include "incl/snes_color.h"
#include "imgui/imgui.h" #include "imgui/imgui.h"
#include "incl/snes_color.h"
namespace yaze { namespace yaze {
namespace app { namespace app {