http://www.jwz.org/xscreensaver/xscreensaver-5.12.tar.gz

[xscreensaver] / hacks / glx / buildlwo.c

diff --git a/hacks/glx/buildlwo.c b/hacks/glx/buildlwo.c
index f405730de11a4f4b2258f1f13cb331f56cbfa0f5..c20c9e2d81a21ffff228f8666b5db46f57c1a7ee 100644 (file)
--- a/hacks/glx/buildlwo.c
+++ b/hacks/glx/buildlwo.c
@@ -1,7 +1,6 @@
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)buildlwo.c   4.02 97/04/20 xlockmore";
-
 #endif
 
 /*-
@@ -11,7 +10,7 @@ static const char sccsid[] = "@(#)buildlwo.c  4.02 97/04/20 xlockmore";
  * objects created in NewTek's Lightwave 3D.  The objects must
  * first be converted to C source with my converter "lw2ogl".
  * If other people are interested in this, I will put up a
- * web page for it at http://www.early.com/~emackey/lw2ogl/
+ * web page for it at http://www.netaxs.com/~emackey/lw2ogl/
  *
  * by Ed Mackey, 4/19/97
  *
@@ -23,19 +22,15 @@ static const char sccsid[] = "@(#)buildlwo.c        4.02 97/04/20 xlockmore";
 
 #ifdef USE_GL
 
-#ifdef STANDALONE
-#include <GL/glx.h>
-#endif
-#include <GL/gl.h>
-#include <GL/glu.h>
 #include "buildlwo.h"
 
 GLuint
-BuildLWO(int wireframe, struct lwo *object)
+BuildLWO(int wireframe, const struct lwo *object)
 {
        GLuint      dl_num;
-       GLfloat    *pnts, *normals, three[3], *grab;
-       unsigned short int *pols;
+       const GLfloat *pnts, *normals, *grab;
+       const unsigned short int *pols;
+        GLfloat three[3];
        int         p, num_pnts = 0;
 
        dl_num = glGenLists(1);
@@ -84,7 +79,7 @@ BuildLWO(int wireframe, struct lwo *object)
                                grab = pnts + ((int) (*pols) * 3);
                                three[0] = *(grab++);
                                three[1] = *(grab++);
-                               three[2] = *(grab++);
+                               three[2] = *(grab);
                                glVertex3fv(three);
                        }
                        --num_pnts;