No .h for STL includes.

Minor view culling optimizations.

diff --git a/Scenery/material.hxx b/Scenery/material.hxx
index e02a8d026fe53bf182ad6a10e0034af3e7c99625..40a5fdf688e278912022bf216e52621bdae85b66 100644 (file)
--- a/Scenery/material.hxx
+++ b/Scenery/material.hxx
@@ -41,15 +41,8 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <map.h>           // STL associative "array"
-
-#if defined(__CYGWIN32__)
-#  include <string>        // Standard C++ string library
-#elif defined(WIN32)
-#  include <string.h>      // Standard C++ string library
-#else
-#  include <std/string.h>  // Standard C++ string library
-#endif
+#include <map>             // STL associative "array"
+#include <string>          // Standard C++ string library
 
 #include "tile.hxx"
 
@@ -106,6 +99,10 @@ public:
 
 
 // $Log$
+// Revision 1.3  1998/06/03 00:47:50  curt
+// No .h for STL includes.
+// Minor view culling optimizations.
+//
 // Revision 1.2  1998/06/01 17:56:20  curt
 // Incremental additions to material.cxx (not fully functional)
 // Tweaked vfc_ratio math to avoid divide by zero.

diff --git a/Scenery/tile.hxx b/Scenery/tile.hxx
index f86c433061e0eb0599d9338aa0538865f22e184a..b5743989a899f980aa47a2202f64f315dc8ca2a0 100644 (file)
--- a/Scenery/tile.hxx
+++ b/Scenery/tile.hxx
@@ -41,7 +41,7 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <list.h>       // STL list
+#include <list>         // STL list
 
 #include <Bucket/bucketutils.h>
 #include <Include/fg_types.h>
@@ -99,6 +99,10 @@ public:
 
 
 // $Log$
+// Revision 1.2  1998/06/03 00:47:50  curt
+// No .h for STL includes.
+// Minor view culling optimizations.
+//
 // Revision 1.1  1998/05/23 14:09:21  curt
 // Added tile.cxx and tile.hxx.
 // Working on rewriting the tile management system so a tile is just a list

diff --git a/Scenery/tilemgr.cxx b/Scenery/tilemgr.cxx
index ca0695957fd9f54b73fa7627936dfa64cd2f9f9f..f4ad7c7b4fc680d5a839890beafe9ffdadeb4014 100644 (file)
--- a/Scenery/tilemgr.cxx
+++ b/Scenery/tilemgr.cxx
@@ -228,7 +228,7 @@ static int viewable( fgCartesianPoint3d *cp, double radius ) {
     // y = m * (x - x0) = equation of a line intercepting X axis at x0
     x1 = v->cos_fov_x * radius;
     y1 = v->sin_fov_x * radius;
-    slope = -1.0 / v->slope_x;
+    slope = v->slope_x;
     x0 = x1 - y1 / slope;
 
     // printf("(r) x1 = %.2f  y1 = %.2f\n", x1, y1);
@@ -257,7 +257,7 @@ static int viewable( fgCartesianPoint3d *cp, double radius ) {
     // check bottom clip plane (from eye perspective)
     x1 = -(v->cos_fov_y) * radius;
     y1 = v->sin_fov_y * radius;
-    slope = 1.0 / v->slope_y;
+    slope = v->slope_y;
     x0 = x1 - y1 / slope;
 
     // printf("(r) x1 = %.2f  y1 = %.2f\n", x1, y1);
@@ -378,6 +378,10 @@ void fgTileMgrRender( void ) {
 
 
 // $Log$
+// Revision 1.15  1998/06/03 00:47:51  curt
+// No .h for STL includes.
+// Minor view culling optimizations.
+//
 // Revision 1.14  1998/06/01 17:56:20  curt
 // Incremental additions to material.cxx (not fully functional)
 // Tweaked vfc_ratio math to avoid divide by zero.