Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Scenery / scenery.c

diff --git a/Scenery/scenery.c b/Scenery/scenery.c
index eb8dd0c9f200945f4d9c711c5dc1431555d503e1..3e3ebda098d72f31e3bcf15639547ef831d71a12 100644 (file)
--- a/Scenery/scenery.c
+++ b/Scenery/scenery.c
@@ -29,33 +29,38 @@
 #endif
 
 #include <GL/glut.h>
+#include <XGL/xgl.h>
+
+#include <stdio.h>
 #include <string.h>
 
-#include "../general.h"
+#include <Include/general.h>
 
-#include "scenery.h"
-#include "parsevrml.h"
+#include <Scenery/obj.h>
+#include <Scenery/scenery.h>
 
 
 /* Temporary hack until we get the scenery management system running */
-GLint mesh_hack;
+GLint area_terrain;
 
 
 /* Shared structure to hold current scenery parameters */
-struct scenery_params scenery;
+struct fgSCENERY scenery;
 
 
 /* Initialize the Scenery Management system */
-void fgSceneryInit() {
+void fgSceneryInit( void ) {
+    printf("Initializing scenery subsystem\n");
+
     /* set the default terrain detail level */
-    scenery.terrain_skip = 10;
+    scenery.terrain_skip = 6;
 }
 
 
 /* Tell the scenery manager where we are so it can load the proper data, and
  * build the proper structures. */
 void fgSceneryUpdate(double lon, double lat, double elev) {
-    struct general_params *g;
+    struct fgGENERAL *g;
     char path[1024];
 
     g = &general;
@@ -67,23 +72,105 @@ void fgSceneryUpdate(double lon, double lat, double elev) {
     path[0] = '\0';
     strcat(path, g->root_dir);
     strcat(path, "/Scenery/");
-    strcat(path, "mesa-e.wrl");
-    fgParseVRML(path);
+    strcat(path, "mesa-e.obj");
+
+    printf("  Loading Scenery: %s\n", path);
+
+    area_terrain = fgObjLoad(path, &scenery.center);
 }
 
 
 /* Render out the current scene */
-void fgSceneryRender() {
-    glPushMatrix();
-    glCallList(mesh_hack);
-    glPopMatrix();
+void fgSceneryRender( void ) {
+    static GLfloat terrain_color[4] = { 0.6, 0.8, 0.4, 1.0 };
+    static GLfloat terrain_ambient[4];
+    static GLfloat terrain_diffuse[4];
+    int i;
+
+    for ( i = 0; i < 4; i++ ) {
+       terrain_ambient[i] = terrain_color[i] * 0.5;
+       terrain_diffuse[i] = terrain_color[i];
+    }
+
+    xglMaterialfv(GL_FRONT, GL_AMBIENT, terrain_ambient);
+    xglMaterialfv(GL_FRONT, GL_DIFFUSE, terrain_diffuse);
+
+    xglCallList(area_terrain);
 }
 
 
 /* $Log$
-/* Revision 1.13  1997/08/22 21:34:41  curt
-/* Doing a bit of reorganizing and house cleaning.
+/* Revision 1.33  1998/01/19 19:27:17  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.32  1998/01/19 18:40:37  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.31  1998/01/13 00:23:11  curt
+ * Initial changes to support loading and management of scenery tiles.  Note,
+ * there's still a fair amount of work left to be done.
+ *
+ * Revision 1.30  1998/01/07 03:22:29  curt
+ * Moved astro stuff to .../Src/Astro/
+ *
+ * Revision 1.29  1997/12/30 20:47:52  curt
+ * Integrated new event manager with subsystem initializations.
+ *
+ * Revision 1.28  1997/12/15 23:55:02  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.27  1997/12/12 21:41:30  curt
+ * More light/material property tweaking ... still a ways off.
+ *
+ * Revision 1.26  1997/12/12 19:52:58  curt
+ * Working on lightling and material properties.
+ *
+ * Revision 1.25  1997/12/10 22:37:51  curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
+ * Revision 1.24  1997/12/08 22:51:18  curt
+ * Enhanced to handle ccw and cw tri-stripe winding.  This is a temporary
+ * admission of defeat.  I will eventually go back and get all the stripes
+ * wound the same way (ccw).
+ *
+ * Revision 1.23  1997/11/25 19:25:37  curt
+ * Changes to integrate Durk's moon/sun code updates + clean up.
+ *
+ * Revision 1.22  1997/10/28 21:00:22  curt
+ * Changing to new terrain format.
+ *
+ * Revision 1.21  1997/10/25 03:24:24  curt
+ * Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
+ *
+ * Revision 1.20  1997/10/25 03:18:27  curt
+ * Incorporated sun, moon, and planet position and rendering code contributed
+ * by Durk Talsma.
+ *
+ * Revision 1.19  1997/09/05 14:17:30  curt
+ * More tweaking with stars.
+ *
+ * Revision 1.18  1997/09/05 01:35:59  curt
+ * Working on getting stars right.
+ *
+ * Revision 1.17  1997/08/29 17:55:27  curt
+ * Worked on properly aligning the stars.
+ *
+ * Revision 1.16  1997/08/27 21:32:29  curt
+ * Restructured view calculation code.  Added stars.
+ *
+ * Revision 1.15  1997/08/27 03:30:32  curt
+ * Changed naming scheme of basic shared structures.
+ *
+ * Revision 1.14  1997/08/25 20:27:24  curt
+ * Merged in initial HUD and Joystick code.
+ *
+ * Revision 1.13  1997/08/22 21:34:41  curt
+ * Doing a bit of reorganizing and house cleaning.
+ *
  * Revision 1.12  1997/08/19 23:55:08  curt
  * Worked on better simulating real lighting.
  *