nzp-team/glquake
0
0
Fork 0
mirror of https://github.com/nzp-team/glquake.git synced 2024-11-14 00:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Draw_Fill and Draw_FillByColot

Browse source
This commit is contained in:
Ian 2022-11-28 10:48:51 -05:00
parent cdca881579
commit 4e6c12cf07
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/draw.h
View file

@ -35,7 +35,8 @@ void Draw_ConsoleBackground (int lines);
void Draw_BeginDisc (void); void Draw_BeginDisc (void);
void Draw_EndDisc (void); void Draw_EndDisc (void);
void Draw_TileClear (int x, int y, int w, int h); void Draw_TileClear (int x, int y, int w, int h);
void Draw_Fill (int x, int y, int w, int h, int r, int g, int b, int a); void Draw_Fill (int x, int y, int w, int h, float r, float g, float b, float a);
void Draw_FillByColor (int x, int y, int w, int h, float r, float g, float b, float a);
void Draw_FadeScreen (void); void Draw_FadeScreen (void);
void Draw_String (int x, int y, char *str); void Draw_String (int x, int y, char *str);
void Draw_ColoredString(int x, int y, char *text, float r, float g, float b, float a, int scale); void Draw_ColoredString(int x, int y, char *text, float r, float g, float b, float a, int scale);

6
source/gl_draw.c
View file

@ -768,7 +768,7 @@ void Draw_LoadingFill(void)
float loadsize = loading_cur_step * (max_step / loading_num_step); float loadsize = loading_cur_step * (max_step / loading_num_step);
Draw_FillByColor (x - 2, y - 2, max_step + 4, size + 4, 69, 69, 69, 255); Draw_FillByColor (x - 2, y - 2, max_step + 4, size + 4, 69, 69, 69, 255);
Draw_FillByColor (x, y, (int)loadsize, size, 255, 255, 255, 255); Draw_FillByColor (x, y, (int)loadsize, size, 0, 0, 0, 200);
switch(loading_step) { switch(loading_step) {
case 1: text = "Loading Models.."; break; case 1: text = "Loading Models.."; break;
@ -801,7 +801,7 @@ Draw_FillByColor
Fills a box of pixels with a single color Fills a box of pixels with a single color
============= =============
*/ */
void Draw_FillByColor (int x, int y, int w, int h, int r, int g, int b, int a) void Draw_FillByColor (int x, int y, int w, int h, float r, float g, float b, float a)
{ {
Draw_Fill(x, y, w, h, r, g, b, a); Draw_Fill(x, y, w, h, r, g, b, a);
} }
@ -813,7 +813,7 @@ Draw_Fill
Fills a box of pixels with a single color Fills a box of pixels with a single color
============= =============
*/ */
void Draw_Fill (int x, int y, int w, int h, int r, int g, int b, int a) void Draw_Fill (int x, int y, int w, int h, float r, float g, float b, float a)
{ {
glDisable (GL_TEXTURE_2D); glDisable (GL_TEXTURE_2D);
glEnable (GL_ALPHA_TEST); glEnable (GL_ALPHA_TEST);