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

4
examples/osganimationmakepath/osganimationmakepath.cpp
View File

@@ -88,7 +88,7 @@
osg::Timer_t _startTime;
osg::Timer_t _currentTime;
bool _playing;
int _lastUpdate;
unsigned int _lastUpdate;
};
@@ -150,7 +150,7 @@ public:
osg::Timer_t _startTime;
osg::Timer_t _currentTime;
bool _playing;
int _lastUpdate;
unsigned int _lastUpdate;
};
// This won't really give good results in any situation, but it does demonstrate

4
examples/osganimationnode/osganimationnode.cpp
View File

@@ -80,7 +80,7 @@ public:
osg::Timer_t _startTime;
osg::Timer_t _currentTime;
bool _playing;
int _lastUpdate;
unsigned int _lastUpdate;
};
@@ -143,7 +143,7 @@ public:
osg::Timer_t _startTime;
osg::Timer_t _currentTime;
bool _playing;
int _lastUpdate;
unsigned int _lastUpdate;
};

6
examples/osgmultitexturecontrol/osgmultitexturecontrol.cpp
View File

@@ -91,7 +91,7 @@ class ElevationLayerBlendingCallback : public osg::NodeCallback
typedef std::vector<double> Elevations;
ElevationLayerBlendingCallback(osgFX::MultiTextureControl* mtc, const Elevations& elevations, float animationTime=4.0f):
_previousFrame(-1),
_previousFrame(0),
_previousTime(0.0),
_animationTime(animationTime),
_currentElevation(0.0),
@@ -105,7 +105,7 @@ class ElevationLayerBlendingCallback : public osg::NodeCallback
{
float deltaTime = 0.01f;
if (_previousFrame!=-1)
if (_previousFrame!=0)
{
deltaTime = float(nv->getFrameStamp()->getReferenceTime() - _previousTime);
}
@@ -171,7 +171,7 @@ class ElevationLayerBlendingCallback : public osg::NodeCallback
traverse(node,nv);
}
int _previousFrame;
unsigned int _previousFrame;
double _previousTime;
float _animationTime;
double _currentElevation;

2
examples/osgposter/PosterPrinter.cpp
View File

@@ -43,7 +43,7 @@ public:
if ( nv->getFrameStamp() && updateTimeStamp )
{
double timeStamp = nv->getFrameStamp()?nv->getFrameStamp()->getReferenceTime():0.0;
int frameNumber = nv->getFrameStamp()?nv->getFrameStamp()->getFrameNumber():0;
unsigned int frameNumber = nv->getFrameStamp()?nv->getFrameStamp()->getFrameNumber():0;
pagedLOD->setFrameNumberOfLastTraversal( frameNumber );
pagedLOD->setTimeStamp( numChildren-1, timeStamp );

2
examples/osgposter/PosterPrinter.h
View File

@@ -142,7 +142,7 @@ protected:
bool _isRunning;
bool _isFinishing;
int _lastBindingFrame;
unsigned int _lastBindingFrame;
int _tileRows;
int _tileColumns;
int _currentRow;

6
examples/osguserstats/osguserstats.cpp
View File

@@ -87,7 +87,7 @@ void updateUserStats(osgViewer::Viewer& viewer)
// use that frame's timings because it's probably not finished
// rendering yet (in multithreaded viewer modes). So we'll use the
// timings for framenumber-2 for this demo.
int framenumber = viewer.getFrameStamp()->getFrameNumber();
unsigned int framenumber = viewer.getFrameStamp()->getFrameNumber();
// Get the update time and the viewer main camera's cull time. We use
// getAveragedAttribute() in order to get the actual time elapsed as
@@ -131,7 +131,7 @@ void startTiming(osgViewer::Viewer& viewer, const std::string& name)
{
osg::Timer_t tick = osg::Timer::instance()->tick();
double currentTime = osg::Timer::instance()->delta_s(viewer.getStartTick(), tick);
int framenumber = viewer.getFrameStamp()->getFrameNumber();
unsigned int framenumber = viewer.getFrameStamp()->getFrameNumber();
viewer.getViewerStats()->setAttribute(framenumber, name + " begin", currentTime);
}
@@ -142,7 +142,7 @@ void endTiming(osgViewer::Viewer& viewer, const std::string& name)
{
osg::Timer_t tick = osg::Timer::instance()->tick();
double currentTime = osg::Timer::instance()->delta_s(viewer.getStartTick(), tick);
int framenumber = viewer.getFrameStamp()->getFrameNumber();
unsigned int framenumber = viewer.getFrameStamp()->getFrameNumber();
viewer.getViewerStats()->setAttribute(framenumber, name + " end", currentTime);