nzp-team/dquakeplus
0
0
Fork 0
mirror of https://github.com/nzp-team/dquakeplus.git synced 2025-02-22 03:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

PSP: Use common Vril WAD3 loading (#43)

Browse source
This commit is contained in:
cypress 2025-02-11 20:31:45 -08:00 committed by GitHub
parent 0ca7cbd746
commit 0d922e18e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 74 additions and 575 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.psp
View file

@ -79,7 +79,6 @@ COMMON_OBJS = \
source/crypter.o
HARDWARE_VIDEO_ONLY_OBJS = \
source/psp/wad3.o \
source/psp/clipping.o \
source/psp/vram.o \
source/psp/gu/gu_psp.o \

13
source/psp/gu/gu_decals_QMB.cpp
View file

@ -360,19 +360,6 @@ void R_SpawnDecalBSP (vec3_t org, char *texname, int size)
return;
int tex = loadtextureimage(va("decals/%s",texname), 0, 0, qfalse, GU_LINEAR);
if(!tex) //find in decals.wad
{
if(wadreload)
{
WAD3_LoadTextureWadFile ("decals.wad");
wadreload = 0;
}
tex = WAD3_LoadTextureName(texname);
if(!tex)
{
return;
}
}
VectorClear (bestorg);
VectorClear (bestnormal);

17
source/psp/gu/gu_draw.cpp
View file

@ -628,7 +628,7 @@ This is the same as Draw_Character, but with RGBA color codes.
================
*/
extern cvar_t scr_coloredtext;
void Draw_CharacterRGBA(int x, int y, int num, float r, float g, float b, float a)
void Draw_CharacterRGBA(int x, int y, int num, float r, float g, float b, float a, float scale)
{
int row, col;
@ -1500,11 +1500,11 @@ void Draw_Crosshair (void)
}
// Area of Effect (o)
else if (crosshair.value == 2) {
Draw_CharacterRGBA((vid.width)/2-4, (vid.height)/2, 'O', 255, col, col, crosshair_opacity);
Draw_CharacterRGBA((vid.width)/2-4, (vid.height)/2, 'O', 255, col, col, crosshair_opacity, 1);
}
// Dot crosshair (.)
else if (crosshair.value == 3) {
Draw_CharacterRGBA((vid.width - 8)/2, (vid.height - 8)/2, '.', 255, col, col, crosshair_opacity);
Draw_CharacterRGBA((vid.width - 8)/2, (vid.height - 8)/2, '.', 255, col, col, crosshair_opacity, 1);
}
// Grenade crosshair
else if (crosshair.value == 4) {
@ -1565,6 +1565,7 @@ static int HexToInt(char c)
void Draw_ColoredString(int x, int y, char *text, float r, float g, float b, float a, float scale)
{
int num;
int scale_int = rint(scale);
qboolean white = qtrue;
if (y <= -8)
@ -1611,8 +1612,8 @@ void Draw_ColoredString(int x, int y, char *text, float r, float g, float b, flo
vertices[1].u = (fcol + 1) * 8;
vertices[1].v = (frow + 1) * 8;
vertices[1].x = x + (8*(int)scale);
vertices[1].y = y + (8*(int)scale);
vertices[1].x = x + (8*scale_int);
vertices[1].y = y + (8*scale_int);
vertices[1].z = 0;
sceGuDrawArray(GU_SPRITES, GU_TEXTURE_16BIT | GU_VERTEX_16BIT | GU_TRANSFORM_2D, 2, 0, vertices);
@ -1620,11 +1621,11 @@ void Draw_ColoredString(int x, int y, char *text, float r, float g, float b, flo
// Hooray for variable-spacing!
if (*text == ' ')
x += 4 * (int)scale;
x += 4 * scale_int;
else if ((int)*text < 33 || (int)*text > 126)
x += 8 * (int)scale;
x += 8 * scale_int;
else
x += (font_kerningamount[(int)(*text - 33)] + 1) * (int)scale;
x += (font_kerningamount[(int)(*text - 33)] + 1) * scale_int;
}
if (!white)

70
source/psp/gu/gu_model.cpp
View file

@ -218,8 +218,6 @@ void Mod_ClearAll (void)
}
UnloadWads(); //Crow_bar
ent_file = NULL; //~~~~
GL_UnloadAllTextures();
@ -536,58 +534,70 @@ void Mod_LoadTextures (lump_t *l)
else
{
if (loadmodel->bspversion == HL_BSPVERSION)
{
{
char filename[64]; // Filename to check r4w file
byte *f;
byte *data;
sprintf(filename, "textures/maps/%s/%s.r4w", sv.name, mt->name); // search in textures/maps/MAPNAME/TEXNAME
f = static_cast<byte*>(COM_LoadHunkFile(filename));
data = static_cast<byte*>(COM_LoadHunkFile(filename));
if (!f) {
if (data == NULL) {
sprintf(filename, "textures/%s.r4w", mt->name); // search in textures/TEXNAME
f = static_cast<byte*>(COM_LoadHunkFile(filename));
data = static_cast<byte*>(COM_LoadHunkFile(filename));
}
if (!f) {
if (data == NULL) {
Con_Printf("Loading texture %s as WAD3, %dx%d\n", mt->name, mt->width, mt->height); // didn't find the texture in the folder
// naievil -- try to push wad3 loading
int index = WAD3_LoadTexture(mt);
if(index)
{
int index = WAD3_LoadTextureClut4(mt);
if (index != 0) {
com_netpath[0] = 0;
tx->gl_texturenum = index;
tx->fullbright = -1;
tx->dt_texturenum = 0;
// if(tx_pixels = WAD3_LoadTexture(mt))
// {
// com_netpath[0] = 0;
// tx->gl_texturenum = GL_LoadPalletedTexture (tx_pixels, tx->name, tx->width, tx->height, 0);
// tx->fullbright = -1;
// mapTextureNameList.push_back(tx->gl_texturenum);
// tx->dt_texturenum = 0;
}
else
{
Con_Printf("Texture %s not found\n", mt->name); // didn't find the texture in the folder
} else {
// Fall back to missing texture.
Con_Printf("Texture %s not found\n", mt->name);
com_netpath[0] = 0;
tx->gl_texturenum = nonetexture;
}
// // naievil -- try to push wad3 loading
// int index = WAD3_LoadTexture(mt);
// if(index)
// {
// com_netpath[0] = 0;
// tx->gl_texturenum = index;
// tx->fullbright = -1;
// tx->dt_texturenum = 0;
// // if(tx_pixels = WAD3_LoadTexture(mt))
// // {
// // com_netpath[0] = 0;
// // tx->gl_texturenum = GL_LoadPalletedTexture (tx_pixels, tx->name, tx->width, tx->height, 0);
// // tx->fullbright = -1;
// // mapTextureNameList.push_back(tx->gl_texturenum);
// // tx->dt_texturenum = 0;
// }
// else
// {
// Con_Printf("Texture %s not found\n", mt->name); // didn't find the texture in the folder
// com_netpath[0] = 0;
// tx->gl_texturenum = nonetexture;
// }
} else {
int w, h;
unsigned int magic = *((unsigned int*)(f));
unsigned int magic = *((unsigned int*)(data));
if (magic == 0x65663463) // what the fuck?
{
w = *((int*)(f + 4));
h = *((int*)(f + 8));
w = *((int*)(data + 4));
h = *((int*)(data + 8));
tx->gl_texturenum = GL_LoadTexture4(mt->name, w, h, (byte*)(f + 16), GU_LINEAR, qfalse);
tx->gl_texturenum = GL_LoadTexture4(mt->name, w, h, (byte*)(data + 16), GU_LINEAR, qfalse);
}
}

508
source/psp/wad3.cpp
View file

@ -1,508 +0,0 @@
/*
Copyright (C) 2009 Crow_bar.
Used code from "Fuhquake" modify by Crow_bar
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
extern "C"
{
#include "../quakedef.h"
}
#include <pspgu.h>
#include <malloc.h>
#include <list>
std::list<FILE*> UnloadFileList;
#define TEXWAD_MAXIMAGES 16384
typedef struct
{
char name[16];
FILE *file;
int position;
int size;
} texwadlump_t;
texwadlump_t texwadlump[TEXWAD_MAXIMAGES];
int numwadtextures;
//By Crow_bar
void UnloadWads (void)
{
FILE *files;
while (UnloadFileList.size() > 0)
{
files = UnloadFileList.front();
UnloadFileList.pop_front();
fclose(files);
}
numwadtextures = 0;
}
void WAD3_LoadTextureWadFile (char *filename)
{
lumpinfo_t *lumps, *lump_p;
wadinfo_t header;
int i, j, infotableofs, numlumps, lowmark;
FILE *file;
if (FS_FOpenFile (va("textures/wad3/%s", filename), &file) != -1)
goto loaded;
if (FS_FOpenFile (va("textures/halflife/%s", filename), &file) != -1)
goto loaded;
if (FS_FOpenFile (va("textures/%s", filename), &file) != -1)
goto loaded;
if (FS_FOpenFile (filename, &file) != -1)
goto loaded;
Host_Error ("Couldn't load halflife wad \"%s\"\n", filename);
loaded:
if (fread(&header, 1, sizeof(wadinfo_t), file) != sizeof(wadinfo_t))
{
Con_Printf ("WAD3_LoadTextureWadFile: unable to read wad header");
fclose(file);
return;
}
if (memcmp(header.identification, "WAD3", 4))
{
Con_Printf ("WAD3_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);
fclose(file);
return;
}
numlumps = LittleLong(header.numlumps);
if (numlumps < 1 || numlumps > TEXWAD_MAXIMAGES)
{
Con_Printf ("WAD3_LoadTextureWadFile: invalid number of lumps (%i)\n", numlumps);
fclose(file);
return;
}
infotableofs = LittleLong(header.infotableofs);
if (fseek(file, infotableofs, SEEK_SET))
{
Con_Printf ("WAD3_LoadTextureWadFile: unable to seek to lump table");
fclose(file);
return;
}
lowmark = Hunk_LowMark();
if (!(lumps = static_cast<lumpinfo_t*>(Hunk_Alloc(sizeof(lumpinfo_t) * numlumps))))
{
Con_Printf ("WAD3_LoadTextureWadFile: unable to allocate temporary memory for lump table");
fclose(file);
return;
}
if (fread(lumps, 1, sizeof(lumpinfo_t) * numlumps, file) != sizeof(lumpinfo_t) * numlumps)
{
Con_Printf ("WAD3_LoadTextureWadFile: unable to read lump table");
fclose(file);
Hunk_FreeToLowMark(lowmark);
return;
}
UnloadFileList.push_back(file); //Crow_bar. UnloadWads code
for (i = 0, lump_p = lumps; i < numlumps; i++,lump_p++)
{
W_CleanupName (lump_p->name, lump_p->name);
for (j = 0;j < numwadtextures;j++)
{
if (!strcmp(lump_p->name, texwadlump[j].name)) // name match, replace old one
break;
}
if (j >= TEXWAD_MAXIMAGES)
break; // abort loading
if (j == numwadtextures)
{
W_CleanupName (lump_p->name, texwadlump[j].name);
texwadlump[j].file = file;
texwadlump[j].position = LittleLong(lump_p->filepos);
texwadlump[j].size = LittleLong(lump_p->disksize);
numwadtextures++;
}
}
Hunk_FreeToLowMark(lowmark);
//leaves the file open
}
//converts paletted to rgba
int ConvertWad3ToRGBA(miptex_t *tex)
{
// Check that texture has data
if (!tex->offsets[0]) {
Sys_Error("ConvertWad3ToRGBA: tex->offsets[0] == 0");
}
// Get pointers to WAD3 data and palette
byte* wadData = ((byte*)tex) + tex->offsets[0];
byte* palette = ((byte*)tex) + tex->offsets[3] + (tex->width>>3)*(tex->height>>3) + 2;
//byte* palette = wadData + tex->offsets[MIPLEVELS]; // Palette starts 2 bytes after the last mipmap
// Allocate buffer for RGBA data
int imageSize = tex->width * tex->height;
byte* rgbaData = (byte*)Q_malloc(imageSize * 4);
// Convert WAD3 data to RGBA format
for (int i = 0; i < imageSize; i++) {
byte colorIndex = wadData[i];
rgbaData[i * 4] = palette[colorIndex * 3 + 0];
rgbaData[i * 4 + 1] = palette[colorIndex * 3 + 1];
rgbaData[i * 4 + 2] = palette[colorIndex * 3 + 2];
rgbaData[i * 4 + 3] = 255; // Set alpha to opaque
if (rgbaData[i * 4] == 0 && rgbaData[i * 4 + 1] == 0 && rgbaData[i * 4 + 2] == 255) {
rgbaData[i * 4] = rgbaData[i * 4 + 1] = rgbaData[i * 4 + 2] = 128;
rgbaData[i * 4 + 3] = 0;
}
}
int index = GL_LoadImages(tex->name, tex->width, tex->height, rgbaData, qtrue, GU_LINEAR, 0, 4);
free(rgbaData);
return index;
}
int ConvertWad3ToClut4(miptex_t *tex)
{
// Check that texture has data
if (!tex->offsets[0]) {
Sys_Error("ConvertWad3ToRGBA: tex->offsets[0] == 0");
}
// Get pointers to WAD3 data and palette
const byte* wadData = ((byte*)tex) + tex->offsets[0];
const byte* palette = ((byte*)tex) + tex->offsets[3] + (tex->width>>3)*(tex->height>>3) + 2;
return GL_LoadTexture8to4(tex->name, tex->width, tex->height, wadData, palette, GU_LINEAR);
}
int WAD3_LoadTexture(miptex_t *mt)
{
char texname[MAX_QPATH];
int i, j, lowmark = 0;
FILE *file;
miptex_t *tex;
int index;
if (mt->offsets[0])
return ConvertWad3ToClut4(mt); // ConvertWad3ToRGBA(mt);
texname[sizeof(texname) - 1] = 0;
W_CleanupName (mt->name, texname);
for (i = 0;i < numwadtextures;i++)
{
if (!texwadlump[i].name[0])
break;
if (strcmp(texname, texwadlump[i].name))
continue;
file = texwadlump[i].file;
if (fseek(file, texwadlump[i].position, SEEK_SET))
{
fclose(file);
Con_Printf("WAD3_LoadTexture: corrupt WAD3 file");
return 0;
}
lowmark = Hunk_LowMark();
tex = static_cast<miptex_t*>(Hunk_Alloc(texwadlump[i].size));
if (fread(tex, 1, texwadlump[i].size, file) < texwadlump[i].size)
{
Con_Printf("WAD3_LoadTexture: corrupt WAD3 file");
Hunk_FreeToLowMark(lowmark);
return 0;
}
tex->width = LittleLong(tex->width);
tex->height = LittleLong(tex->height);
if (tex->width != mt->width || tex->height != mt->height)
{
Hunk_FreeToLowMark(lowmark);
return 0;
}
for (j = 0;j < MIPLEVELS;j++)
tex->offsets[j] = LittleLong(tex->offsets[j]);
index = ConvertWad3ToClut4(mt); // ConvertWad3ToRGBA(tex);
Hunk_FreeToLowMark(lowmark);
return index;
}
return 0;
}
int WAD3_LoadTextureName(char *name)
{
char texname[MAX_QPATH];
int i, j, lowmark = 0;
FILE *file;
miptex_t *tex;
int index;
texname[sizeof(texname) - 1] = 0;
W_CleanupName (name, texname);
for (i = 0;i < numwadtextures;i++)
{
if (!texwadlump[i].name[0])
break;
if (strcmp(texname, texwadlump[i].name))
continue;
file = texwadlump[i].file;
if (fseek(file, texwadlump[i].position, SEEK_SET))
{
fclose(file);
Con_Printf("WAD3_LoadTexture: corrupt WAD3 file");
return 0;
}
lowmark = Hunk_LowMark();
tex = static_cast<miptex_t*>(Hunk_Alloc(texwadlump[i].size));
if (fread(tex, 1, texwadlump[i].size, file) < texwadlump[i].size)
{
Con_Printf("WAD3_LoadTexture: corrupt WAD3 file");
fclose(file);
Hunk_FreeToLowMark(lowmark);
return 0;
}
tex->width = LittleLong(tex->width);
tex->height = LittleLong(tex->height);
#if 0
if (tex->width != mt->width || tex->height != mt->height)
{
fclose(file);
Hunk_FreeToLowMark(lowmark);
return 0;
}
#endif
for (j = 0;j < MIPLEVELS;j++)
tex->offsets[j] = LittleLong(tex->offsets[j]);
index = ConvertWad3ToRGBA(tex);
UnloadFileList.push_back(file); //Crow_bar. UnloadWads code
/*
fclose(file);
*/
Hunk_FreeToLowMark(lowmark);
return index;
}
return 0;
}
//Other wad3 loaders
void W_LoadTextureWadFileHL (char *filename, int complain)
{
lumpinfo_t *lumps, *lump_p;
wadinfo_t header;
unsigned i, j;
int infotableofs;
FILE *file;
int numlumps;
FS_FOpenFile (filename, &file);
if (!file)
{
if (complain)
Con_Printf ("W_LoadTextureWadFile: couldn't find %s\n", filename);
return;
}
if (fread(&header, sizeof(wadinfo_t), 1, file) != 1)
{Con_Printf ("W_LoadTextureWadFile: unable to read wad header");return;}
if(header.identification[0] != 'W'
|| header.identification[1] != 'A'
|| header.identification[2] != 'D'
|| header.identification[3] != '3')
{
fclose(file);
Con_Printf ("W_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);
return;
}
numlumps = LittleLong(header.numlumps);
if (numlumps < 1 || numlumps > TEXWAD_MAXIMAGES)
{
fclose(file);
Con_Printf ("W_LoadTextureWadFile: invalid number of lumps (%i)\n", numlumps);
return;
}
infotableofs = LittleLong(header.infotableofs);
if (fseek(file, infotableofs, SEEK_SET))
{
fclose(file);
Con_Printf ("W_LoadTextureWadFile: unable to seek to lump table");
return;
}
if (!(lumps = static_cast<lumpinfo_t*>(Q_malloc(sizeof(lumpinfo_t)*numlumps))))
{
fclose(file);
Con_Printf ("W_LoadTextureWadFile: unable to allocate temporary memory for lump table");
return;
}
if (fread(lumps, sizeof(lumpinfo_t), numlumps, file) != (unsigned)numlumps)
{
fclose(file);
Con_Printf ("W_LoadTextureWadFile: unable to read lump table");
return;
}
for (i=0, lump_p = lumps ; i<(unsigned)numlumps ; i++,lump_p++)
{
W_CleanupName (lump_p->name, lump_p->name);
for (j = 0;j < TEXWAD_MAXIMAGES;j++)
{
if (texwadlump[j].name[0]) // occupied slot, check the name
{
if (!strcmp(lump_p->name, texwadlump[j].name)) // name match, replace old one
break;
}
else // empty slot
break;
}
if (j >= TEXWAD_MAXIMAGES)
break; // abort loading
W_CleanupName (lump_p->name, texwadlump[j].name);
texwadlump[j].file = file;
texwadlump[j].position = LittleLong(lump_p->filepos);
texwadlump[j].size = LittleLong(lump_p->disksize);
}
free(lumps);
//fclose(file);
// leaves the file open
}
byte *W_ConvertWAD3TextureHL(miptex_t *tex)
{
byte *in, *data, *out, *pal;
int d, p, image_size;
in = (byte *)((int) tex + tex->offsets[0]);
data = out = static_cast<byte*>(Q_malloc(tex->width * tex->height * 4));
if (!data)
return NULL;
image_size = tex->width * tex->height;
pal = in + (((image_size) * 85) >> 6);
pal += 2;
for (d = 0;d < image_size;d++)
{
p = *in++;
if (tex->name[0] == '{' && p == 255)
out[0] = out[1] = out[2] = out[3] = 0;
else
{
p *= 3;
out[0] = pal[p];
out[1] = pal[p+1];
out[2] = pal[p+2];
out[3] = 255;
}
out += 4;
}
return data;
}
byte *W_GetTextureHL(char *name)
{
char texname[17];
int i, j;
FILE *file;
miptex_t *tex = NULL;
byte *data;
texname[16] = 0;
W_CleanupName (name, texname);
for (i = 0;i < TEXWAD_MAXIMAGES;i++)
{
if (texwadlump[i].name[0])
{
if (!strcmp(texname, texwadlump[i].name)) // found it
{
file = texwadlump[i].file;
if (fseek(file, texwadlump[i].position, SEEK_SET))
{
Con_Printf("W_GetTexture: corrupt WAD3 file");
return NULL;
}
tex = static_cast<miptex_t*>(Q_malloc(texwadlump[i].size));
if (!tex)
return NULL;
if (fread(tex, 1, texwadlump[i].size, file) < (unsigned)texwadlump[i].size)
{
Con_Printf("W_GetTexture: corrupt WAD3 file");
return NULL;
}
tex->width = LittleLong(tex->width);
tex->height = LittleLong(tex->height);
for (j = 0;j < MIPLEVELS;j++)
tex->offsets[j] = LittleLong(tex->offsets[j]);
data = W_ConvertWAD3TextureHL(tex);
free(tex);
fclose(file);
return data;
}
}
else
break;
}
tex->width = tex->height = 0;
return NULL;
}

29
source/wad.c
View file

@ -162,9 +162,8 @@ void SwapPic (qpic_t *pic)
WAD3 Texture Loading for BSP 3.0 Support From Baker --Diabolickal HLBSP
=============================================================================
*/
#ifndef __PSP__
#define TEXWAD_MAXIMAGES 16384
#define TEXWAD_MAXIMAGES 128
typedef struct {
char name[MAX_QPATH];
@ -272,6 +271,25 @@ static byte *ConvertWad3ToRGBA(miptex_t *tex) {
return data;
}
#ifdef __PSP__
int WAD3_LoadTextureClut4(miptex_t *mt)
{
// Check that texture has data
if (!mt->offsets[0]) {
Sys_Error("WAD3_LoadTextureClut4: mt->offsets[0] == 0");
return 0;
}
// Get pointers to WAD3 data and palette
const byte* wadData = ((byte*)mt) + mt->offsets[0];
const byte* palette = ((byte*)mt) + mt->offsets[3] + (mt->width>>3)*(mt->height>>3) + 2;
return GL_LoadTexture8to4(mt->name, mt->width, mt->height, wadData, palette, 0);
}
#endif // __PSP__
byte *WAD3_LoadTexture(miptex_t *mt) {
char texname[MAX_QPATH];
int i, j, lowmark = 0;
@ -279,8 +297,8 @@ byte *WAD3_LoadTexture(miptex_t *mt) {
miptex_t *tex;
byte *data;
if (mt->offsets[0])
return ConvertWad3ToRGBA(mt);
if (mt->offsets[0])
return ConvertWad3ToRGBA(mt);
texname[sizeof(texname) - 1] = 0;
W_CleanupName (mt->name, texname);
@ -315,5 +333,4 @@ byte *WAD3_LoadTexture(miptex_t *mt) {
return data;
}
return NULL;
}
#endif //__PSP__, _3DS, __WII__
}

11
source/wad.h
View file

@ -75,12 +75,5 @@ void *W_GetLumpNum (int num);
void SwapPic (qpic_t *pic);
void WAD3_LoadTextureWadFile (char *filename);
#ifdef __PSP__
int WAD3_LoadTexture(miptex_t *mt);
int WAD3_LoadTextureName(char *name);
int ConvertWad3ToRGBA(miptex_t *tex);
void W_LoadTextureWadFileHL (char *filename, int complain);
byte *W_ConvertWAD3TextureHL(miptex_t *tex);
byte *W_GetTextureHL(char *name);
#endif // __PSP__
byte *WAD3_LoadTexture(miptex_t *mt);
int WAD3_LoadTextureClut4(miptex_t *mt);