s/DP4/DP3/

[mesa.git] / progs / demos / ipers.c

diff --git a/progs/demos/ipers.c b/progs/demos/ipers.c
index d38c4d1ae8878888afd8a9c3368b1ddd12001e4e..8168034ffd9b30b4249e064f3d57c2c96d102939 100644 (file)
--- a/progs/demos/ipers.c
+++ b/progs/demos/ipers.c
@@ -11,7 +11,7 @@
 #include <math.h>
 #include <time.h>
 
-#ifdef WIN32
+#if defined (WIN32)|| defined(_WIN32)
 #include <windows.h>
 #include <mmsystem.h>
 #endif
@@ -186,7 +186,7 @@ inittextures(void)
        (gluerr =
        gluBuild2DMipmaps(GL_TEXTURE_2D, 3, TEX_SKY_WIDTH, TEX_SKY_HEIGHT,
                          GL_RGB, GL_UNSIGNED_BYTE, (GLvoid *) (tsky)))) {
-      fprintf(stderr, "GLULib%s\n", gluErrorString(gluerr));
+      fprintf(stderr, "GLULib%s\n", (char *) gluErrorString(gluerr));
       exit(-1);
    }
 
@@ -205,6 +205,13 @@ calcposobs(void)
    dir[1] = cos(alpha * M_PI / 180.0) * sin(beta * M_PI / 180.0);
    dir[2] = cos(beta * M_PI / 180.0);
 
+   if (dir[0] < 1.0e-5 && dir[0] > -1.0e-5)
+      dir[0] = 0;
+   if (dir[1] < 1.0e-5 && dir[1] > -1.0e-5)
+      dir[1] = 0;
+   if (dir[2] < 1.0e-5 && dir[2] > -1.0e-5)
+      dir[2] = 0;
+
    obs[0] += v * dir[0];
    obs[1] += v * dir[1];
    obs[2] += v * dir[2];