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

Fixes for multipipe support.

Browse Source 
Addition of FrameStatsHandler to osgproducer demo to add frame stats.
This commit is contained in:
Robert Osfield
2003-01-29 17:16:26 +00:00
parent cf1ff34d38
commit 6c4f2f5207
13 changed files with 222 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/Referenced
View File

@@ -106,11 +106,15 @@ class DeleteHandler
inline void Referenced::unref() const
{
--_refCount;
if (_refCount<=0)
if (_refCount==0)
{
if (getDeleteHandler()) getDeleteHandler()->requestDelete(this);
else delete this;
}
else if (_refCount<0)
{
throw 2325;
}
}
}

2
include/osg/State
View File

@@ -682,7 +682,7 @@ class SG_EXPORT State : public Referenced
typedef std::map<StateAttribute::Type,AttributeStack> AttributeMap;
typedef std::vector<AttributeMap> TextureAttributeMapList;
typedef std::vector<ref_ptr<const StateSet> > StateSetStack;
typedef std::vector<const StateSet*> StateSetStack;
typedef std::vector<ref_ptr<const Matrix> > MatrixStack;
ModeMap _modeMap;