zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-05-30 00:41:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added missing OpenGL adjustments to ZDoom's P_CheckPlayerSprite changes.

Browse source 
git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1503 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2013-01-05 13:38:53 +00:00
parent fef3619592
commit fcc18d3cd2
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/gl/scene/gl_sprite.cpp
View file

@ -451,13 +451,21 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
return;
}
unsigned spritenum = thing->sprite;
fixed_t spritescaleX = thing->scaleX;
fixed_t spritescaleY = thing->scaleY;
if (thing->player != NULL)
{
P_CheckPlayerSprite(thing, spritenum, spritescaleX, spritescaleY);
}
if (thing->renderflags & RF_INVISIBLE || !thing->RenderStyle.IsVisible(thing->alpha))
{
if (!(thing->flags & MF_STEALTH) || !gl_fixedcolormap || !gl_enhanced_nightvision)
return;
}
// If this thing is in a map section that's not in view it can't possible be visible
// If this thing is in a map section that's not in view it can't possibly be visible
if (!(currentmapsection[thing->subsector->mapsection>>3] & (1 << (thing->subsector->mapsection & 7)))) return;
// [RH] Interpolate the sprite's position to make it look smooth
@ -465,13 +473,13 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
fixed_t thingy = thing->PrevY + FixedMul (r_TicFrac, thing->y - thing->PrevY);
fixed_t thingz = thing->PrevZ + FixedMul (r_TicFrac, thing->z - thing->PrevZ);
// too close to the camera. This doesn't look good if it is a sprite.
// Too close to the camera. This doesn't look good if it is a sprite.
if (P_AproxDistance(thingx-viewx, thingy-viewy)<2*FRACUNIT)
{
// exclude vertically moving objects from this check.
if (!(thing->velx==0 && thing->vely==0 && thing->velz!=0))
{
if (!gl_FindModelFrame(RUNTIME_TYPE(thing), thing->sprite, thing->frame, false))
if (!gl_FindModelFrame(RUNTIME_TYPE(thing), spritenum, thing->frame, false))
{
return;
}
@ -507,13 +515,13 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
z = FIXED2FLOAT(thingz-thing->floorclip);
y = FIXED2FLOAT(thingy);
modelframe = gl_FindModelFrame(RUNTIME_TYPE(thing), thing->sprite, thing->frame, !!(thing->flags & MF_DROPPED));
modelframe = gl_FindModelFrame(RUNTIME_TYPE(thing), spritenum, thing->frame, !!(thing->flags & MF_DROPPED));
if (!modelframe)
{
angle_t ang = R_PointToAngle(thingx, thingy);
bool mirror;
FTextureID patch = gl_GetSpriteFrame(thing->sprite, thing->frame, -1, ang - thing->angle, &mirror);
FTextureID patch = gl_GetSpriteFrame(spritenum, thing->frame, -1, ang - thing->angle, &mirror);
if (!patch.isValid()) return;
gltexture=FMaterial::ValidateTexture(patch, false);
if (!gltexture) return;
@ -553,7 +561,7 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
}
}
r.Scale(FIXED2FLOAT(thing->scaleX),FIXED2FLOAT(thing->scaleY));
r.Scale(FIXED2FLOAT(spritescaleX),FIXED2FLOAT(spritescaleY));
float rightfac=-r.left;
float leftfac=rightfac-r.width;
@ -561,7 +569,7 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
z1=z-r.top;
z2=z1-r.height;
float spriteheight = FIXED2FLOAT(thing->scaleY) * gltexture->GetScaledHeightFloat(GLUSE_SPRITE);
float spriteheight = FIXED2FLOAT(spritescaleY) * gltexture->GetScaledHeightFloat(GLUSE_SPRITE);
// Tests show that this doesn't look good for many decorations and corpses
if (spriteheight>0 && gl_spriteclip>0)