yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-12 15:05:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

renders: move swl load to vid/image code

Browse source
This commit is contained in:
Denis Pauk 2024-07-03 23:27:07 +03:00
parent cf144ef2ca
commit ce37d4b748
2 changed files with 68 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/client/refresh/files/wal.c
View file

@ -212,52 +212,22 @@ LoadM8(const char *origname, const char *namewe, imagetype_t type,
void
LoadSWL(const char *origname, byte **pic, byte **palette, int *width, int *height)
{
int ofs, size, i;
char name[256];
sinmiptex_t *mt;
int bytesPerPixel;
char name[256];
FixFileExt(origname, "swl", name, sizeof(name));
size = ri.FS_LoadFile(name, (void **)&mt);
*pic = NULL;
if (!mt)
if (palette)
{
return;
*palette = NULL;
}
if (size < sizeof(*mt))
ri.VID_ImageDecode(name, pic, palette, width, height, &bytesPerPixel);
if (!(*pic))
{
R_Printf(PRINT_ALL, "%s: can't load %s, small header\n", __func__, name);
ri.FS_FreeFile((void *)mt);
return;
R_Printf(PRINT_DEVELOPER, "Bad swl file %s\n", name);
}
*width = LittleLong(mt->width);
*height = LittleLong(mt->height);
ofs = LittleLong(mt->offsets[0]);
if ((ofs <= 0) || (*width <= 0) || (*height <= 0) ||
(((size - ofs) / *height) < *width))
{
R_Printf(PRINT_ALL, "%s: can't load %s, small body\n", __func__, name);
ri.FS_FreeFile((void *)mt);
return;
}
*pic = malloc (size - ofs);
memcpy(*pic, (byte *)mt + ofs, size - ofs);
*palette = malloc(768);
for (i = 0; i < 256; i ++)
{
(*palette)[i * 3 + 0] = mt->palette[i * 4 + 0];
(*palette)[i * 3 + 1] = mt->palette[i * 4 + 1];
(*palette)[i * 3 + 2] = mt->palette[i * 4 + 2];
}
ri.FS_FreeFile((void *)mt);
}
struct image_s *

63
src/client/vid/image.c
View file

@ -136,7 +136,7 @@ fixQuitScreen(byte* px)
static void
PCX_Decode(const byte *raw, int len, byte **pic, byte **palette,
int *width, int *height, int *bytesPerPixel)
int *width, int *height)
{
pcx_t *pcx;
int x, y, full_size;
@ -144,7 +144,6 @@ PCX_Decode(const byte *raw, int len, byte **pic, byte **palette,
byte *out, *pix;
*pic = NULL;
*bytesPerPixel = 1;
if (len < sizeof(pcx_t))
{
@ -224,13 +223,64 @@ PCX_Decode(const byte *raw, int len, byte **pic, byte **palette,
}
}
static void
SWL_Decode(const byte *raw, int len, byte **pic, byte **palette,
int *width, int *height)
{
sinmiptex_t *mt;
int ofs, i;
mt = (sinmiptex_t *)raw;
*pic = NULL;
if (!mt)
{
return;
}
if (len < sizeof(*mt))
{
Com_DPrintf("%s: can't load, small header\n", __func__);
return;
}
*width = LittleLong(mt->width);
*height = LittleLong(mt->height);
ofs = LittleLong(mt->offsets[0]);
if ((ofs <= 0) || (*width <= 0) || (*height <= 0) ||
(((len - ofs) / *height) < *width))
{
Com_DPrintf("%s: can't load, small body\n", __func__);
return;
}
*pic = malloc (len - ofs);
memcpy(*pic, (byte *)mt + ofs, len - ofs);
if (palette)
{
*palette = malloc(768);
for (i = 0; i < 256; i ++)
{
(*palette)[i * 3 + 0] = mt->palette[i * 4 + 0];
(*palette)[i * 3 + 1] = mt->palette[i * 4 + 1];
(*palette)[i * 3 + 2] = mt->palette[i * 4 + 2];
}
}
}
void
VID_ImageDecode(const char *filename, byte **pic, byte **palette,
int *width, int *height, int *bytesPerPixel)
{
const char* ext;
int len, ident;
byte *raw;
ext = COM_FileExtension(filename);
/* load the file */
len = FS_LoadFile(filename, (void **)&raw);
@ -250,7 +300,7 @@ VID_ImageDecode(const char *filename, byte **pic, byte **palette,
ident = LittleLong(*((int*)raw));
if (ident == PCX_IDENT)
{
PCX_Decode(raw, len, pic, palette, width, height, bytesPerPixel);
PCX_Decode(raw, len, pic, palette, width, height);
if(*pic && width && height
&& *width == 319 && *height == 239
@ -261,6 +311,13 @@ VID_ImageDecode(const char *filename, byte **pic, byte **palette,
// so fix it
fixQuitScreen(*pic);
}
*bytesPerPixel = 1;
}
else if (!strcmp(ext, "swl"))
{
SWL_Decode(raw, len, pic, palette, width, height);
*bytesPerPixel = 1;
}
else
{