fly/flightgear
1
0
Fork 0
Code Activity

No .h for STL includes.

Browse source 
Minor view culling optimizations.
This commit is contained in:
curt 1998-06-03 00:47:50 +00:00
parent 476d5e73b2
commit eda1cfe31c
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Scenery/material.hxx
View file

@ -41,15 +41,8 @@
#include <GL/glut.h> #include <GL/glut.h>
#include <XGL/xgl.h> #include <XGL/xgl.h>
#include <map.h> // STL associative "array" #include <map> // STL associative "array"
#include <string> // Standard C++ string library
#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 "tile.hxx" #include "tile.hxx"
@ -106,6 +99,10 @@ public:
// $Log$ // $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 // Revision 1.2 1998/06/01 17:56:20 curt
// Incremental additions to material.cxx (not fully functional) // Incremental additions to material.cxx (not fully functional)
// Tweaked vfc_ratio math to avoid divide by zero. // Tweaked vfc_ratio math to avoid divide by zero.

6
Scenery/tile.hxx
View file

@ -41,7 +41,7 @@
#include <GL/glut.h> #include <GL/glut.h>
#include <XGL/xgl.h> #include <XGL/xgl.h>
#include <list.h> // STL list #include <list> // STL list
#include <Bucket/bucketutils.h> #include <Bucket/bucketutils.h>
#include <Include/fg_types.h> #include <Include/fg_types.h>
@ -99,6 +99,10 @@ public:
// $Log$ // $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 // Revision 1.1 1998/05/23 14:09:21 curt
// Added tile.cxx and tile.hxx. // Added tile.cxx and tile.hxx.
// Working on rewriting the tile management system so a tile is just a list // Working on rewriting the tile management system so a tile is just a list

8
Scenery/tilemgr.cxx
View file

@ -228,7 +228,7 @@ static int viewable( fgCartesianPoint3d *cp, double radius ) {
// y = m * (x - x0) = equation of a line intercepting X axis at x0 // y = m * (x - x0) = equation of a line intercepting X axis at x0
x1 = v->cos_fov_x * radius; x1 = v->cos_fov_x * radius;
y1 = v->sin_fov_x * radius; y1 = v->sin_fov_x * radius;
slope = -1.0 / v->slope_x; slope = v->slope_x;
x0 = x1 - y1 / slope; x0 = x1 - y1 / slope;
// printf("(r) x1 = %.2f y1 = %.2f\n", x1, y1); // 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) // check bottom clip plane (from eye perspective)
x1 = -(v->cos_fov_y) * radius; x1 = -(v->cos_fov_y) * radius;
y1 = v->sin_fov_y * radius; y1 = v->sin_fov_y * radius;
slope = 1.0 / v->slope_y; slope = v->slope_y;
x0 = x1 - y1 / slope; x0 = x1 - y1 / slope;
// printf("(r) x1 = %.2f y1 = %.2f\n", x1, y1); // printf("(r) x1 = %.2f y1 = %.2f\n", x1, y1);
@ -378,6 +378,10 @@ void fgTileMgrRender( void ) {
// $Log$ // $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 // Revision 1.14 1998/06/01 17:56:20 curt
// Incremental additions to material.cxx (not fully functional) // Incremental additions to material.cxx (not fully functional)
// Tweaked vfc_ratio math to avoid divide by zero. // Tweaked vfc_ratio math to avoid divide by zero.