-/* -*- Mode: C++ -*-
- *
- * scenery.c -- data structures and routines for managing scenery.
- *
- * Written by Curtis Olson, started May 1997.
- *
- * Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- * (Log is kept at end of this file)
- **************************************************************************/
+// scenery.cxx -- data structures and routines for managing scenery.
+//
+// Written by Curtis Olson, started May 1997.
+//
+// Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// $Id$
+// (Log is kept at end of this file)
#ifdef HAVE_CONFIG_H
#include <string.h>
#include <Debug/fg_debug.h>
-#include <Include/general.h>
-#include <Scenery/obj.hxx>
-#include <Scenery/scenery.hxx>
-#include <Scenery/texload.h>
+#include <Main/options.hxx>
+// #include "obj.hxx"
+#include "scenery.hxx"
+// #include "texload.h"
-/* Temporary hack until we get a better texture management system running */
+
+// Temporary hack until we get a better texture management system running
GLint area_texture;
-/* Shared structure to hold current scenery parameters */
+// Shared structure to hold current scenery parameters
struct fgSCENERY scenery;
-/* Initialize the Scenery Management system */
+// Initialize the Scenery Management system
int fgSceneryInit( void ) {
- fgGENERAL *g;
- char path[1024], fgpath[1024];
- GLubyte *texbuf;
- int width, height;
+ fgOPTIONS *o;
+ // char path[1024], fgpath[1024];
+ // GLubyte *texbuf;
+ // int width, height;
- g = &general;
+ o = ¤t_options;
fgPrintf(FG_TERRAIN, FG_INFO, "Initializing scenery subsystem\n");
- /* set the default terrain detail level */
- // scenery.terrain_skip = 6;
-
- /* temp: load in a demo texture */
- path[0] = '\0';
- strcat(path, g->root_dir);
- strcat(path, "/Textures/");
- strcat(path, "desert.rgb");
-
- // Try uncompressed
- if ( (texbuf = read_rgb_texture(path, &width, &height)) == NULL ) {
- // Try compressed
- strcpy(fgpath, path);
- strcat(fgpath, ".gz");
- if ( (texbuf = read_rgb_texture(fgpath, &width, &height)) == NULL ) {
- fgPrintf( FG_GENERAL, FG_EXIT, "Error in loading texture %s\n",
- path );
- return(0);
- }
- }
-
- xglTexImage2D(GL_TEXTURE_2D, 0, 3, width, height, 0,
- GL_RGB, GL_UNSIGNED_BYTE, texbuf);
+ scenery.cur_elev = -9999;
return(1);
}
-/* Tell the scenery manager where we are so it can load the proper data, and
- * build the proper structures. */
+// 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) {
- fgGENERAL *g;
- double max_radius;
- char path[1024];
-
- g = &general;
-
- /* a hardcoded hack follows */
-
- /* this routine should parse the file, and make calls back to the
- * scenery management system to build the appropriate structures */
- path[0] = '\0';
- strcat(path, g->root_dir);
- strcat(path, "/Scenery/");
- strcat(path, "mesa-e.obj");
-
- // fgPrintf(FG_TERRAIN, FG_DEBUG, " Loading Scenery: %s\n", path);
-
- // area_terrain = fgObjLoad(path, &scenery.center, &max_radius);
+ // does nothing;
}
-/* Render out the current scene */
+// Render out the current scene
void fgSceneryRender( void ) {
}
-/* $Log$
-/* Revision 1.3 1998/05/07 23:15:20 curt
-/* Fixed a glTexImage2D() usage bug where width and height were mis-swapped.
-/* Added support for --tile-radius=n option.
-/*
- * Revision 1.2 1998/05/02 01:52:16 curt
- * Playing around with texture coordinates.
- *
- * Revision 1.1 1998/04/30 12:35:30 curt
- * Added a command line rendering option specify smooth/flat shading.
- *
- * Revision 1.42 1998/04/28 21:43:27 curt
- * Wrapped zlib calls up so we can conditionally comment out zlib support.
- *
- * Revision 1.41 1998/04/24 00:51:08 curt
- * Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
- * Tweaked the scenery file extentions to be "file.obj" (uncompressed)
- * or "file.obz" (compressed.)
- *
- * Revision 1.40 1998/04/18 04:14:06 curt
- * Moved fg_debug.c to it's own library.
- *
- * Revision 1.39 1998/04/08 23:30:07 curt
- * Adopted Gnu automake/autoconf system.
- *
- * Revision 1.38 1998/04/03 22:11:37 curt
- * Converting to Gnu autoconf system.
- *
- * Revision 1.37 1998/03/23 21:23:05 curt
- * Debugging output tweaks.
- *
- * Revision 1.36 1998/03/14 00:30:50 curt
- * Beginning initial terrain texturing experiments.
- *
- * Revision 1.35 1998/01/31 00:43:26 curt
- * Added MetroWorks patches from Carmen Volpe.
- *
- * Revision 1.34 1998/01/27 03:26:43 curt
- * Playing with new fgPrintf command.
- *
- * 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.
- *
- * Revision 1.11 1997/08/13 20:24:22 curt
- * Changed default detail level.
- *
- * Revision 1.10 1997/08/06 00:24:30 curt
- * Working on correct real time sun lighting.
- *
- * Revision 1.9 1997/08/04 17:08:11 curt
- * Testing cvs on IRIX 6.x
- *
- * Revision 1.8 1997/07/18 23:41:27 curt
- * Tweaks for building with Cygnus Win32 compiler.
- *
- * Revision 1.7 1997/07/16 20:04:52 curt
- * Minor tweaks to aid Win32 port.
- *
- * Revision 1.6 1997/07/14 16:26:05 curt
- * Testing/playing -- placed objects randomly across the entire terrain.
- *
- * Revision 1.5 1997/07/11 03:23:19 curt
- * Solved some scenery display/orientation problems. Still have a positioning
- * (or transformation?) problem.
- *
- * Revision 1.4 1997/07/11 01:30:03 curt
- * More tweaking of terrian floor.
- *
- * Revision 1.3 1997/06/29 21:16:50 curt
- * More twiddling with the Scenery Management system.
- *
- * Revision 1.2 1997/06/27 20:03:37 curt
- * Working on Makefile structure.
- *
- * Revision 1.1 1997/06/27 02:26:30 curt
- * Initial revision.
- *
- */
+// $Log$
+// Revision 1.9 1998/10/16 23:27:57 curt
+// C++-ifying.
+//
+// Revision 1.8 1998/08/25 16:52:40 curt
+// material.cxx material.hxx obj.cxx obj.hxx texload.c texload.h moved to
+// ../Objects
+//
+// Revision 1.7 1998/07/13 21:01:59 curt
+// Wrote access functions for current fgOPTIONS.
+//
+// Revision 1.6 1998/07/12 03:18:27 curt
+// Added ground collision detection. This involved:
+// - saving the entire vertex list for each tile with the tile records.
+// - saving the face list for each fragment with the fragment records.
+// - code to intersect the current vertical line with the proper face in
+// an efficient manner as possible.
+// Fixed a bug where the tiles weren't being shifted to "near" (0,0,0)
+//
+// Revision 1.5 1998/06/17 21:36:41 curt
+// Load and manage multiple textures defined in the Materials library.
+// Boost max material fagments for each material property to 800.
+// Multiple texture support when rendering.
+//
+// Revision 1.4 1998/05/13 18:26:40 curt
+// Root path info moved to fgOPTIONS.
+//
+// Revision 1.3 1998/05/07 23:15:20 curt
+// Fixed a glTexImage2D() usage bug where width and height were mis-swapped.
+// Added support for --tile-radius=n option.
+//
+// Revision 1.2 1998/05/02 01:52:16 curt
+// Playing around with texture coordinates.
+//
+// Revision 1.1 1998/04/30 12:35:30 curt
+// Added a command line rendering option specify smooth/flat shading.
+//
+// Revision 1.42 1998/04/28 21:43:27 curt
+// Wrapped zlib calls up so we can conditionally comment out zlib support.
+//
+// Revision 1.41 1998/04/24 00:51:08 curt
+// Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
+// Tweaked the scenery file extentions to be "file.obj" (uncompressed)
+// or "file.obz" (compressed.)
+//
+// Revision 1.40 1998/04/18 04:14:06 curt
+// Moved fg_debug.c to it's own library.
+//
+// Revision 1.39 1998/04/08 23:30:07 curt
+// Adopted Gnu automake/autoconf system.
+//
+// Revision 1.38 1998/04/03 22:11:37 curt
+// Converting to Gnu autoconf system.
+//
+// Revision 1.37 1998/03/23 21:23:05 curt
+// Debugging output tweaks.
+//
+// Revision 1.36 1998/03/14 00:30:50 curt
+// Beginning initial terrain texturing experiments.
+//
+// Revision 1.35 1998/01/31 00:43:26 curt
+// Added MetroWorks patches from Carmen Volpe.
+//
+// Revision 1.34 1998/01/27 03:26:43 curt
+// Playing with new fgPrintf command.
+//
+// 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.
+//
+// Revision 1.11 1997/08/13 20:24:22 curt
+// Changed default detail level.
+//
+// Revision 1.10 1997/08/06 00:24:30 curt
+// Working on correct real time sun lighting.
+//
+// Revision 1.9 1997/08/04 17:08:11 curt
+// Testing cvs on IRIX 6.x
+//
+// Revision 1.8 1997/07/18 23:41:27 curt
+// Tweaks for building with Cygnus Win32 compiler.
+//
+// Revision 1.7 1997/07/16 20:04:52 curt
+// Minor tweaks to aid Win32 port.
+//
+// Revision 1.6 1997/07/14 16:26:05 curt
+// Testing/playing -- placed objects randomly across the entire terrain.
+//
+// Revision 1.5 1997/07/11 03:23:19 curt
+// Solved some scenery display/orientation problems. Still have a positioning
+// (or transformation?) problem.
+//
+// Revision 1.4 1997/07/11 01:30:03 curt
+// More tweaking of terrian floor.
+//
+// Revision 1.3 1997/06/29 21:16:50 curt
+// More twiddling with the Scenery Management system.
+//
+// Revision 1.2 1997/06/27 20:03:37 curt
+// Working on Makefile structure.
+//
+// Revision 1.1 1997/06/27 02:26:30 curt
+// Initial revision.
+//
projects / flightgear.git / blobdiff