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

fix palette update pointer semantics

Browse Source
This commit is contained in:
scawful
2024-07-14 19:34:33 -04:00
parent abbef06142
commit 01b8441573
4 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/gfx/bitmap.cc
View File

@@ -201,6 +201,7 @@ void Bitmap::Create(int width, int height, int depth, const Bytes &data) {
SDL_Surface_Deleter());
surface_->pixels = pixel_data_;
GrayscalePalette(surface_->format->palette);
active_ = true;
}
void Bitmap::CreateTexture(SDL_Renderer *renderer) {
@@ -312,17 +313,17 @@ absl::Status Bitmap::ApplyPalette(const SnesPalette &palette) {
for (int i = 0; i < palette.size(); ++i) {
ASSIGN_OR_RETURN(gfx::SnesColor pal_color, palette.GetColor(i));
if (pal_color.is_transparent()) {
sdlPalette->colors[i].r = 0;
sdlPalette->colors[i].g = 0;
sdlPalette->colors[i].b = 0;
sdlPalette->colors[i].a = 0;
} else {
sdlPalette->colors[i].r = pal_color.rgb().x;
sdlPalette->colors[i].g = pal_color.rgb().y;
sdlPalette->colors[i].b = pal_color.rgb().z;
sdlPalette->colors[i].a = pal_color.rgb().w;
}
// if (pal_color.is_transparent()) {
// sdlPalette->colors[i].r = 0;
// sdlPalette->colors[i].g = 0;
// sdlPalette->colors[i].b = 0;
// sdlPalette->colors[i].a = 0;
// } else {
sdlPalette->colors[i].r = pal_color.rgb().x;
sdlPalette->colors[i].g = pal_color.rgb().y;
sdlPalette->colors[i].b = pal_color.rgb().z;
sdlPalette->colors[i].a = pal_color.rgb().w;
// }
}
SDL_LockSurface(surface_.get());

6
src/app/gfx/snes_color.h
View File

@@ -31,10 +31,10 @@ std::vector<char> Convert(const std::vector<snes_color>& palette);
/**
* @brief SNES Color container
*
* Used for displaying the color to the screen and writing
*
* Used for displaying the color to the screen and writing
* the color to the Rom file in the correct format.
*
*
* SNES colors may be represented in one of three formats:
* - Color data from the rom in a snes_color struct
* - Color data for displaying to the UI via ImVec4