From dbad946fe3ad6dd0813b402ba54b8486feb19536 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 6 Apr 2016 22:09:21 +0200 Subject: [PATCH] - revert default planes to static in gl_sprite.cpp --- src/gl/scene/gl_sprite.cpp | 5 ++--- src/r_defs.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gl/scene/gl_sprite.cpp b/src/gl/scene/gl_sprite.cpp index 630229ff6a..c48dc71071 100644 --- a/src/gl/scene/gl_sprite.cpp +++ b/src/gl/scene/gl_sprite.cpp @@ -237,9 +237,8 @@ void GLSprite::Draw(int pass) if (lightlist) { // set up the light slice -#pragma message ("Undo this!") - secplane_t bottommost; bottommost.set(0, 0, FRACUNIT, 32767 << FRACBITS); - secplane_t topmost; topmost.set(0, 0, FRACUNIT, -(32767 << FRACBITS)); + static secplane_t bottommost = { {0, 0, 1.}, FLT_MAX }; + static secplane_t topmost = { { 0, 0, 1. }, -FLT_MAX }; secplane_t *topplane = i == 0 ? &topmost : &(*lightlist)[i].plane; secplane_t *lowplane = i == (*lightlist).Size() - 1 ? &bottommost : &(*lightlist)[i + 1].plane; diff --git a/src/r_defs.h b/src/r_defs.h index 5b8d440acc..e96f47a057 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -307,7 +307,7 @@ struct secplane_t // the plane is defined as a*x + b*y + c*z + d = 0 // ic is 1/c, for faster Z calculations -private: +//private: DVector3 normal; double D, negiC; // negative iC because that also saves a negation in all methods using this. public: