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

Converted FrameStamp::g/setFrameNumber from int to uint

Browse Source
This commit is contained in:
Robert Osfield
2010-12-22 20:11:05 +00:00
parent b5d4d9954a
commit 410b4fd109
49 changed files with 201 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/osg/DeleteHandler
View File

@@ -32,7 +32,7 @@ class OSG_EXPORT DeleteHandler
{
public:
typedef std::pair<int, const osg::Referenced*> FrameNumberObjectPair;
typedef std::pair<unsigned int, const osg::Referenced*> FrameNumberObjectPair;
typedef std::list<FrameNumberObjectPair> ObjectsToDeleteList;
DeleteHandler(int numberOfFramesToRetainObjects=0);
@@ -44,15 +44,15 @@ class OSG_EXPORT DeleteHandler
* The ability to retain objects for several frames is useful to prevent premature deletion when objects
* are still be used the graphics threads that are using double buffering of rendering data structures with
* non ref_ptr<> pointers to scene graph elements.*/
void setNumFramesToRetainObjects(int numberOfFramesToRetainObjects) { _numFramesToRetainObjects = numberOfFramesToRetainObjects; }
void setNumFramesToRetainObjects(unsigned int numberOfFramesToRetainObjects) { _numFramesToRetainObjects = numberOfFramesToRetainObjects; }
int getNumFramesToRetainObjects() const { return _numFramesToRetainObjects; }
unsigned int getNumFramesToRetainObjects() const { return _numFramesToRetainObjects; }
/** Set the current frame number so that subsequent deletes get tagged as associated with this frame.*/
void setFrameNumber(int frameNumber) { _currentFrameNumber = frameNumber; }
void setFrameNumber(unsigned int frameNumber) { _currentFrameNumber = frameNumber; }
/** Get the current frame number.*/
int getFrameNumber() const { return _currentFrameNumber; }
unsigned int getFrameNumber() const { return _currentFrameNumber; }
inline void doDelete(const Referenced* object) { delete object; }
@@ -76,10 +76,10 @@ class OSG_EXPORT DeleteHandler
_currentFrameNumber(0) {}
DeleteHandler operator = (const DeleteHandler&) { return *this; }
int _numFramesToRetainObjects;
int _currentFrameNumber;
OpenThreads::Mutex _mutex;
ObjectsToDeleteList _objectsToDelete;
unsigned int _numFramesToRetainObjects;
unsigned int _currentFrameNumber;
OpenThreads::Mutex _mutex;
ObjectsToDeleteList _objectsToDelete;
};

10
include/osg/FrameStamp
View File

@@ -40,8 +40,8 @@ class OSG_EXPORT FrameStamp : public Referenced
FrameStamp& operator = (const FrameStamp& fs);
void setFrameNumber(int fnum) { _frameNumber = fnum; }
int getFrameNumber() const { return _frameNumber; }
void setFrameNumber(unsigned int fnum) { _frameNumber = fnum; }
unsigned int getFrameNumber() const { return _frameNumber; }
void setReferenceTime(double refTime) { _referenceTime = refTime; }
double getReferenceTime() const { return _referenceTime; }
@@ -63,9 +63,9 @@ class OSG_EXPORT FrameStamp : public Referenced
// via a simple memory copy or within a data packet across
// the network.
int _frameNumber;
double _referenceTime;
double _simulationTime;
unsigned int _frameNumber;
double _referenceTime;
double _simulationTime;
// member variables of time.h's tm structure, copied here to
// ensure that all data is not dynamic. The tm structure itself

8
include/osg/NodeVisitor
View File

@@ -42,6 +42,8 @@ class Transform;
class Camera;
class CameraView;
const unsigned int UNINITIALIZED_FRAME_NUMBER=0xffffffff;
#define META_NodeVisitor(library,name) \
virtual const char* libraryName() const { return #library; }\
virtual const char* className() const { return #name; }
@@ -109,10 +111,10 @@ class OSG_EXPORT NodeVisitor : public virtual Referenced
inline VisitorType getVisitorType() const { return _visitorType; }
/** Set the traversal number. Typically used to denote the frame count.*/
inline void setTraversalNumber(int fn) { _traversalNumber = fn; }
inline void setTraversalNumber(unsigned int fn) { _traversalNumber = fn; }
/** Get the traversal number. Typically used to denote the frame count.*/
inline int getTraversalNumber() const { return _traversalNumber; }
inline unsigned int getTraversalNumber() const { return _traversalNumber; }
/** Set the FrameStamp that this traversal is associated with.*/
inline void setFrameStamp(FrameStamp* fs) { _frameStamp = fs; }
@@ -326,7 +328,7 @@ class OSG_EXPORT NodeVisitor : public virtual Referenced
protected:
VisitorType _visitorType;
int _traversalNumber;
unsigned int _traversalNumber;
ref_ptr<FrameStamp> _frameStamp;

8
include/osg/OcclusionQueryNode
View File

@@ -122,8 +122,8 @@ public:
unsigned int getVisibilityThreshold() const { return _visThreshold; }
// Specifies how many frames to wait before issuing another query.
void setQueryFrameCount( int frames ) { _queryFrameCount = frames; }
int getQueryFrameCount() const { return _queryFrameCount; }
void setQueryFrameCount( unsigned int frames ) { _queryFrameCount = frames; }
unsigned int getQueryFrameCount() const { return _queryFrameCount; }
// Indicate whether or not the bounding box used in the occlusion query test
// should be rendered. Handy for debugging and development.
@@ -179,7 +179,7 @@ protected:
// Tracks the last frame number that we performed a query.
// User can set how many times (See setQueryFrameCount).
typedef std::map< const osg::Camera*, int > FrameCountMap;
typedef std::map< const osg::Camera*, unsigned int > FrameCountMap;
FrameCountMap _frameCountMap;
mutable OpenThreads::Mutex _frameCountMutex;
@@ -188,7 +188,7 @@ protected:
// User-settable variables
unsigned int _visThreshold;
int _queryFrameCount;
unsigned int _queryFrameCount;
bool _debugBB;

20
include/osg/PagedLOD
View File

@@ -71,8 +71,8 @@ class OSG_EXPORT PagedLOD : public LOD
float _priorityOffset;
float _priorityScale;
double _timeStamp;
int _frameNumber;
int _frameNumberOfLastReleaseGLObjects;
unsigned int _frameNumber;
unsigned int _frameNumberOfLastReleaseGLObjects;
osg::ref_ptr<osg::Referenced> _databaseRequest;
};
@@ -96,8 +96,8 @@ class OSG_EXPORT PagedLOD : public LOD
double getTimeStamp(unsigned int childNo) const { return _perRangeDataList[childNo]._timeStamp; }
unsigned int getNumTimeStamps() const { return _perRangeDataList.size(); }
void setFrameNumber(unsigned int childNo, int frameNumber) { expandPerRangeDataTo(childNo); _perRangeDataList[childNo]._frameNumber=frameNumber; }
double getFrameNumber(unsigned int childNo) const { return _perRangeDataList[childNo]._frameNumber; }
void setFrameNumber(unsigned int childNo, unsigned int frameNumber) { expandPerRangeDataTo(childNo); _perRangeDataList[childNo]._frameNumber=frameNumber; }
unsigned getFrameNumber(unsigned int childNo) const { return _perRangeDataList[childNo]._frameNumber; }
unsigned int getNumFrameNumbers() const { return _perRangeDataList.size(); }
@@ -114,10 +114,10 @@ class OSG_EXPORT PagedLOD : public LOD
/** Set the frame number of the last time that this PageLOD node was traversed.
* Note, this frame number is automatically set by the traverse() method for all traversals (update, cull etc.).
*/
inline void setFrameNumberOfLastTraversal(int frameNumber) { _frameNumberOfLastTraversal=frameNumber; }
inline void setFrameNumberOfLastTraversal(unsigned int frameNumber) { _frameNumberOfLastTraversal=frameNumber; }
/** Get the frame number of the last time that this PageLOD node was traversed.*/
inline int getFrameNumberOfLastTraversal() const { return _frameNumberOfLastTraversal; }
inline unsigned int getFrameNumberOfLastTraversal() const { return _frameNumberOfLastTraversal; }
/** Set the number of children that the PagedLOD must keep around, even if they are older than their expiry time.*/
@@ -137,11 +137,7 @@ class OSG_EXPORT PagedLOD : public LOD
* The removed children are added to the removeChildren list passed into the method,
* this allows the children to be deleted later at the caller's discretion.
* Return true if children are removed, false otherwise. */
virtual bool removeExpiredChildren(double expiryTime, int expiryFrame, NodeList& removedChildren);
/** Release the GL Objects of the children from the PagedLOD which haven't been visited since specified expiry time and expiry frame number.
* Return true if any children have release called upon them, false otherwise. */
virtual bool releaseGLObjectsOnExpiredChildren(double releaseTime, int releaseFrame);
virtual bool removeExpiredChildren(double expiryTime, unsigned int expiryFrame, NodeList& removedChildren);
protected :
@@ -152,7 +148,7 @@ class OSG_EXPORT PagedLOD : public LOD
ref_ptr<Referenced> _databaseOptions;
std::string _databasePath;
int _frameNumberOfLastTraversal;
unsigned int _frameNumberOfLastTraversal;
unsigned int _numChildrenThatCannotBeExpired;
bool _disableExternalChildrenPaging;

26
include/osg/Stats
View File

@@ -38,15 +38,15 @@ class OSG_EXPORT Stats : public osg::Referenced
void allocate(unsigned int numberOfFrames);
int getEarliestFrameNumber() const { return _latestFrameNumber < static_cast<int>(_attributeMapList.size()) ? 0 : _latestFrameNumber - static_cast<int>(_attributeMapList.size()) + 1; }
int getLatestFrameNumber() const { return _latestFrameNumber; }
unsigned int getEarliestFrameNumber() const { return _latestFrameNumber < static_cast<unsigned int>(_attributeMapList.size()) ? 0 : _latestFrameNumber - static_cast<unsigned int>(_attributeMapList.size()) + 1; }
unsigned int getLatestFrameNumber() const { return _latestFrameNumber; }
typedef std::map<std::string, double> AttributeMap;
typedef std::vector<AttributeMap> AttributeMapList;
bool setAttribute(int frameNumber, const std::string& attributeName, double value);
bool setAttribute(unsigned int frameNumber, const std::string& attributeName, double value);
inline bool getAttribute(int frameNumber, const std::string& attributeName, double& value) const
inline bool getAttribute(unsigned int frameNumber, const std::string& attributeName, double& value) const
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
return getAttributeNoMutex(frameNumber, attributeName, value);
@@ -54,15 +54,15 @@ class OSG_EXPORT Stats : public osg::Referenced
bool getAveragedAttribute(const std::string& attributeName, double& value, bool averageInInverseSpace=false) const;
bool getAveragedAttribute(int startFrameNumber, int endFrameNumber, const std::string& attributeName, double& value, bool averageInInverseSpace=false) const;
bool getAveragedAttribute(unsigned int startFrameNumber, unsigned int endFrameNumber, const std::string& attributeName, double& value, bool averageInInverseSpace=false) const;
inline AttributeMap& getAttributeMap(int frameNumber)
inline AttributeMap& getAttributeMap(unsigned int frameNumber)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
return getAttributeMapNoMutex(frameNumber);
}
inline const AttributeMap& getAttributeMap(int frameNumber) const
inline const AttributeMap& getAttributeMap(unsigned int frameNumber) const
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
return getAttributeMapNoMutex(frameNumber);
@@ -87,13 +87,13 @@ class OSG_EXPORT Stats : public osg::Referenced
virtual ~Stats() {}
bool getAttributeNoMutex(int frameNumber, const std::string& attributeName, double& value) const;
bool getAttributeNoMutex(unsigned int frameNumber, const std::string& attributeName, double& value) const;
AttributeMap& getAttributeMapNoMutex(int frameNumber);
const AttributeMap& getAttributeMapNoMutex(int frameNumber) const;
AttributeMap& getAttributeMapNoMutex(unsigned int frameNumber);
const AttributeMap& getAttributeMapNoMutex(unsigned int frameNumber) const;
int getIndex(int frameNumber) const
int getIndex(unsigned int frameNumber) const
{
// reject frame that are in the future
if (frameNumber > _latestFrameNumber) return -1;
@@ -109,8 +109,8 @@ class OSG_EXPORT Stats : public osg::Referenced
mutable OpenThreads::Mutex _mutex;
int _baseFrameNumber;
int _latestFrameNumber;
unsigned int _baseFrameNumber;
unsigned int _latestFrameNumber;
AttributeMapList _attributeMapList;
AttributeMap _invalidAttributeMap;

2
include/osg/Version
View File

@@ -21,7 +21,7 @@ extern "C" {
#define OPENSCENEGRAPH_MAJOR_VERSION 2
#define OPENSCENEGRAPH_MINOR_VERSION 9
#define OPENSCENEGRAPH_PATCH_VERSION 11
#define OPENSCENEGRAPH_SOVERSION 69
#define OPENSCENEGRAPH_SOVERSION 70
/* Convenience macro that can be used to decide whether a feature is present or not i.e.
* #if OSG_MIN_VERSION_REQUIRED(2,9,5)

18
include/osgDB/DatabasePager
View File

@@ -104,8 +104,8 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
void setName(const std::string& name) { _name = name; }
const std::string& getName() const { return _name; }
void setDone(bool done) { _done = done; }
bool getDone() const { return _done; }
void setDone(bool done) { _done.exchange(done?1:0); }
bool getDone() const { return _done!=0; }
void setActive(bool active) { _active = active; }
bool getActive() const { return _active; }
@@ -118,7 +118,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
virtual ~DatabaseThread();
volatile bool _done;
OpenThreads::Atomic _done;
volatile bool _active;
DatabasePager* _pager;
Mode _mode;
@@ -163,7 +163,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
/** Find all PagedLOD nodes in a subgraph and register them with
* the DatabasePager so it can keep track of expired nodes.
* note, should be only be called from the update thread. */
virtual void registerPagedLODs(osg::Node* subgraph, int frameNumber = 0);
virtual void registerPagedLODs(osg::Node* subgraph, unsigned int frameNumber = 0);
/** Set the incremental compile operation.
* Used to manage the OpenGL object compilation and merging of subgraphs in a way that avoids overloading
@@ -273,7 +273,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
virtual PagedLODList* clone() = 0;
virtual void clear() = 0;
virtual unsigned int size() = 0;
virtual void removeExpiredChildren(int numberChildrenToRemove, double expiryTime, int expiryFrame, ObjectList& childrenRemoved, bool visitActive) = 0;
virtual void removeExpiredChildren(int numberChildrenToRemove, double expiryTime, unsigned int expiryFrame, ObjectList& childrenRemoved, bool visitActive) = 0;
virtual void removeNodes(osg::NodeList& nodesToRemove) = 0;
virtual void insertPagedLOD(const osg::observer_ptr<osg::PagedLOD>& plod) = 0;
virtual bool containsPagedLOD(const osg::observer_ptr<osg::PagedLOD>& plod) const = 0;
@@ -309,10 +309,10 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
bool _valid;
std::string _fileName;
int _frameNumberFirstRequest;
unsigned int _frameNumberFirstRequest;
double _timestampFirstRequest;
float _priorityFirstRequest;
int _frameNumberLastRequest;
unsigned int _frameNumberLastRequest;
double _timestampLastRequest;
float _priorityLastRequest;
unsigned int _numOfRequests;
@@ -362,7 +362,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
DatabasePager* _pager;
RequestList _requestList;
OpenThreads::Mutex _requestMutex;
int _frameNumberLastPruned;
unsigned int _frameNumberLastPruned;
protected:
virtual ~RequestQueue();
@@ -427,7 +427,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
int _numFramesActive;
mutable OpenThreads::Mutex _numFramesActiveMutex;
volatile int _frameNumber;
OpenThreads::Atomic _frameNumber;
osg::ref_ptr<ReadQueue> _fileRequestQueue;
osg::ref_ptr<ReadQueue> _httpRequestQueue;

2
include/osgParticle/ParticleProcessor
View File

@@ -172,7 +172,7 @@ namespace osgParticle
//added- 1/17/06- bgandere@nps.edu
//a var to keep from doing multiple updates
int _frameNumber;
unsigned int _frameNumber;
};
// INLINE FUNCTIONS

6
include/osgParticle/ParticleSystem
View File

@@ -176,7 +176,7 @@ namespace osgParticle
inline virtual void reuseParticle(int i) { _deadparts.push(&(_particles[i])); }
/// Get the last frame number.
inline int getLastFrameNumber() const;
inline unsigned int getLastFrameNumber() const;
/// Get the unique delta time for emitters and updaters to use
inline double& getDeltaTime( double currentTime );
@@ -294,7 +294,7 @@ namespace osgParticle
bool _bounds_computed;
Particle _def_ptemp;
mutable int _last_frame;
mutable unsigned int _last_frame;
mutable bool _dirty_dt;
bool _freeze_on_cull;
@@ -403,7 +403,7 @@ namespace osgParticle
_particles[i].kill();
}
inline int ParticleSystem::getLastFrameNumber() const
inline unsigned int ParticleSystem::getLastFrameNumber() const
{
return _last_frame;
}

2
include/osgParticle/ParticleSystemUpdater
View File

@@ -89,7 +89,7 @@ namespace osgParticle
//added 1/17/06- bgandere@nps.edu
//a var to keep from doing multiple updates per frame
int _frameNumber;
unsigned int _frameNumber;
};
// INLINE FUNCTIONS

2
include/osgPresentation/CompileSlideCallback
View File

@@ -35,7 +35,7 @@ class OSGPRESENTATION_EXPORT CompileSlideCallback : public osg::Camera::DrawCall
virtual ~CompileSlideCallback() {}
mutable bool _needCompile;
mutable int _frameNumber;
mutable unsigned int _frameNumber;
osg::ref_ptr<osg::Node> _sceneToCompile;
};

2
include/osgQt/QGraphicsViewAdapter
View File

@@ -91,7 +91,7 @@ class OSGQT_EXPORT QGraphicsViewAdapter : public QObject
OpenThreads::Mutex _qimagesMutex;
OpenThreads::Mutex _qresizeMutex;
int _previousFrameNumber;
unsigned int _previousFrameNumber;
bool _newImageAvailable;
unsigned int _currentRead;
unsigned int _currentWrite;

4
include/osgSim/DOFTransform
View File

@@ -116,8 +116,8 @@ class OSGSIM_EXPORT DOFTransform : public osg::Transform
virtual ~DOFTransform() {}
int _previousTraversalNumber;
double _previousTime;
unsigned int _previousTraversalNumber;
double _previousTime;
osg::Vec3 _minHPR;
osg::Vec3 _maxHPR;

8
include/osgSim/ImpostorSprite
View File

@@ -71,10 +71,10 @@ class OSGSIM_EXPORT ImpostorSprite : public osg::Drawable
inline const osg::Vec3& getStoredLocalEyePoint() const { return _storedLocalEyePoint; }
/** Set the frame number for when the ImpostorSprite was last used in rendering. */
inline void setLastFrameUsed(int frameNumber) { _lastFrameUsed = frameNumber; }
inline void setLastFrameUsed(unsigned int frameNumber) { _lastFrameUsed = frameNumber; }
/** Get the frame number for when the ImpostorSprite was last used in rendering. */
inline int getLastFrameUsed() const { return _lastFrameUsed; }
inline unsigned int getLastFrameUsed() const { return _lastFrameUsed; }
/** Get the coordinates of the corners of the quad.
@@ -180,7 +180,7 @@ class OSGSIM_EXPORT ImpostorSprite : public osg::Drawable
ImpostorSprite* _previous;
ImpostorSprite* _next;
int _lastFrameUsed;
unsigned int _lastFrameUsed;
osg::Vec3 _storedLocalEyePoint;
@@ -212,7 +212,7 @@ class OSGSIM_EXPORT ImpostorSpriteManager : public osg::Referenced
void remove(ImpostorSprite* is);
ImpostorSprite* createOrReuseImpostorSprite(int s,int t,int frameNumber);
ImpostorSprite* createOrReuseImpostorSprite(int s,int t,unsigned int frameNumber);
osg::StateSet* createOrReuseStateSet();

2
include/osgUtil/TransformCallback
View File

@@ -40,7 +40,7 @@ class OSGUTIL_EXPORT TransformCallback : public osg::NodeCallback
osg::Vec3 _pivot;
osg::Vec3 _axis;
int _previousTraversalNumber;
unsigned int _previousTraversalNumber;
double _previousTime;
bool _pause;

2
include/osgViewer/Renderer
View File

@@ -29,7 +29,7 @@ class OSGVIEWER_EXPORT OpenGLQuerySupport : public osg::Referenced
virtual void checkQuery(osg::Stats* stats, osg::State* state,
osg::Timer_t startTick) = 0;
virtual void beginQuery(int frameNumber, osg::State* state) = 0;
virtual void beginQuery(unsigned int frameNumber, osg::State* state) = 0;
virtual void endQuery(osg::State* state) = 0;
virtual void initialize(osg::State* state, osg::Timer_t startTick);
protected: