#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 "stars.h"
/* Temporary hack until we get the scenery management system running */
/* Initialize the Scenery Management system */
-void fgSceneryInit() {
+void fgSceneryInit( void ) {
+ printf("Initializing scenery subsystem\n");
+
/* set the default terrain detail level */
scenery.terrain_skip = 6;
}
strcat(path, "/Scenery/");
strcat(path, "mesa-e.obj");
- printf("Loading Scenery: %s\n", path);
+ printf(" Loading Scenery: %s\n", path);
- area_terrain = fgObjLoad(path);
+ area_terrain = fgObjLoad(path, &scenery.center);
}
/* Render out the current scene */
-void fgSceneryRender() {
- glCallList(area_terrain);
+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];
+ }
- fgAstroRender();
+ xglMaterialfv(GL_FRONT, GL_AMBIENT, terrain_ambient);
+ xglMaterialfv(GL_FRONT, GL_DIFFUSE, terrain_diffuse);
+
+ xglCallList(area_terrain);
}
/* $Log$
-/* 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.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