Trying to stub in support for standard OpenGL.

diff --git a/Main/gltkkey.h b/Main/gltkkey.h
index 4c055836ba1715f37b3cb8a1c8d2b41820303031..51bb7ebac9367830b6cadf1ed792f9c16a03aa9b 100644 (file)
--- a/Main/gltkkey.h
+++ b/Main/gltkkey.h
@@ -12,9 +12,12 @@
 #define TKGLKEY_H
 
 
-/* assumes -I/usr/include/mesa in compile command */
-#include "gltk.h"
-
+#ifdef MESA
+    /* assumes -I/usr/include/mesa in compile command */
+    #include "gltk.h"
+#else
+    #include <GL/gl.h>
+#endif
 
 /* Handle keyboard events */
 GLenum key(int k, GLenum mask);
@@ -24,7 +27,10 @@ GLenum key(int k, GLenum mask);
 
 
 /* $Log$
-/* Revision 1.1  1997/05/16 16:05:53  curt
-/* Initial revision.
+/* Revision 1.2  1997/05/17 00:17:34  curt
+/* Trying to stub in support for standard OpenGL.
 /*
+ * Revision 1.1  1997/05/16 16:05:53  curt
+ * Initial revision.
+ *
  */

diff --git a/Main/gltkmain.c b/Main/gltkmain.c
index 4214b585ce5835b7332224054ef9af11b0f878a6..49f55a3d23796b017da266efaa41a9ed5346a231 100644 (file)
--- a/Main/gltkmain.c
+++ b/Main/gltkmain.c
@@ -13,8 +13,13 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
-/* assumes -I/usr/include/mesa in compile command */
-#include "gltk.h"
+#ifdef MESA
+    /* assumes -I/usr/include/mesa in compile command */
+    #include "gltk.h"
+#else
+    #include <GL/gl.h>
+/* #include "aux.h" */
+#endif
 
 #include "gltkkey.h"
 #include "../aircraft/aircraft.h"
@@ -207,7 +212,7 @@ int main( int argc, char *argv[] ) {
     parse_scenery(argv[1]);
 
     /* Define initial window size */
-    tkInitPosition(0, 0, 400, 400);
+    tkInitPosition(0, 0, 640, 400);
 
     /* Define Display Parameters */
     tkInitDisplayMode( TK_RGB | TK_DEPTH | TK_DOUBLE | TK_DIRECT );
@@ -249,7 +254,10 @@ int main( int argc, char *argv[] ) {
 
 
 /* $Log$
-/* Revision 1.1  1997/05/16 16:05:52  curt
-/* Initial revision.
+/* Revision 1.2  1997/05/17 00:17:34  curt
+/* Trying to stub in support for standard OpenGL.
 /*
+ * Revision 1.1  1997/05/16 16:05:52  curt
+ * Initial revision.
+ *
  */

diff --git a/Main/mesh2ogl.c b/Main/mesh2ogl.c
index 90a8b8dcf0c3d0c1b2d86a4df6278389a285c15b..5c6b3ad9bd7f51a763a21c986188aed35d26556e 100644 (file)
--- a/Main/mesh2ogl.c
+++ b/Main/mesh2ogl.c
@@ -40,7 +40,7 @@ GLint mesh_to_ogl(struct mesh *m) {
     int i, j, istep, jstep, iend, jend;
     float temp;
 
-    istep = jstep = 50;  /* Detail level 1 -- 1200 ... */
+    istep = jstep = 150;  /* Detail level 1 -- 1200 ... */
 
     mesh = glGenLists(1);
     glNewList(mesh, GL_COMPILE);
@@ -109,7 +109,10 @@ GLint mesh_to_ogl(struct mesh *m) {
 
 
 /* $Log$
-/* Revision 1.1  1997/05/16 16:05:52  curt
-/* Initial revision.
+/* Revision 1.2  1997/05/17 00:17:35  curt
+/* Trying to stub in support for standard OpenGL.
 /*
+ * Revision 1.1  1997/05/16 16:05:52  curt
+ * Initial revision.
+ *
  */