Move lines around

git-svn-id: https://s.snth.net/svn/neverball/trunk@3520 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/share/geom.c b/share/geom.c
index 0dd3694..88725c8 100644 (file)
--- a/share/geom.c
+++ b/share/geom.c
@@ -324,18 +324,24 @@ void shad_free(void)
 
 void shad_draw_set(const float *p, float r)
 {
+    glBindTexture(GL_TEXTURE_2D, shad_text);
+
     glMatrixMode(GL_TEXTURE);
     {
         float k = 0.25f / r;
 
-        glBindTexture(GL_TEXTURE_2D, shad_text);
-
         glLoadIdentity();
         glTranslatef(0.5f - k * p[0],
                      0.5f - k * p[2], 0.f);
         glScalef(k, k, 1.0f);
     }
     glMatrixMode(GL_MODELVIEW);
+
+    glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
+    glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
+
+    glEnable(GL_TEXTURE_GEN_S);
+    glEnable(GL_TEXTURE_GEN_T);
 }
 
 void shad_draw_clr(void)
@@ -345,6 +351,9 @@ void shad_draw_clr(void)
         glLoadIdentity();
     }
     glMatrixMode(GL_MODELVIEW);
+
+    glDisable(GL_TEXTURE_GEN_S);
+    glDisable(GL_TEXTURE_GEN_T);
 }
 
 /*---------------------------------------------------------------------------*/

diff --git a/share/solid_draw.c b/share/solid_draw.c
index 302134e..2fb555e 100644 (file)
--- a/share/solid_draw.c
+++ b/share/solid_draw.c
@@ -551,35 +551,33 @@ static void sol_shad_list(const struct s_vary *vary,
     glTexGenfv(GL_S, GL_OBJECT_PLANE, X);
     glTexGenfv(GL_T, GL_OBJECT_PLANE, Z);
 
-    glPushMatrix();
+    /* Translate the shadow on a moving body. */
+
+    glMatrixMode(GL_TEXTURE);
     {
-        /* Translate and rotate a moving body. */
+        glPushMatrix();
+        glTranslatef(p[0], p[2], 0.0f);
+    }
+    glMatrixMode(GL_MODELVIEW);
+
+    /* Draw the body. */
 
+    glPushMatrix();
+    {
         glTranslatef(p[0], p[1], p[2]);
         glRotatef(a, u[0], u[1], u[2]);
 
-        /* Translate the shadow on a moving body. */
-
-        glMatrixMode(GL_TEXTURE);
-        {
-            glPushMatrix();
-            glTranslatef(p[0], p[2], 0.0f);
-        }
-        glMatrixMode(GL_MODELVIEW);
-
-        /* Draw the body. */
-
         glCallList(list);
+    }
+    glPopMatrix();
 
-        /* Pop the shadow translation. */
+    /* Pop the shadow translation. */
 
-        glMatrixMode(GL_TEXTURE);
-        {
-            glPopMatrix();
-        }
-        glMatrixMode(GL_MODELVIEW);
+    glMatrixMode(GL_TEXTURE);
+    {
+        glPopMatrix();
     }
-    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
 }
 
 void sol_shad(const struct s_draw *draw)
@@ -588,12 +586,6 @@ void sol_shad(const struct s_draw *draw)
 
     /* Render all shadowed geometry. */
 
-    glEnable(GL_TEXTURE_GEN_S);
-    glEnable(GL_TEXTURE_GEN_T);
-
-    glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
-    glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
-
     glDepthMask(GL_FALSE);
     {
         for (bi = 0; bi < draw->bc; bi++)
@@ -601,9 +593,6 @@ void sol_shad(const struct s_draw *draw)
                 sol_shad_list(draw->vary, draw->vary->bv + bi, draw->bv[bi].sl);
     }
     glDepthMask(GL_TRUE);
-
-    glDisable(GL_TEXTURE_GEN_T);
-    glDisable(GL_TEXTURE_GEN_S);
 }
 
 /*---------------------------------------------------------------------------*/