Skip to content

Replaced old wad/mip texture loading with imagelib in pxrad #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SNMetamorph merged 1 commit into from
Jan 8, 2026
Merged

Replaced old wad/mip texture loading with imagelib in pxrad #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions utils/common/imagelib/imagelib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ static const loadimage_t load_hint[] =
{ "%s%s.%s", "tga", Image_LoadTGA }, // TrueVision Targa
{ "%s%s.%s", "dds", Image_LoadDDS }, // DirectDraw Surface
{ "%s%s.%s", "png", Image_LoadPNG }, // Portable Network Graphics
{ "%s%s.%s", "mip", Image_LoadMIP }, // Quake 1's MipMap Textures
{ NULL, NULL, NULL }
};

Expand Down
59 changes: 50 additions & 9 deletions utils/pxrad/textures.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,36 @@ void TEX_LoadTextures( void )
}
}

rgbdata_t* TryLoadMiptex(const char* name)
{
char texname[64];
rgbdata_t *texture = NULL;

Q_snprintf(texname, sizeof(texname), "textures/%s", name);
texture = COM_LoadImage(texname, false, FS_LoadFile);

if (!texture)
{
Q_strncpy(texname, name, sizeof(texname));
// check wads in reverse order
for (int i = wadlist.count - 1; i >= 0; i--)
{
char *texpath = va("%s.wad/%s.mip", wadlist.wadnames[i], texname);

if (FS_FileExists(texpath, false))
{
texture = COM_LoadImage(texpath, true, FS_LoadFile);
break;
}
}
}

if (!texture)
return NULL;

return texture;
}

miptex_t *GetTextureByMiptex( int miptex )
{
ASSERT( g_dtexdata != NULL );
Expand All @@ -77,18 +107,29 @@ miptex_t *GetTextureByMiptex( int miptex )
// trying wad texture (force while g_wadtextures is 1)
if( g_wadtextures || mt->offsets[0] <= 0 )
{
Q_snprintf( texname, sizeof( texname ), "%s.mip", mt->name );

// check wads in reverse order
for( int i = wadlist.count - 1; i >= 0; i-- )
rgbdata_t* texture = TryLoadMiptex(mt->name);
if (texture)
{
char *texpath = va( "%s.wad/%s", wadlist.wadnames[i], texname );

if( FS_FileExists( texpath, false ))
texture = Image_Quantize(texture);
miptex_t *newMip = static_cast<miptex_t*>(Mem_Alloc(sizeof(miptex_t) + ((texture->width * texture->height * 85) >> 6) + sizeof(short) + 768));
Copy link
Contributor

@a1batross a1batross Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

quantizing and then reconstructing mip back sounds like a hack but maybe it's fine for what it tries to do: use generic image loader

and Image_Quantize is going to be no-op for already indexed data.

the other parts of rad might not use miptex in the future and just use rgbdata_t

memcpy(newMip, mt->name, 16); // Miptex name
newMip->width = texture->width;
newMip->height = texture->height;
newMip->offsets[0] = sizeof(miptex_t);

byte *buf = ((byte *)newMip) + newMip->offsets[0];
byte *pal = ((byte *)newMip) + newMip->offsets[0] + (((newMip->width * newMip->height) * 85) >> 6);

memcpy(buf, texture->buffer, newMip->width * newMip->height);
for (int i = 0; i < 256; i++)
{
g_textures[miptex] = (miptex_t *)FS_LoadFile( texpath, NULL, false );
break;
*pal++ = texture->palette[i * 4 + 0];
*pal++ = texture->palette[i * 4 + 1];
*pal++ = texture->palette[i * 4 + 2];
}

g_textures[miptex] = newMip;
Image_Free(texture);
}
}

Expand Down
Loading