Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 01:48:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use SDL_Color for colors instead of colourTransform

Browse Source 
colourTransform is a struct with only one member, a Uint32. The issue
with `Uint32`s is that it requires a bunch of bit shifting logic to edit
the colors. The issue with bit shifting logic is that people have a
tendency to hardcode the shift amounts instead of using the shift amount
variables of the SDL_PixelFormat, which makes it annoying to change the
color masks of surfaces.

This commit fixes both issues by unhardcoding the bit shift amounts in
DrawPixel and ReadPixel, and by axing the `Uint32`s in favor of using
SDL_Color.

According to the SDL_PixelFormat documentation (
https://wiki.libsdl.org/SDL2/SDL_PixelFormat ), the logic to read and
draw to pixels from colors below 32-bit was just wrong. Specifically,
for 8-bit, there's a color palette used instead of some intrinsic color
information stored in the pixel itself. But we shouldn't need that logic
anyways because we don't use colors below 32-bit. So I axed that too.
This commit is contained in:
Misa
2023-01-01 16:36:43 -08:00
parent f24265f0fb
commit 351a022ebd
13 changed files with 309 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
desktop_version/src/Graphics.h
View File

@@ -7,7 +7,6 @@
#include "Game.h"
#include "GraphicsResources.h"
#include "GraphicsUtil.h"
#include "Maths.h"
#include "Textbox.h"
#include "TowerBG.h"
@@ -42,7 +41,7 @@ public:
void drawhuetile(int x, int y, int t);
void huetilesetcol(int t);
Uint32 bigchunkygetcol(int t);
SDL_Color bigchunkygetcol(int t);
void drawgravityline(int t);
@@ -141,7 +140,7 @@ public:
void drawgui(void);
void drawsprite(int x, int y, int t, int r, int g, int b);
void drawsprite(int x, int y, int t, Uint32 c);
void drawsprite(int x, int y, int t, SDL_Color color);
void printcrewname(int x, int y, int t);
void printcrewnamedark(int x, int y, int t);
@@ -202,18 +201,15 @@ public:
void bigbrprint(int x, int y, const std::string& t, int r, int g, int b, bool cen = false, float sc = 2);
void drawtele(int x, int y, int t, Uint32 c);
void drawtele(int x, int y, int t, SDL_Color c);
Uint32 getRGBA(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
SDL_Color getRGBA(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
Uint32 getRGB(Uint8 r, Uint8 g, Uint8 b);
SDL_Color getRGB(Uint8 r, Uint8 g, Uint8 b);
Uint32 getRGB(Uint32 _col);
SDL_Color RGBf(int r, int g, int b);
Uint32 RGBf(int r, int g, int b);
void setcolreal(Uint32 t);
void setcolreal(SDL_Color color);
void drawbackground(int t);
void updatebackground(int t);
@@ -263,7 +259,7 @@ public:
void setcol(int t);
void drawfinalmap(void);
colourTransform ct;
SDL_Color ct;
int rcol;
@@ -346,7 +342,9 @@ public:
int backboxvy[numbackboxes];
float backboxint[numbackboxes];
int warpskip, warpfcol, warpbcol;
int warpskip;
SDL_Color warpfcol;
SDL_Color warpbcol;
bool translucentroomname;
@@ -366,15 +364,15 @@ public:
#endif
float alpha;
Uint32 col_crewred;
Uint32 col_crewyellow;
Uint32 col_crewgreen;
Uint32 col_crewcyan;
Uint32 col_crewblue;
Uint32 col_crewpurple; //actually pink
Uint32 col_crewinactive;
Uint32 col_clock;
Uint32 col_trinket;
SDL_Color col_crewred;
SDL_Color col_crewyellow;
SDL_Color col_crewgreen;
SDL_Color col_crewcyan;
SDL_Color col_crewblue;
SDL_Color col_crewpurple; //actually pink
SDL_Color col_crewinactive;
SDL_Color col_clock;
SDL_Color col_trinket;
int col_tr;
int col_tg;
int col_tb;
@@ -382,7 +380,7 @@ public:
bool kludgeswnlinewidth;
Uint32 crewcolourreal(int t);
SDL_Color crewcolourreal(int t);
void render_roomname(const char* roomname, int r, int g, int b);