Prepairing for C++ integration.

[flightgear.git] / Scenery / tilecache.h

diff --git a/Scenery/tilecache.h b/Scenery/tilecache.h
index ed143392b962287b2da8efd51f0f08625ae282bb..10c204b936629c0570c5779d0a296434fc0ca5d5 100644 (file)
--- a/Scenery/tilecache.h
+++ b/Scenery/tilecache.h
@@ -28,20 +28,27 @@
 #define _TILECACHE_H
 
 
-#ifdef WIN32
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
+
+
+#include <config.h>
+
+#ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif
 
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <Scenery/bucketutils.h>
+#include <Bucket/bucketutils.h>
 #include <Include/fg_types.h>
 
-/* For best results ...
+/* For best results ... i.e. to avoid tile load problems and blank areas
  *
- * FG_TILE_CACHE_SIZE >= FG_LOCAL_X_Y + max(FG_LOCAL_X, FG_LOCAL_Y) */
-#define FG_TILE_CACHE_SIZE 12   
+ * FG_TILE_CACHE_SIZE >= FG_LOCAL_X_Y + 2*max(FG_LOCAL_X, FG_LOCAL_Y) + 1 */
+#define FG_TILE_CACHE_SIZE 100
 
 
 /* Tile cache record */
@@ -49,6 +56,7 @@ struct fgTILE {
     struct fgBUCKET tile_bucket;
     GLint display_list;
     struct fgCartesianPoint local_ref;
+    double bounding_radius;
     int used;
     int priority;
 };
@@ -74,13 +82,41 @@ void fgTileCacheEntryInfo( int index, GLint *display_list,
                           struct fgCartesianPoint *local_ref );
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _TILECACHE_H */
 
 
 /* $Log$
-/* Revision 1.3  1998/01/29 00:51:40  curt
-/* First pass at tile cache, dynamic tile loading and tile unloading now works.
+/* Revision 1.10  1998/04/21 17:02:45  curt
+/* Prepairing for C++ integration.
 /*
+ * Revision 1.9  1998/04/14 02:23:17  curt
+ * Code reorganizations.  Added a Lib/ directory for more general libraries.
+ *
+ * Revision 1.8  1998/04/08 23:30:08  curt
+ * Adopted Gnu automake/autoconf system.
+ *
+ * Revision 1.7  1998/04/03 22:11:38  curt
+ * Converting to Gnu autoconf system.
+ *
+ * Revision 1.6  1998/02/18 15:07:10  curt
+ * Tweaks to build with SGI OpenGL (and therefor hopefully other accelerated
+ * drivers will work.)
+ *
+ * Revision 1.5  1998/02/16 13:39:45  curt
+ * Miscellaneous weekend tweaks.  Fixed? a cache problem that caused whole
+ * tiles to occasionally be missing.
+ *
+ * Revision 1.4  1998/01/31 00:43:27  curt
+ * Added MetroWorks patches from Carmen Volpe.
+ *
+ * Revision 1.3  1998/01/29 00:51:40  curt
+ * First pass at tile cache, dynamic tile loading and tile unloading now works.
+ *
  * Revision 1.2  1998/01/27 00:48:04  curt
  * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
  * system and commandline/config file processing code.