-/**************************************************************************
+/* -*- Mode: C++ -*-
+ *
* tilemgr.c -- routines to handle dynamic management of scenery tiles
*
* Written by Curtis Olson, started January 1998.
**************************************************************************/
-#ifdef WIN32
+#include <config.h>
+
+#ifdef HAVE_WINDOWS_H
# include <windows.h>
#endif
#include <XGL/xgl.h>
#include <Scenery/scenery.h>
-#include <Scenery/bucketutils.h>
#include <Scenery/obj.h>
#include <Scenery/tilecache.h>
#include <Aircraft/aircraft.h>
+#include <Bucket/bucketutils.h>
#include <Include/fg_constants.h>
#include <Include/fg_types.h>
#include <Main/fg_debug.h>
-#define FG_LOCAL_X 3 /* should be odd */
-#define FG_LOCAL_Y 3 /* should be odd */
-#define FG_LOCAL_X_Y 9 /* At least FG_LOCAL_X times FG_LOCAL_Y */
+#define FG_LOCAL_X 7 /* should be odd */
+#define FG_LOCAL_Y 7 /* should be odd */
+#define FG_LOCAL_X_Y 49 /* At least FG_LOCAL_X times FG_LOCAL_Y */
/* closest (potentially viewable) tiles, centered on current tile.
/* Initialize the Tile Manager subsystem */
-void fgTileMgrInit( void ) {
+int fgTileMgrInit( void ) {
fgPrintf( FG_TERRAIN, FG_INFO, "Initializing Tile Manager subsystem.\n");
+ return 1;
}
/* given the current lon/lat, fill in the array of local chunks. If
* the chunk isn't already in the cache, then read it from disk. */
-void fgTileMgrUpdate( void ) {
- struct fgFLIGHT *f;
+int fgTileMgrUpdate( void ) {
+ fgFLIGHT *f;
struct fgBUCKET p1, p2;
static struct fgBUCKET p_last = {-1000, 0, 0, 0};
int i, j, dw, dh;
- f = ¤t_aircraft.flight;
+ f = current_aircraft.flight;
fgBucketFind(FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG, &p1);
dw = FG_LOCAL_X / 2;
dh = FG_LOCAL_Y / 2;
- if ( (p1.lon == p_last.lon) && (p1.lat == p_last.lat) &&
+ if ( (p1.lon == p_last.lon) && (p1.lat == p_last.lat) &&
(p1.x == p_last.x) && (p1.y == p_last.y) ) {
/* same bucket as last time */
fgPrintf( FG_TERRAIN, FG_DEBUG, "Same bucket as last time\n");
* relavant tiles */
fgPrintf( FG_TERRAIN, FG_DEBUG, "First time through ... \n");
- fgPrintf( FG_TERRAIN, FG_DEBUG, "Updating Tile list for %d,%d %d,%d\n",
- p1.lon, p1.lat, p1.x, p1.y);
+ fgPrintf( FG_TERRAIN, FG_DEBUG, "Updating Tile list for %d,%d %d,%d\n",
+ p1.lon, p1.lat, p1.x, p1.y);
/* wipe tile cache */
fgTileCacheInit();
AT ULTRA HIGH SPEEDS THIS ASSUMPTION MAY NOT BE VALID IF
THE AIRCRAFT CAN SKIP A TILE IN A SINGLE ITERATION. */
- if ( (p1.lon > p_last.lon) ||
+ if ( (p1.lon > p_last.lon) ||
( (p1.lon == p_last.lon) && (p1.x > p_last.x) ) ) {
for ( j = 0; j < FG_LOCAL_Y; j++ ) {
/* scrolling East */
fgBucketOffset(&p_last, &p2, dw + 1, j - dh);
fgTileMgrLoadTile(&p2, &tiles[(j*FG_LOCAL_Y) + FG_LOCAL_X - 1]);
}
- } else if ( (p1.lon < p_last.lon) ||
+ } else if ( (p1.lon < p_last.lon) ||
( (p1.lon == p_last.lon) && (p1.x < p_last.x) ) ) {
for ( j = 0; j < FG_LOCAL_Y; j++ ) {
/* scrolling West */
}
}
- if ( (p1.lat > p_last.lat) ||
+ if ( (p1.lat > p_last.lat) ||
( (p1.lat == p_last.lat) && (p1.y > p_last.y) ) ) {
for ( i = 0; i < FG_LOCAL_X; i++ ) {
/* scrolling North */
for ( j = 0; j < FG_LOCAL_Y - 1; j++ ) {
- tiles[(j * FG_LOCAL_Y) + i] =
+ tiles[(j * FG_LOCAL_Y) + i] =
tiles[((j+1) * FG_LOCAL_Y) + i];
}
/* load in new column */
fgBucketOffset(&p_last, &p2, i - dw, dh + 1);
- fgTileMgrLoadTile(&p2,
- &tiles[((FG_LOCAL_Y-1)*FG_LOCAL_Y) + i]);
+ fgTileMgrLoadTile(&p2, &tiles[((FG_LOCAL_Y-1)*FG_LOCAL_Y) + i]);
}
- } else if ( (p1.lat < p_last.lat) ||
+ } else if ( (p1.lat < p_last.lat) ||
( (p1.lat == p_last.lat) && (p1.y < p_last.y) ) ) {
for ( i = 0; i < FG_LOCAL_X; i++ ) {
/* scrolling South */
fgBucketOffset(&p_last, &p2, i - dw, -dh - 1);
fgTileMgrLoadTile(&p2, &tiles[0 + i]);
}
- }
+ }
}
p_last.lon = p1.lon;
p_last.lat = p1.lat;
p_last.x = p1.x;
p_last.y = p1.y;
+ return 1;
}
/* Render the local tiles */
void fgTileMgrRender( void ) {
- static GLfloat terrain_color[4] = { 0.6, 0.8, 0.4, 1.0 };
- static GLfloat terrain_ambient[4];
- static GLfloat terrain_diffuse[4];
+ fgFLIGHT *f;
+ struct fgBUCKET p;
struct fgCartesianPoint local_ref;
GLint display_list;
int i;
int index;
- for ( i = 0; i < 4; i++ ) {
- terrain_ambient[i] = terrain_color[i] * 0.5;
- terrain_diffuse[i] = terrain_color[i];
- }
+ f = current_aircraft.flight;
- xglMaterialfv(GL_FRONT, GL_AMBIENT, terrain_ambient);
- xglMaterialfv(GL_FRONT, GL_DIFFUSE, terrain_diffuse);
+ /* Find current translation offset */
+ fgBucketFind(FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG, &p);
+ index = fgTileCacheExists(&p);
+ fgTileCacheEntryInfo(index, &display_list, &scenery.next_center );
+
+ printf("Pos = (%.2f, %.2f) Current bucket = %d %d %d %d Index = %ld\n",
+ FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG,
+ p.lon, p.lat, p.x, p.y, fgBucketGenIndex(&p) );
for ( i = 0; i < FG_LOCAL_X_Y; i++ ) {
index = tiles[i];
if ( display_list >= 0 ) {
xglPushMatrix();
- xglTranslatef(local_ref.x - scenery.center.x,
+ /* xglTranslatef(local_ref.x - scenery.center.x,
local_ref.y - scenery.center.y,
- local_ref.z - scenery.center.z);
+ local_ref.z - scenery.center.z); */
+ xglTranslatef(-scenery.center.x, -scenery.center.y,
+ -scenery.center.z);
xglCallList(display_list);
xglPopMatrix();
}
/* $Log$
-/* Revision 1.12 1998/02/01 03:39:55 curt
-/* Minor tweaks.
+/* Revision 1.24 1998/04/14 02:23:18 curt
+/* Code reorganizations. Added a Lib/ directory for more general libraries.
/*
+ * Revision 1.23 1998/04/08 23:30:08 curt
+ * Adopted Gnu automake/autoconf system.
+ *
+ * Revision 1.22 1998/04/03 22:11:38 curt
+ * Converting to Gnu autoconf system.
+ *
+ * Revision 1.21 1998/03/23 21:23:05 curt
+ * Debugging output tweaks.
+ *
+ * Revision 1.20 1998/03/14 00:30:51 curt
+ * Beginning initial terrain texturing experiments.
+ *
+ * Revision 1.19 1998/02/20 00:16:25 curt
+ * Thursday's tweaks.
+ *
+ * Revision 1.18 1998/02/19 13:05:54 curt
+ * Incorporated some HUD tweaks from Michelle America.
+ * Tweaked the sky's sunset/rise colors.
+ * Other misc. tweaks.
+ *
+ * Revision 1.17 1998/02/16 13:39:46 curt
+ * Miscellaneous weekend tweaks. Fixed? a cache problem that caused whole
+ * tiles to occasionally be missing.
+ *
+ * Revision 1.16 1998/02/12 21:59:53 curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.14 1998/02/09 21:30:19 curt
+ * Fixed a nagging problem with terrain tiles not "quite" matching up perfectly.
+ *
+ * Revision 1.13 1998/02/07 15:29:46 curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.12 1998/02/01 03:39:55 curt
+ * Minor tweaks.
+ *
* Revision 1.11 1998/01/31 00:43:27 curt
* Added MetroWorks patches from Carmen Volpe.
*
projects / flightgear.git / blobdiff