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

Merge branch 'master' into Glew_Version_For_Real

This commit is contained in:
Christoph Oelckers 2014-07-27 21:57:38 +02:00
parent c9c93a58a2 ece10bb57f
commit 192daf1d5a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gl/models/gl_models.cpp
View File

@ -793,7 +793,7 @@ void gl_RenderModel(GLSprite * spr)
{ {
if((x * cos(angle * M_PI / 180) + y * sin(angle * M_PI / 180)) / sqrt(x * x + y * y) < 0) pitch *= -1; if((x * cos(angle * M_PI / 180) + y * sin(angle * M_PI / 180)) / sqrt(x * x + y * y) < 0) pitch *= -1;
} }
else pitch = abs(pitch); else pitch = fabs(pitch);
} }
if( smf->flags & MDL_ROTATING ) if( smf->flags & MDL_ROTATING )

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

@ -583,9 +583,9 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
if (smarterclip) if (smarterclip)
{ {
// Reduce slightly clipping adjustment of corpses // Reduce slightly clipping adjustment of corpses
if (thing->flags & MF_CORPSE || spriteheight > abs(diffb)) if (thing->flags & MF_CORPSE || spriteheight > fabs(diffb))
{ {
float ratio = clamp<float>((abs(diffb) * (float)gl_sclipfactor/(spriteheight+1)), 0.5, 1.0); float ratio = clamp<float>((fabs(diffb) * (float)gl_sclipfactor/(spriteheight+1)), 0.5, 1.0);
diffb*=ratio; diffb*=ratio;
} }
if (!diffb) if (!diffb)
@ -599,9 +599,9 @@ void GLSprite::Process(AActor* thing,sector_t * sector)
difft=0; difft=0;
} }
} }
if (spriteheight > abs(difft)) if (spriteheight > fabs(difft))
{ {
float ratio = clamp<float>((abs(difft) * (float)gl_sclipfactor/(spriteheight+1)), 0.5, 1.0); float ratio = clamp<float>((fabs(difft) * (float)gl_sclipfactor/(spriteheight+1)), 0.5, 1.0);
difft*=ratio; difft*=ratio;
} }
z2-=difft; z2-=difft;