mirror of
https://github.com/libretro/libretro-tyrquake.git
synced 2024-12-04 06:12:57 +00:00
model: use the shared sprite model code in GL
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan
parent
fcb46ae327
commit
c3bf4003f2
4
Makefile
4
Makefile
@ -473,6 +473,7 @@ CL_OBJS := \
|
||||
snd_dma.o \
|
||||
snd_mem.o \
|
||||
snd_mix.o \
|
||||
sprite_model.o \
|
||||
view.o \
|
||||
wad.o
|
||||
|
||||
@ -534,8 +535,7 @@ SW_OBJS := \
|
||||
r_sprite.o \
|
||||
r_surf.o \
|
||||
r_vars.o \
|
||||
screen.o \
|
||||
sprite_model.o
|
||||
screen.o
|
||||
|
||||
GL_OBJS := \
|
||||
drawhulls.o \
|
||||
|
||||
@ -37,7 +37,6 @@ extern unsigned d_8to24table[];
|
||||
static model_t *loadmodel;
|
||||
static char loadname[MAX_QPATH]; /* for hunk tags */
|
||||
|
||||
static void Mod_LoadSpriteModel(model_t *mod, void *buffer, const char *loadname);
|
||||
static void Mod_LoadBrushModel(model_t *mod, void *buffer, unsigned long size);
|
||||
static void Mod_LoadAliasModel(model_t *mod, void *buffer);
|
||||
static model_t *Mod_LoadModel(model_t *mod, qboolean crash);
|
||||
@ -1714,170 +1713,6 @@ Mod_LoadAliasModel(model_t *mod, void *buffer)
|
||||
|
||||
//=============================================================================
|
||||
|
||||
/*
|
||||
=================
|
||||
Mod_LoadSpriteFrame
|
||||
=================
|
||||
*/
|
||||
static void *
|
||||
Mod_LoadSpriteFrame(void *pin, mspriteframe_t **ppframe, const char *loadname,
|
||||
int framenum)
|
||||
{
|
||||
dspriteframe_t *pinframe;
|
||||
mspriteframe_t *pspriteframe;
|
||||
int width, height, numpixels, size, origin[2];
|
||||
|
||||
pinframe = (dspriteframe_t *)pin;
|
||||
|
||||
width = LittleLong(pinframe->width);
|
||||
height = LittleLong(pinframe->height);
|
||||
numpixels = width * height;
|
||||
size = sizeof(mspriteframe_t) + R_SpriteDataSize(numpixels);
|
||||
|
||||
pspriteframe = Hunk_AllocName(size, loadname);
|
||||
memset(pspriteframe, 0, size);
|
||||
*ppframe = pspriteframe;
|
||||
|
||||
pspriteframe->width = width;
|
||||
pspriteframe->height = height;
|
||||
origin[0] = LittleLong(pinframe->origin[0]);
|
||||
origin[1] = LittleLong(pinframe->origin[1]);
|
||||
|
||||
pspriteframe->up = origin[1];
|
||||
pspriteframe->down = origin[1] - height;
|
||||
pspriteframe->left = origin[0];
|
||||
pspriteframe->right = width + origin[0];
|
||||
|
||||
/* Let the renderer process the pixel data as needed */
|
||||
R_SpriteDataStore(pspriteframe, loadname, framenum, (byte *)(pinframe + 1));
|
||||
|
||||
return (byte *)pinframe + sizeof(dspriteframe_t) + numpixels;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
=================
|
||||
Mod_LoadSpriteGroup
|
||||
=================
|
||||
*/
|
||||
static void *
|
||||
Mod_LoadSpriteGroup(void *pin, mspriteframe_t **ppframe, const char *loadname,
|
||||
int framenum)
|
||||
{
|
||||
dspritegroup_t *pingroup;
|
||||
mspritegroup_t *pspritegroup;
|
||||
int i, numframes;
|
||||
dspriteinterval_t *pin_intervals;
|
||||
float *poutintervals;
|
||||
void *ptemp;
|
||||
|
||||
pingroup = (dspritegroup_t *)pin;
|
||||
numframes = LittleLong(pingroup->numframes);
|
||||
|
||||
pspritegroup = Hunk_AllocName(sizeof(mspritegroup_t) +
|
||||
(numframes -
|
||||
1) * sizeof(pspritegroup->frames[0]),
|
||||
loadname);
|
||||
|
||||
pspritegroup->numframes = numframes;
|
||||
*ppframe = (mspriteframe_t *)pspritegroup;
|
||||
pin_intervals = (dspriteinterval_t *)(pingroup + 1);
|
||||
poutintervals = Hunk_AllocName(numframes * sizeof(float), loadname);
|
||||
pspritegroup->intervals = poutintervals;
|
||||
|
||||
for (i = 0; i < numframes; i++) {
|
||||
*poutintervals = LittleFloat(pin_intervals->interval);
|
||||
if (*poutintervals <= 0.0)
|
||||
Sys_Error("%s: interval <= 0", __func__);
|
||||
|
||||
poutintervals++;
|
||||
pin_intervals++;
|
||||
}
|
||||
|
||||
ptemp = (void *)pin_intervals;
|
||||
|
||||
for (i = 0; i < numframes; i++) {
|
||||
ptemp = Mod_LoadSpriteFrame(ptemp, &pspritegroup->frames[i], loadname,
|
||||
framenum * 100 + i);
|
||||
}
|
||||
|
||||
return ptemp;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
=================
|
||||
Mod_LoadSpriteModel
|
||||
=================
|
||||
*/
|
||||
static void
|
||||
Mod_LoadSpriteModel(model_t *mod, void *buffer, const char *loadname)
|
||||
{
|
||||
int i;
|
||||
int version;
|
||||
dsprite_t *pin;
|
||||
msprite_t *psprite;
|
||||
int numframes;
|
||||
int size;
|
||||
dspriteframetype_t *pframetype;
|
||||
|
||||
pin = (dsprite_t *) buffer;
|
||||
|
||||
version = LittleLong(pin->version);
|
||||
if (version != SPRITE_VERSION)
|
||||
Sys_Error("%s: %s has wrong version number (%i should be %i)",
|
||||
__func__, mod->name, version, SPRITE_VERSION);
|
||||
|
||||
numframes = LittleLong(pin->numframes);
|
||||
size = sizeof(msprite_t) + (numframes - 1) * sizeof(psprite->frames);
|
||||
psprite = Hunk_AllocName(size, loadname);
|
||||
mod->cache.data = psprite;
|
||||
|
||||
psprite->type = LittleLong(pin->type);
|
||||
psprite->maxwidth = LittleLong(pin->width);
|
||||
psprite->maxheight = LittleLong(pin->height);
|
||||
psprite->beamlength = LittleFloat(pin->beamlength);
|
||||
mod->synctype = LittleLong(pin->synctype);
|
||||
psprite->numframes = numframes;
|
||||
|
||||
mod->mins[0] = mod->mins[1] = -psprite->maxwidth / 2;
|
||||
mod->maxs[0] = mod->maxs[1] = psprite->maxwidth / 2;
|
||||
mod->mins[2] = -psprite->maxheight / 2;
|
||||
mod->maxs[2] = psprite->maxheight / 2;
|
||||
|
||||
//
|
||||
// load the frames
|
||||
//
|
||||
if (numframes < 1)
|
||||
Sys_Error("%s: Invalid # of frames: %d", __func__, numframes);
|
||||
|
||||
mod->numframes = numframes;
|
||||
mod->flags = 0;
|
||||
|
||||
pframetype = (dspriteframetype_t *) (pin + 1);
|
||||
|
||||
for (i = 0; i < numframes; i++) {
|
||||
spriteframetype_t frametype;
|
||||
|
||||
frametype = LittleLong(pframetype->type);
|
||||
psprite->frames[i].type = frametype;
|
||||
|
||||
if (frametype == SPR_SINGLE) {
|
||||
pframetype = (dspriteframetype_t *)
|
||||
Mod_LoadSpriteFrame(pframetype + 1,
|
||||
&psprite->frames[i].frameptr, loadname, i);
|
||||
} else {
|
||||
pframetype = (dspriteframetype_t *)
|
||||
Mod_LoadSpriteGroup(pframetype + 1,
|
||||
&psprite->frames[i].frameptr, loadname, i);
|
||||
}
|
||||
}
|
||||
|
||||
mod->type = mod_sprite;
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
/*
|
||||
================
|
||||
Mod_Print
|
||||
|
||||
@ -21,11 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#include <string.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "d_iface.h"
|
||||
#include "model.h"
|
||||
#include "sys.h"
|
||||
#include "zone.h"
|
||||
|
||||
#ifdef GLQUAKE
|
||||
#include "gl_model.h"
|
||||
#else
|
||||
#include "d_iface.h"
|
||||
#include "model.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
=================
|
||||
Mod_LoadSpriteFrame
|
||||
|
||||
@ -428,4 +428,6 @@ byte *Mod_LeafPVS(mleaf_t *leaf, model_t *model);
|
||||
// FIXME - surely this doesn't belong here?
|
||||
texture_t *R_TextureAnimation(entity_t *e, texture_t *base);
|
||||
|
||||
void Mod_LoadSpriteModel(model_t *mod, void *buffer, const char *loadname);
|
||||
|
||||
#endif /* GL_MODEL_H */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user