lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

A few more instances of "gr" to purge

Browse source
This commit is contained in:
James R 2020-07-12 16:09:43 -07:00
parent b9a24001d8
commit 839f086216
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/hardware/hw_main.c
View file

@ -3487,7 +3487,7 @@ static gl_vissprite_t *HWR_NewVisSprite(void)
typedef struct typedef struct
{ {
FOutVector verts[4]; FOutVector verts[4];
gr_vissprite_t *spr; gl_vissprite_t *spr;
} zbuffersprite_t; } zbuffersprite_t;
// this list is used to store data about linkdraw sprites // this list is used to store data about linkdraw sprites
@ -3495,7 +3495,7 @@ zbuffersprite_t linkdrawlist[MAXVISSPRITES];
UINT32 linkdrawcount = 0; UINT32 linkdrawcount = 0;
// add the necessary data to the list for delayed z-buffer drawing // add the necessary data to the list for delayed z-buffer drawing
static void HWR_LinkDrawHackAdd(FOutVector *verts, gr_vissprite_t *spr) static void HWR_LinkDrawHackAdd(FOutVector *verts, gl_vissprite_t *spr)
{ {
if (linkdrawcount < MAXVISSPRITES) if (linkdrawcount < MAXVISSPRITES)
{ {
@ -5007,11 +5007,11 @@ static void HWR_ProjectSprite(mobj_t *thing)
// calculate tz for tracer, same way it is calculated for this sprite // calculate tz for tracer, same way it is calculated for this sprite
// transform the origin point // transform the origin point
tr_x = FIXED_TO_FLOAT(thing->tracer->x) - gr_viewx; tr_x = FIXED_TO_FLOAT(thing->tracer->x) - gl_viewx;
tr_y = FIXED_TO_FLOAT(thing->tracer->y) - gr_viewy; tr_y = FIXED_TO_FLOAT(thing->tracer->y) - gl_viewy;
// rotation around vertical axis // rotation around vertical axis
tracertz = (tr_x * gr_viewcos) + (tr_y * gr_viewsin); tracertz = (tr_x * gl_viewcos) + (tr_y * gl_viewsin);
// Software does not render the linkdraw sprite if the tracer is behind the view plane, // Software does not render the linkdraw sprite if the tracer is behind the view plane,
// so do the same check here. // so do the same check here.

8
src/hardware/hw_md2.c
View file

@ -1309,13 +1309,13 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
// texture loading before model init, so it knows if sprite graphics are used, which // texture loading before model init, so it knows if sprite graphics are used, which
// means that texture coordinates have to be adjusted // means that texture coordinates have to be adjusted
gpatch = md2->grpatch; gpatch = md2->grpatch;
if (!gpatch || ((!gpatch->mipmap->grInfo.format || !gpatch->mipmap->downloaded) && !md2->notexturefile)) if (!gpatch || ((!gpatch->mipmap->format || !gpatch->mipmap->downloaded) && !md2->notexturefile))
md2_loadTexture(md2); md2_loadTexture(md2);
gpatch = md2->grpatch; // Load it again, because it isn't being loaded into gpatch after md2_loadtexture... gpatch = md2->grpatch; // Load it again, because it isn't being loaded into gpatch after md2_loadtexture...
if ((gpatch && gpatch->mipmap->grInfo.format) // don't load the blend texture if the base texture isn't available if ((gpatch && gpatch->mipmap->format) // don't load the blend texture if the base texture isn't available
&& (!md2->blendgrpatch && (!md2->blendgrpatch
|| ((!((GLPatch_t *)md2->blendgrpatch)->mipmap->grInfo.format || !((GLPatch_t *)md2->blendgrpatch)->mipmap->downloaded) || ((!((GLPatch_t *)md2->blendgrpatch)->mipmap->format || !((GLPatch_t *)md2->blendgrpatch)->mipmap->downloaded)
&& !md2->noblendfile))) && !md2->noblendfile)))
md2_loadBlendTexture(md2); md2_loadBlendTexture(md2);
@ -1332,7 +1332,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
md2_printModelInfo(md2->model); md2_printModelInfo(md2->model);
// if model uses sprite patch as texture, then // if model uses sprite patch as texture, then
// adjust texture coordinates to take power of two textures into account // adjust texture coordinates to take power of two textures into account
if (!gpatch || !gpatch->mipmap->grInfo.format) if (!gpatch || !gpatch->mipmap->format)
adjustTextureCoords(md2->model, spr->gpatch); adjustTextureCoords(md2->model, spr->gpatch);
HWD.pfnCreateModelVBOs(md2->model); HWD.pfnCreateModelVBOs(md2->model);
} }