zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-02 00:43:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge http://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2016-10-24 01:07:10 -04:00
commit 64ae207fb9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/scene/gl_drawinfo.cpp
View file

@ -536,7 +536,7 @@ void GLDrawList::SortSpriteIntoWall(SortNode * head,SortNode * sort)
const bool drawBillboardFacingCamera = gl_billboard_faces_camera; const bool drawBillboardFacingCamera = gl_billboard_faces_camera;
// [Nash] has +ROLLSPRITE // [Nash] has +ROLLSPRITE
const bool rotated = (ss->actor != nullptr && ss->actor->renderflags & RF_ROLLSPRITE | RF_WALLSPRITE | RF_FLATSPRITE); const bool rotated = (ss->actor != nullptr && ss->actor->renderflags & (RF_ROLLSPRITE | RF_WALLSPRITE | RF_FLATSPRITE));
// cannot sort them at the moment. This requires more complex splitting. // cannot sort them at the moment. This requires more complex splitting.
if (drawWithXYBillboard || drawBillboardFacingCamera || rotated) if (drawWithXYBillboard || drawBillboardFacingCamera || rotated)

2
src/gl/scene/gl_wall.h
View file

@ -66,7 +66,7 @@ struct GLSeg
// we do not use the vector math inlines here because they are not optimized for speed but accuracy in the playsim // we do not use the vector math inlines here because they are not optimized for speed but accuracy in the playsim
float x = y2 - y1; float x = y2 - y1;
float y = x1 - x2; float y = x1 - x2;
float length = sqrt(x*x + y*y); float length = sqrtf(x*x + y*y);
return FVector3(x / length, 0, y / length); return FVector3(x / length, 0, y / length);
} }
}; };