Changeset 3597 for trunk/src/opengl/mesa/shade_tmp.h

Timestamp:

May 23, 2000, 10:35:01 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/shade_tmp.h (modified) (6 diffs)

trunk/src/opengl/mesa/shade_tmp.h

@@ -1 @@
-/* $Id: shade_tmp.h,v 1.1 2000-02-29 00:48:37 sandervl Exp $ */
+/* $Id: shade_tmp.h,v 1.2 2000-05-23 20:34:55 jeroen Exp $ */
 
 /*
@@ -29 +29 @@
  */
 
-#ifdef __WIN32OS2__
-#include <misc.h>
-#endif
-
 static void TAG(shade_rgba_spec)( struct vertex_buffer *VB )
 {
@@ -139 +135 @@
             }
 
-            d = LEN_3FV( VP );
+            d = (GLfloat) LEN_3FV( VP );
 
             if (d > 1e-6) {
@@ -161 +157 @@
                   double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
                   int k = (int) x;
-                  GLfloat spot = (light->SpotExpTable[k][0]
+                  GLfloat spot = (GLfloat) (light->SpotExpTable[k][0]
                                   + (x-k)*light->SpotExpTable[k][1]);
                   attenuation *= spot;
@@ -238 +234 @@
 
             if (n_dot_h>1.0) {
-               spec_coef = pow( n_dot_h, tab->shininess );
+               spec_coef = (GLfloat) pow( n_dot_h, tab->shininess );
             } else
                GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec_coef );
@@ -558 +554 @@
             if (NR_SIDES == 2)  COPY_3V(sum[1], base[1]);
 
-#ifdef __WIN32OS2__
-               dprintf(("light normal %d/%d, %f %f %f\n",
-                       j, VB->Start, normal[0], normal[1], normal[2]));
-#else
-            if (0)
-/*             if (ctx->Light.ShadeModel == GL_SMOOTH) */
+            if (MESA_VERBOSE&VERBOSE_LIGHTING)
                fprintf(stderr, "light normal %d/%d, %f %f %f\n",
                        j, VB->Start, normal[0], normal[1], normal[2]);
-#endif
+
 
             foreach (light, &ctx->Light.EnabledList) {