fly/flightgear
1
0
Fork 0
Code Activity

Incremental additions to material.cxx (not fully functional)

Browse source 
Tweaked vfc_ratio math to avoid divide by zero.
This commit is contained in:
curt 1998-06-01 17:56:20 +00:00
parent a6c2da9e4e
commit 3615dd708a
3 changed files with 66 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Scenery/material.cxx
View file

@ -33,11 +33,16 @@
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <Debug/fg_debug.h>
#include <Include/fg_zlib.h>
#include <Main/options.hxx>
#include "material.hxx"
// Constructor
fgMATERIAL::fgMATERIAL ( void );
fgMATERIAL::fgMATERIAL ( void ) {
}
// Sorting routines
@ -48,10 +53,55 @@ int fgMATERIAL::append_sort_list( fgFRAGMENT *object );
// Destructor
fgMATERIAL::~fgMATERIAL ( void );
fgMATERIAL::~fgMATERIAL ( void ) {
}
// Constructor
fgMATERIAL_MGR::fgMATERIAL_MGR ( void ) {
}
// Load a library of material properties
int fgMATERIAL_MGR::load_lib ( void ) {
fgOPTIONS *o;
char path[256], fgpath[256];
fgFile f;
o = &current_options;
// build the path name to the material db
path[0] = '\0';
strcat(path, o->fg_root);
strcat(path, "/Scenery/");
strcat(path, "Materials");
strcpy(fgpath, path);
strcat(fgpath, ".gz");
// first try "path.gz"
if ( (f = fgopen(fgpath, "rb")) == NULL ) {
// next try "path"
if ( (f = fgopen(path, "rb")) == NULL ) {
fgPrintf(FG_GENERAL, FG_EXIT, "Cannot open file: %s\n", path);
}
}
fgclose(f);
return(1);
}
// Destructor
fgMATERIAL_MGR::~fgMATERIAL_MGR ( void ) {
}
// $Log$
// 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.
//
// Revision 1.1 1998/05/30 01:56:45 curt
// Added material.cxx material.hxx
//

6
Scenery/material.hxx
View file

@ -95,7 +95,7 @@ public:
fgMATERIAL_MGR ( void );
// Load a library of material properties
int load_lib ( char *file );
int load_lib ( void );
// Destructor
~fgMATERIAL_MGR ( void );
@ -106,6 +106,10 @@ public:
// $Log$
// 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.
//
// Revision 1.1 1998/05/30 01:56:45 curt
// Added material.cxx material.hxx
//

10
Scenery/tilemgr.cxx
View file

@ -367,13 +367,21 @@ void fgTileMgrRender( void ) {
}
}
v->vfc_ratio = (double)culled / (double)(drawn + culled);
if ( (drawn + culled) > 0 ) {
v->vfc_ratio = (double)culled / (double)(drawn + culled);
} else {
v->vfc_ratio = 0.0;
}
// printf("drawn = %d culled = %d saved = %.2f\n", drawn, culled,
// v->vfc_ratio);
}
// $Log$
// 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.
//
// Revision 1.13 1998/05/24 02:49:10 curt
// Implimented fragment level view frustum culling.
//