X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fstonerview-move.c;h=8639f10c0da0429efb47451c37af6d58484060b4;hp=fc2931d4a4bc5d81e9e2eef4ac7c1cdc88dd5c3d;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hpb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e

diff --git a/hacks/glx/stonerview-move.c b/hacks/glx/stonerview-move.c
index fc2931d4..8639f10c 100644
--- a/hacks/glx/stonerview-move.c
+++ b/hacks/glx/stonerview-move.c
@@ -19,14 +19,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifndef HAVE_COCOA
-# include <GL/gl.h>
-#endif
-
-#ifdef HAVE_JWZGLES
-# include "jwzgles.h"
-#endif /* HAVE_JWZGLES */
-
 #include "yarandom.h"
 #include "stonerview.h"
 
@@ -103,10 +95,10 @@ void
 stonerview_move_increment(stonerview_state *st)
 {
   int ix, val;
-/*  GLfloat fval; */
-/*  GLfloat recipels = (1.0 / (GLfloat)st->num_els); */
-  GLfloat pt[2];
-  GLfloat ptrad, pttheta;
+/*  double fval; */
+/*  double recipels = (1.0 / (double)st->num_els); */
+  double pt[2];
+  double ptrad, pttheta;
     
   for (ix=0; ix<st->num_els; ix++) {
     stonerview_elem_t *el = &st->elist[ix];
@@ -114,7 +106,7 @@ stonerview_move_increment(stonerview_state *st)
     /* Grab r and theta... */
     val = osc_get(st, st->theta, ix);
     pttheta = val * (0.01 * M_PI / 180.0); 
-    ptrad = (GLfloat)osc_get(st, st->rad, ix) * 0.001;
+    ptrad = (double)osc_get(st, st->rad, ix) * 0.001;
     /* And convert them to x,y coordinates. */
     pt[0] = ptrad * cos(pttheta);
     pt[1] = ptrad * sin(pttheta);
@@ -122,7 +114,7 @@ stonerview_move_increment(stonerview_state *st)
     /* Set x,y,z. */
     el->pos[0] = pt[0];
     el->pos[1] = pt[1];
-    el->pos[2] = (GLfloat)osc_get(st, st->alti, ix) * 0.001;
+    el->pos[2] = (double)osc_get(st, st->alti, ix) * 0.001;
         
     /* Set which way the square is rotated. This is fixed for now, although
        it would be trivial to make the squares spin as they revolve. */
@@ -133,19 +125,19 @@ stonerview_move_increment(stonerview_state *st)
        converting an HSV value to RGB, where S and V are always 1. */
     val = osc_get(st, st->color, ix);
     if (val < 1200) {
-      el->col[0] = ((GLfloat)val / 1200.0);
+      el->col[0] = ((double)val / 1200.0);
       el->col[1] = 0;
-      el->col[2] = (GLfloat)(1200 - val) / 1200.0;
+      el->col[2] = (double)(1200 - val) / 1200.0;
     } 
     else if (val < 2400) {
-      el->col[0] = (GLfloat)(2400 - val) / 1200.0;
-      el->col[1] = ((GLfloat)(val - 1200) / 1200.0);
+      el->col[0] = (double)(2400 - val) / 1200.0;
+      el->col[1] = ((double)(val - 1200) / 1200.0);
       el->col[2] = 0;
     }
     else {
       el->col[0] = 0;
-      el->col[1] = (GLfloat)(3600 - val) / 1200.0;
-      el->col[2] = ((GLfloat)(val - 2400) / 1200.0);
+      el->col[1] = (double)(3600 - val) / 1200.0;
+      el->col[2] = ((double)(val - 2400) / 1200.0);
     }
     el->col[3] = 1.0;
   }