Capitalized subdirectory names.

[flightgear.git] / Main / mesh2GL.c

diff --git a/Main/mesh2GL.c b/Main/mesh2GL.c
index e00b5425cb07a303eb2f9852a335aa0ef953c0bc..64a3a28418f194070c1a8ed0bd30dab153eadcdf 100644 (file)
--- a/Main/mesh2GL.c
+++ b/Main/mesh2GL.c
@@ -31,24 +31,28 @@
     #include "gltk.h"
 #endif
 
-#include "../scenery/mesh.h"
+#include "../Scenery/mesh.h"
 #include "../mat3/mat3.h"
 
 
 /* walk through mesh and make ogl calls */
 GLint mesh2GL(struct mesh *m) {
     GLint mesh;
+    static GLfloat color[4] = { 0.3, 0.7, 0.2, 1.0 };
 
     float x1, y1, x2, y2, z11, z12, z21, z22;
+
     MAT3vec v1, v2, normal; 
     int i, j, istep, jstep, iend, jend;
     float temp;
 
-    istep = jstep = 12;  /* Detail level 1 -- 1200 ... */
+    istep = jstep = 25;  /* Detail level 1 -- 1200 ... */
 
     mesh = glGenLists(1);
     glNewList(mesh, GL_COMPILE);
 
+    glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color );
+       
     iend = m->cols - 1;
     jend = m->rows - 1;
     
@@ -75,18 +79,18 @@ GLint mesh2GL(struct mesh *m) {
 
            if ( j == 0 ) {
                /* first time through */
-               glVertex3f(x1, y1, z11-45);
-               glVertex3f(x1, y2, z12-45);
+               glVertex3f(x1, y1, z11);
+               glVertex3f(x1, y2, z12);
            }
 
-           glVertex3f(x2, y1, z21-45);
+           glVertex3f(x2, y1, z21);
            
            v1[0] = x2 - x1; v1[1] = y1 - y2; v1[2] = z21 - z12;
            v2[0] = x2 - x1; v2[1] = 0; v2[2] = z22 - z12;
            MAT3cross_product(normal, v1, v2);
            MAT3_NORMALIZE_VEC(normal,temp);
            glNormal3d(normal[0], normal[1], normal[2]);
-           glVertex3f(x2, y2, z22-45);
+           glVertex3f(x2, y2, z22);
 
            x1 = x2;
            x2 = x1 + (m->row_step * jstep);
@@ -104,12 +108,36 @@ GLint mesh2GL(struct mesh *m) {
 
 
 /* $Log$
-/* Revision 1.13  1997/05/31 04:13:53  curt
-/* WE CAN NOW FLY!!!
-/*
-/* Continuing work on the LaRCsim flight model integration.
-/* Added some MSFS-like keyboard input handling.
+/* Revision 1.21  1997/06/21 17:12:54  curt
+/* Capitalized subdirectory names.
 /*
+ * Revision 1.20  1997/06/18 04:10:32  curt
+ * A couple more runway tweaks ...
+ *
+ * Revision 1.19  1997/06/18 02:21:24  curt
+ * Hacked in a runway
+ *
+ * Revision 1.18  1997/06/17 04:19:17  curt
+ * More timer related tweaks with respect to view direction changes.
+ *
+ * Revision 1.17  1997/06/16 19:32:52  curt
+ * Starting to add general timer support.
+ *
+ * Revision 1.16  1997/06/02 03:40:07  curt
+ * A tiny bit more view tweaking.
+ *
+ * Revision 1.15  1997/06/02 03:01:38  curt
+ * Working on views (side, front, back, transitions, etc.)
+ *
+ * Revision 1.14  1997/05/31 19:16:26  curt
+ * Elevator trim added.
+ *
+ * Revision 1.13  1997/05/31 04:13:53  curt
+ * WE CAN NOW FLY!!!
+ *
+ * Continuing work on the LaRCsim flight model integration.
+ * Added some MSFS-like keyboard input handling.
+ *
  * Revision 1.12  1997/05/30 23:26:20  curt
  * Added elevator/aileron controls.
  *