From 9ac075be1ce813b3313df4eec708311cb104b34e Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 30 Mar 2014 20:35:59 +0000 Subject: [PATCH] Polymer: disable normal/parallax mapping in rotatesprite. It was plainly noticeable in the editor's tile info display, for example. git-svn-id: https://svn.eduke32.com/eduke32@4409 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/polymost.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c index 712849616..f4dcb60e4 100644 --- a/polymer/eduke32/build/src/polymost.c +++ b/polymer/eduke32/build/src/polymost.c @@ -4124,7 +4124,8 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16 int32_t ourxyaspect; #if defined(USE_OPENGL) && defined(POLYMER) - int32_t olddetailmapping = r_detailmapping, oldglowmapping = r_glowmapping; + const int32_t olddetailmapping = r_detailmapping, oldglowmapping = r_glowmapping; + const int32_t oldnormalmapping = pr_normalmapping; #endif #ifdef USE_OPENGL @@ -4391,6 +4392,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16 # ifdef POLYMER if (getrendermode() == REND_POLYMER) { + pr_normalmapping = 0; polymer_inb4rotatesprite(picnum, dapalnum, dashade); r_detailmapping = 0; r_glowmapping = 0; @@ -4530,6 +4532,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16 r_detailmapping = olddetailmapping; r_glowmapping = oldglowmapping; polymer_postrotatesprite(); + pr_normalmapping = oldnormalmapping; } # endif bglMatrixMode(GL_PROJECTION); bglPopMatrix();