yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renders: scale pcx before use

This commit is contained in:
Denis Pauk 2024-06-30 17:05:33 +03:00
parent 23ff8f6dea
commit 161f703b90
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/client/refresh/files/stb.c
View File

@ -488,7 +488,7 @@ LoadHiColorImage(const char *name, const char* namewe, const char *ext,
static struct image_s *
LoadImage_Ext(const char *name, const char* namewe, const char *ext, imagetype_t type,
qboolean r_retexturing, loadimage_t load_image)
int r_retexturing, loadimage_t load_image)
{
struct image_s *image = NULL;
@ -502,9 +502,9 @@ LoadImage_Ext(const char *name, const char* namewe, const char *ext, imagetype_t
{
if (!strcmp(ext, "pcx"))
{
int width = 0, height = 0, realwidth = 0, realheight = 0;
byte *pic = NULL;
byte *palette = NULL;
int width = 0, height = 0;
LoadPCX (namewe, &pic, &palette, &width, &height);
if (!pic)
@ -512,6 +512,25 @@ LoadImage_Ext(const char *name, const char* namewe, const char *ext, imagetype_t
return NULL;
}
realheight = height;
realwidth = width;
if (r_retexturing >= 2)
{
byte *image_scale = NULL;
/* scale image paletted images */
image_scale = malloc(width * height * 4);
scale2x(pic, image_scale, width, height);
/* replace pic with scale */
free(pic);
pic = image_scale;
width *= 2;
height *= 2;
}
if (r_retexturing && palette)
{
byte *image_buffer = NULL;
@ -519,6 +538,7 @@ LoadImage_Ext(const char *name, const char* namewe, const char *ext, imagetype_t
size = width * height;
/* convert to full color */
image_buffer = malloc (size * 4);
for(i = 0; i < size; i++)
{
@ -530,8 +550,8 @@ LoadImage_Ext(const char *name, const char* namewe, const char *ext, imagetype_t
}
image = load_image(name, image_buffer,
width, width,
height, height,
width, realwidth,
height, realheight,
size, type, 32);
free (image_buffer);
}
@ -590,7 +610,7 @@ LoadImage_Ext(const char *name, const char* namewe, const char *ext, imagetype_t
struct image_s *
R_LoadImage(const char *name, const char* namewe, const char *ext, imagetype_t type,
qboolean r_retexturing, loadimage_t load_image)
int r_retexturing, loadimage_t load_image)
{
struct image_s *image = NULL;

2
src/client/refresh/ref_shared.h
View File

@ -339,7 +339,7 @@ extern struct image_s *GetSkyImage(const char *skyname, const char* surfname,
extern struct image_s *GetTexImage(const char *name, findimage_t find_image);
extern struct image_s *R_FindPic(const char *name, findimage_t find_image);
extern struct image_s *R_LoadImage(const char *name, const char* namewe, const char *ext,
imagetype_t type, qboolean r_retexturing, loadimage_t load_image);
imagetype_t type, int r_retexturing, loadimage_t load_image);
extern void Mod_LoadQBSPMarksurfaces(const char *name, msurface_t ***marksurfaces,
unsigned int *nummarksurfaces, msurface_t *surfaces, int numsurfaces,
const byte *mod_base, const lump_t *lMod_LoadQBSPMarksurfaces);