FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed osg::Statistics::addOpaque to addDrawable to better reflect its current

Browse Source 
function.
This commit is contained in:
Robert Osfield
2002-08-30 19:45:56 +00:00
parent a68d95d2f6
commit c6965357e6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/Statistics
View File

@@ -53,7 +53,7 @@ class Statistics : public osg::Referenced, public osg::Drawable::PrimitiveFuncto
void reset()
{
numOpaque=0, nummat=0; depth=0; stattype=STAT_NONE;
numDrawables=0, nummat=0; depth=0; stattype=STAT_NONE;
nlights=0; nbins=0; nimpostor=0;
_vertexCount=0;
@@ -76,7 +76,7 @@ class Statistics : public osg::Referenced, public osg::Drawable::PrimitiveFuncto
virtual void vertex(float,float,float) { PrimitivePair& prim = _primitiveCount[_currentPrimtiveFunctorMode]; ++prim.second; }
virtual void end() {}
void addOpaque() { numOpaque++;}
void addDrawable() { numDrawables++;}
void addMatrix() { nummat++;}
void addLight(const int np) { nlights+=np;}
void addImpostor(const int np) { nimpostor+= np; }
@@ -88,7 +88,7 @@ class Statistics : public osg::Referenced, public osg::Drawable::PrimitiveFuncto
public:
int numOpaque, nummat, nbins;
int numDrawables, nummat, nbins;
int nlights;
int depth; // depth into bins - eg 1.1,1.2,1.3 etc
int _binNo;

4
src/osgGLUT/Viewer.cpp
View File

@@ -1598,8 +1598,8 @@ int writePrims( const int ypos, osg::Statistics& stats)
if (stats.depth==1) sprintf(intro,"==> Bin %2d", stats._binNo);
else sprintf(intro,"General Stats: ");
sprintf(clin,"%s %d Opaque Drawables %d Lights %d Bins %d Impostors",
intro ,stats.numOpaque, stats.nlights, stats.nbins, stats.nimpostor);
sprintf(clin,"%s %d Drawables %d Lights %d Bins %d Impostors",
intro ,stats.numDrawables, stats.nlights, stats.nbins, stats.nimpostor);
displaytext(0,ypos-npix,clin);
npix+=24;

2
src/osgUtil/RenderBin.cpp
View File

@@ -269,7 +269,7 @@ bool RenderBin::getStats(osg::Statistics* primStats)
{
RenderLeaf* rl = dw_itr->get();
Drawable* dw= rl->_drawable;
primStats->addOpaque(); // number of geosets
primStats->addDrawable(); // number of geosets
if (rl->_modelview.get()) primStats->addMatrix(); // number of matrices
if (dw)
{