zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- implemented rendering of wall sprites.

This commit is contained in:
Christoph Oelckers 2014-08-03 10:57:58 +02:00
parent 398d902e7e
commit b3e0d93385
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/gl/scene/gl_sprite.cpp
View File

@ -678,7 +678,7 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
bool mirror;
FTextureID patch = gl_GetSpriteFrame(spritenum, thing->frame, -1, ang - thing->angle, &mirror);
if (!patch.isValid()) return;
gltexture=FMaterial::ValidateTexture(patch, false);
gltexture = FMaterial::ValidateTexture(patch, false);
if (!gltexture) return;
vt = gltexture->GetSpriteVT();
@ -686,7 +686,7 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
gltexture->GetRect(&r, GLUSE_SPRITE);
if (mirror)
{
r.left=-r.width-r.left; // mirror the sprite's x-offset
r.left = -r.width - r.left; // mirror the sprite's x-offset
ul = gltexture->GetSpriteUL();
ur = gltexture->GetSpriteUR();
}
@ -696,13 +696,13 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
ur = gltexture->GetSpriteUL();
}
r.Scale(FIXED2FLOAT(spritescaleX),FIXED2FLOAT(spritescaleY));
r.Scale(FIXED2FLOAT(spritescaleX), FIXED2FLOAT(spritescaleY));
float rightfac=-r.left;
float leftfac=rightfac-r.width;
float rightfac = -r.left;
float leftfac = rightfac - r.width;
z1=z-r.top;
z2=z1-r.height;
z1 = z - r.top;
z2 = z1 - r.height;
float spriteheight = FIXED2FLOAT(spritescaleY) * gltexture->GetScaledHeightFloat(GLUSE_SPRITE);
@ -711,13 +711,31 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
{
PerformSpriteClipAdjustment(thing, thingx, thingy, spriteheight);
}
float viewvecX = GLRenderer->mViewVector.X;
float viewvecY = GLRenderer->mViewVector.Y;
x1=x-viewvecY*leftfac;
x2=x-viewvecY*rightfac;
y1=y+viewvecX*leftfac;
y2=y+viewvecX*rightfac;
float viewvecX;
float viewvecY;
switch (thing->renderflags & RF_SPRITETYPEMASK)
{
case RF_FACESPRITE:
viewvecX = GLRenderer->mViewVector.X;
viewvecY = GLRenderer->mViewVector.Y;
x1 = x - viewvecY*leftfac;
x2 = x - viewvecY*rightfac;
y1 = y + viewvecX*leftfac;
y2 = y + viewvecX*rightfac;
break;
case RF_WALLSPRITE:
viewvecX = FIXED2FLOAT(finecosine[thing->angle >> ANGLETOFINESHIFT]);
viewvecY = FIXED2FLOAT(finesine[thing->angle >> ANGLETOFINESHIFT]);
x1 = x + viewvecY*leftfac;
x2 = x + viewvecY*rightfac;
y1 = y - viewvecX*leftfac;
y2 = y - viewvecX*rightfac;
break;
}
}
else
{
@ -887,6 +905,7 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
particle=NULL;
const bool drawWithXYBillboard = ( !(actor->renderflags & RF_FORCEYBILLBOARD)
&& (actor->renderflags & RF_SPRITETYPEMASK) == RF_FACESPRITE
&& players[consoleplayer].camera
&& (gl_billboard_mode == 1 || actor->renderflags & RF_FORCEXYBILLBOARD ) );

1
src/p_setup.cpp
View File

@ -1858,7 +1858,6 @@ void P_SpawnThings (int position)
{
SetMapThingUserData(actor, *udi);
}
if (actor != NULL) actor->renderflags |= RF_WALLSPRITE;
}
for(int i=0; i<MAXPLAYERS; i++)
{