zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 00:21:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix floating point update for camera facing billboard mode.

Browse source
This commit is contained in:
Christopher Bruns 2016-04-30 17:27:18 -04:00
parent c4590a2615
commit 6d95c9d544
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -278,7 +278,6 @@ void GLSprite::Draw(int pass)
float xcenter = (x1 + x2)*0.5; float xcenter = (x1 + x2)*0.5;
float ycenter = (y1 + y2)*0.5; float ycenter = (y1 + y2)*0.5;
float zcenter = (z1 + z2)*0.5; float zcenter = (z1 + z2)*0.5;
float angleRad = (270. - GLRenderer->mAngles.Yaw).Radians();
Matrix3x4 mat; Matrix3x4 mat;
mat.MakeIdentity(); mat.MakeIdentity();
@ -288,10 +287,10 @@ void GLSprite::Draw(int pass)
if (drawBillboardFacingCamera) { if (drawBillboardFacingCamera) {
// [CMB] Rotate relative to camera XY position, not just camera direction, // [CMB] Rotate relative to camera XY position, not just camera direction,
// which is nicer in VR // which is nicer in VR
float xrel = xcenter - FIXED2FLOAT(GLRenderer->mViewActor->X()); float xrel = xcenter - GLRenderer->mViewActor->X();
float yrel = ycenter - FIXED2FLOAT(GLRenderer->mViewActor->Y()); float yrel = ycenter - GLRenderer->mViewActor->Y();
float absAngleDeg = RAD2DEG(atan2(-yrel, xrel)); float absAngleDeg = RAD2DEG(atan2(-yrel, xrel));
float counterRotationDeg = 270. - float(GLRenderer->mAngles.Yaw); // counteracts existing sprite rotation float counterRotationDeg = 270. - GLRenderer->mAngles.Yaw.Degrees; // counteracts existing sprite rotation
float relAngleDeg = counterRotationDeg + absAngleDeg; float relAngleDeg = counterRotationDeg + absAngleDeg;
mat.Rotate(0, 1, 0, relAngleDeg); mat.Rotate(0, 1, 0, relAngleDeg);
@ -302,6 +301,8 @@ void GLSprite::Draw(int pass)
// Rotate the sprite about the vector starting at the center of the sprite // Rotate the sprite about the vector starting at the center of the sprite
// triangle strip and with direction orthogonal to where the player is looking // triangle strip and with direction orthogonal to where the player is looking
// in the x/y plane. // in the x/y plane.
float angleRad = (270. - GLRenderer->mAngles.Yaw).Radians();
mat.Rotate(-sin(angleRad), 0, cos(angleRad), -GLRenderer->mAngles.Pitch.Degrees); mat.Rotate(-sin(angleRad), 0, cos(angleRad), -GLRenderer->mAngles.Pitch.Degrees);
} }
mat.Translate(-xcenter, -zcenter, -ycenter); // retreat from sprite center mat.Translate(-xcenter, -zcenter, -ycenter); // retreat from sprite center