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

Add retexturing

This commit is contained in:
Denis Pauk 2020-01-11 19:35:25 +02:00 committed by Yamagi
parent d895e84f46
commit 53ddce9400
3 changed files with 153 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/client/refresh/vk/header/vk_local.h
View File

@ -182,6 +182,7 @@ extern cvar_t *vk_aniso;
extern cvar_t *vk_sampleshading;
extern cvar_t *vk_vsync;
extern cvar_t *vk_device_idx;
extern cvar_t *vk_retexturing;
extern cvar_t *vid_fullscreen;
extern cvar_t *vid_gamma;

187
src/client/refresh/vk/vk_image.c
View File

@ -1388,6 +1388,123 @@ image_t *Vk_LoadWal (char *name)
return image;
}
static image_t *
Vk_LoadHiColorImage(char *name, const char* namewe, const char *ext, imagetype_t type, qvksampler_t *samplerType)
{
image_t *image = NULL;
byte *pic = NULL;
int realwidth = 0, realheight = 0;
int width = 0, height = 0;
if (strcmp(ext, "pcx") == 0)
{
/* Get size of the original texture */
GetPCXInfo(name, &realwidth, &realheight);
}
else if (strcmp(ext, "wal") == 0)
{
/* Get size of the original texture */
GetWalInfo(name, &realwidth, &realheight);
}
/* try to load a tga, png or jpg (in that order/priority) */
if ( LoadSTB(namewe, "tga", &pic, &width, &height)
|| LoadSTB(namewe, "png", &pic, &width, &height)
|| LoadSTB(namewe, "jpg", &pic, &width, &height) )
{
if (width >= realwidth && height >= realheight)
{
if (realheight == 0 || realwidth == 0)
{
realheight = height;
realwidth = width;
}
if (width != realwidth || height != realheight)
{
// temporary place for shrinked image
byte* pic32 = NULL;
// temporary image memory size
size_t size32;
// resize image
size32 = width * height * 4;
pic32 = malloc(size32);
if (ResizeSTB(pic, width, height,
pic32, realwidth, realheight))
{
image = Vk_LoadPic (name, pic32, realwidth, realheight, type, 32, samplerType);
}
free(pic32);
}
else
{
image = Vk_LoadPic (name, pic, width, height, type, 32, samplerType);
}
}
}
if (pic)
{
free(pic);
}
return image;
}
static image_t*
Vk_LoadImage(char *name, const char* namewe, const char *ext, imagetype_t type, qvksampler_t *samplerType)
{
image_t *image = NULL;
// with retexturing and not skin
if (vk_retexturing->value)
{
image = Vk_LoadHiColorImage(name, namewe, ext, type, samplerType);
}
if (!image)
{
byte *pic;
int width, height;
//
// load the pic from disk
//
pic = NULL;
if (!strcmp(ext, "pcx"))
{
byte *palette;
palette = NULL;
LoadPCX (name, &pic, &palette, &width, &height);
if (!pic)
return NULL;
image = Vk_LoadPic (name, pic, width, height, type, 8, samplerType);
if (palette)
free(palette);
}
else if (!strcmp(ext, "wal"))
{
image = Vk_LoadWal (name);
}
else if (!strcmp(ext, "tga"))
{
LoadTGA (name, &pic, &width, &height);
if (!pic)
return NULL;
image = Vk_LoadPic (name, pic, width, height, type, 32, samplerType);
}
if (pic)
free(pic);
}
return image;
}
/*
===============
Vk_FindImage
@ -1398,15 +1515,39 @@ Finds or loads the given image
image_t *Vk_FindImage (char *name, imagetype_t type, qvksampler_t *samplerType)
{
image_t *image;
int i, len;
byte *pic, *palette;
int width, height;
int i, len;
char *ptr;
char namewe[256];
const char* ext;
if (!name)
return NULL; // ri.Sys_Error (ERR_DROP, "Vk_FindImage: NULL name");
len = (int)strlen(name);
if (len<5)
return NULL; // ri.Sys_Error (ERR_DROP, "Vk_FindImage: bad name: %s", name);
{
return NULL;
}
ext = COM_FileExtension(name);
if(!ext[0])
{
/* file has no extension */
return NULL;
}
len = strlen(name);
/* Remove the extension */
memset(namewe, 0, 256);
memcpy(namewe, name, len - (strlen(ext) + 1));
if (len < 5)
{
return NULL;
}
/* fix backslashes */
while ((ptr = strchr(name, '\\')))
{
*ptr = '/';
}
// look for it
for (i=0, image=vktextures ; i<numvktextures ; i++,image++)
@ -1421,40 +1562,10 @@ image_t *Vk_FindImage (char *name, imagetype_t type, qvksampler_t *samplerType)
//
// load the pic from disk
//
pic = NULL;
palette = NULL;
if (!strcmp(name+len-4, ".pcx"))
{
LoadPCX (name, &pic, &palette, &width, &height);
if (!pic)
return NULL;
image = Vk_LoadPic (name, pic, width, height, type, 8, samplerType);
}
else if (!strcmp(name+len-4, ".wal"))
{
image = Vk_LoadWal (name);
}
else if (!strcmp(name+len-4, ".tga"))
{
LoadTGA (name, &pic, &width, &height);
if (!pic)
return NULL;
image = Vk_LoadPic (name, pic, width, height, type, 32, samplerType);
}
else
return NULL;
if (pic)
free(pic);
if (palette)
free(palette);
return image;
return Vk_LoadImage(name, namewe, ext, type, samplerType);
}
/*
===============
R_RegisterSkin

4
src/client/refresh/vk/vk_rmain.c
View File

@ -124,6 +124,7 @@ cvar_t *vk_mip_nearfilter;
cvar_t *vk_sampleshading;
cvar_t *vk_vsync;
cvar_t *vk_device_idx;
cvar_t *vk_retexturing;
cvar_t *vid_fullscreen;
cvar_t *vid_gamma;
@ -1069,6 +1070,8 @@ void R_Register( void )
vk_sampleshading = ri.Cvar_Get("vk_sampleshading", "1", CVAR_ARCHIVE);
vk_vsync = ri.Cvar_Get("vk_vsync", "0", CVAR_ARCHIVE);
vk_device_idx = ri.Cvar_Get("vk_device", "-1", CVAR_ARCHIVE);
vk_retexturing = ri.Cvar_Get("vk_retexturing", "0", CVAR_ARCHIVE);
// clamp vk_msaa to accepted range so that video menu doesn't crash on us
if (vk_msaa->value < 0)
ri.Cvar_Set("vk_msaa", "0");
@ -1110,7 +1113,6 @@ Vkimp_SetMode(int *pwidth, int *pheight, int mode, int fullscreen)
R_Printf(PRINT_ALL, " %d %d\n", *pwidth, *pheight);
if (!ri.GLimp_InitGraphics(fullscreen, pwidth, pheight))
{
return rserr_invalid_mode;