Integrated new event manager with subsystem initializations.

[flightgear.git] / Scenery / scenery.c

diff --git a/Scenery/scenery.c b/Scenery/scenery.c
index c70a5b6cdb0127c20d721722b329af5a06fc0092..2b710998fe815746d697e5b367517336b0fee501 100644 (file)
--- a/Scenery/scenery.c
+++ b/Scenery/scenery.c
@@ -29,26 +29,31 @@
 #endif
 
 #include <GL/glut.h>
+#include "../XGL/xgl.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "../general.h"
+#include "../Include/general.h"
 
+#include "astro.h"
+#include "obj.h"
 #include "scenery.h"
-#include "parsevrml.h"
 #include "stars.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 scenery;
+struct fgSCENERY scenery;
 
 
 /* Initialize the Scenery Management system */
 void fgSceneryInit() {
+    printf("Initializing scenery subsystem\n");
+
     /* set the default terrain detail level */
     scenery.terrain_skip = 6;
 }
@@ -57,7 +62,7 @@ void fgSceneryInit() {
 /* 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 *g;
+    struct fgGENERAL *g;
     char path[1024];
 
     g = &general;
@@ -69,30 +74,69 @@ void fgSceneryUpdate(double lon, double lat, double elev) {
     path[0] = '\0';
     strcat(path, g->root_dir);
     strcat(path, "/Scenery/");
-    strcat(path, "mesa-e.wrl");
+    strcat(path, "mesa-e.obj");
 
-    printf("Loading Scenery: %s\n", path);
+    printf("  Loading Scenery: %s\n", path);
 
-    fgParseVRML(path);
+    area_terrain = fgObjLoad(path);
 }
 
 
 /* Render out the current scene */
 void fgSceneryRender() {
-    glPushMatrix();
-    glCallList(mesh_hack);
-    glPopMatrix();
-    fgStarsRender();
+    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);
 
-    fgMoonRender();
+    xglCallList(area_terrain);
 }
 
 
 /* $Log$
-/* 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.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.
  *