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

2
src/osgViewer/CompositeViewer.cpp
View File

@@ -619,7 +619,7 @@ void CompositeViewer::advance(double simulationTime)
if (_done) return;
double prevousReferenceTime = _frameStamp->getReferenceTime();
int previousFrameNumber = _frameStamp->getFrameNumber();
unsigned int previousFrameNumber = _frameStamp->getFrameNumber();
_frameStamp->setFrameNumber(_frameStamp->getFrameNumber()+1);

20
src/osgViewer/Renderer.cpp
View File

@@ -45,12 +45,12 @@ class OSGVIEWER_EXPORT EXTQuerySupport : public OpenGLQuerySupport
public:
EXTQuerySupport();
void checkQuery(osg::Stats* stats, osg::State* state, osg::Timer_t startTick);
virtual void beginQuery(int frameNumber, osg::State* state);
virtual void beginQuery(unsigned int frameNumber, osg::State* state);
virtual void endQuery(osg::State* state);
virtual void initialize(osg::State* state, osg::Timer_t startTick);
protected:
GLuint createQueryObject();
typedef std::pair<GLuint, int> QueryFrameNumberPair;
typedef std::pair<GLuint, unsigned int> QueryFrameNumberPair;
typedef std::list<QueryFrameNumberPair> QueryFrameNumberList;
typedef std::vector<GLuint> QueryList;
@@ -118,7 +118,7 @@ GLuint EXTQuerySupport::createQueryObject()
}
}
void EXTQuerySupport::beginQuery(int frameNumber, osg::State* state)
void EXTQuerySupport::beginQuery(unsigned int frameNumber, osg::State* state)
{
GLuint query = createQueryObject();
_extensions->glBeginQuery(GL_TIME_ELAPSED, query);
@@ -148,7 +148,7 @@ public:
virtual void checkQuery(osg::Stats* stats, osg::State* state,
osg::Timer_t startTick);
virtual void beginQuery(int frameNumber, osg::State* state);
virtual void beginQuery(unsigned int frameNumber, osg::State* state);
virtual void endQuery(osg::State* state);
virtual void initialize(osg::State* state, osg::Timer_t startTick);
protected:
@@ -159,12 +159,12 @@ protected:
: queries(start_, end_), frameNumber(frameNumber_)
{
}
ActiveQuery(const QueryPair& queries_, int frameNumber_)
ActiveQuery(const QueryPair& queries_, unsigned int frameNumber_)
: queries(queries_), frameNumber(frameNumber_)
{
}
QueryPair queries;
int frameNumber;
unsigned int frameNumber;
};
typedef std::list<ActiveQuery> QueryFrameList;
typedef std::vector<QueryPair> QueryList;
@@ -177,7 +177,7 @@ void ARBQuerySupport::initialize(osg::State* state, osg::Timer_t startTick)
OpenGLQuerySupport::initialize(state, startTick);
}
void ARBQuerySupport::beginQuery(int frameNumber, osg::State* state)
void ARBQuerySupport::beginQuery(unsigned int frameNumber, osg::State* state)
{
QueryPair query;
if (_availableQueryObjects.empty())
@@ -531,7 +531,7 @@ void Renderer::cull()
osg::Stats* stats = sceneView->getCamera()->getStats();
osg::State* state = sceneView->getState();
const osg::FrameStamp* fs = state->getFrameStamp();
int frameNumber = fs ? fs->getFrameNumber() : 0;
unsigned int frameNumber = fs ? fs->getFrameNumber() : 0;
// do cull traversal
osg::Timer_t beforeCullTick = osg::Timer::instance()->tick();
@@ -643,7 +643,7 @@ void Renderer::draw()
osg::Stats* stats = sceneView->getCamera()->getStats();
osg::State* state = sceneView->getState();
int frameNumber = state->getFrameStamp()->getFrameNumber();
unsigned int frameNumber = state->getFrameStamp()->getFrameNumber();
if (!_initialized)
{
@@ -747,7 +747,7 @@ void Renderer::cull_draw()
osg::Stats* stats = sceneView->getCamera()->getStats();
osg::State* state = sceneView->getState();
const osg::FrameStamp* fs = state->getFrameStamp();
int frameNumber = fs ? fs->getFrameNumber() : 0;
unsigned int frameNumber = fs ? fs->getFrameNumber() : 0;
if (!_initialized)
{

15
src/osgViewer/StatsHandler.cpp
View File

@@ -219,7 +219,7 @@ bool StatsHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdap
}
}
for(int i = viewer->getViewerStats()->getEarliestFrameNumber(); i<= viewer->getViewerStats()->getLatestFrameNumber()-1; ++i)
for(unsigned int i = viewer->getViewerStats()->getEarliestFrameNumber(); i<= viewer->getViewerStats()->getLatestFrameNumber()-1; ++i)
{
for(StatsList::iterator itr = statsList.begin();
itr != statsList.end();
@@ -402,7 +402,7 @@ struct RawValueTextDrawCallback : public virtual osg::Drawable::DrawCallback
{
_tickLastUpdated = tick;
int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
unsigned int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
double value;
if (_stats->getAttribute(frameNumber, _attributeName, value))
{
@@ -469,7 +469,7 @@ struct CameraSceneStatsTextDrawCallback : public virtual osg::Drawable::DrawCall
viewStr << _camera->getName();
viewStr << std::endl;
int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
unsigned int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
if (!(renderer->getGraphicsThreadDoesCull()))
{
--frameNumber;
@@ -556,7 +556,7 @@ struct ViewSceneStatsTextDrawCallback : public virtual osg::Drawable::DrawCallba
viewStr << ": " << _view->getName();
viewStr << std::endl;
int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
unsigned int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
// if (!(renderer->getGraphicsThreadDoesCull()))
{
--frameNumber;
@@ -625,7 +625,6 @@ struct BlockDrawCallback : public virtual osg::Drawable::DrawCallback
osg::Vec3Array* vertices = (osg::Vec3Array*)geom->getVertexArray();
int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
int startFrame = frameNumber + _frameDelta - _numFrames + 1;
int endFrame = frameNumber + _frameDelta;
double referenceTime;
@@ -755,7 +754,7 @@ protected:
osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geometry->getVertexArray());
if (!vertices) return;
int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
unsigned int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
// Get stats
double value;
@@ -837,11 +836,11 @@ protected:
const float _max;
const std::string _nameBegin;
const std::string _nameEnd;
static int _frameNumber;
static unsigned int _frameNumber;
};
};
int StatsGraph::GraphUpdateCallback::_frameNumber = 0;
unsigned int StatsGraph::GraphUpdateCallback::_frameNumber = 0;
osg::Geometry* StatsHandler::createGeometry(const osg::Vec3& pos, float height, const osg::Vec4& colour, unsigned int numBlocks)

2
src/osgViewer/Viewer.cpp
View File

@@ -569,7 +569,7 @@ void Viewer::advance(double simulationTime)
if (_done) return;
double prevousReferenceTime = _frameStamp->getReferenceTime();
int previousFrameNumber = _frameStamp->getFrameNumber();
unsigned int previousFrameNumber = _frameStamp->getFrameNumber();
_frameStamp->setFrameNumber(_frameStamp->getFrameNumber()+1);

8
src/osgViewer/ViewerBase.cpp
View File

@@ -584,10 +584,10 @@ int ViewerBase::run()
realize();
}
const char* str = getenv("OSG_RUN_FRAME_COUNT");
int runTillFrameNumber = str==0 ? -1 : atoi(str);
const char* run_frame_count_str = getenv("OSG_RUN_FRAME_COUNT");
unsigned int runTillFrameNumber = run_frame_count_str==0 ? osg::UNINITIALIZED_FRAME_NUMBER : atoi(run_frame_count_str);
while(!done() && (runTillFrameNumber<0 || getViewerFrameStamp()->getFrameNumber()<runTillFrameNumber))
while(!done() && (run_frame_count_str==0 || getViewerFrameStamp()->getFrameNumber()<runTillFrameNumber))
{
double minFrameTime = _runMaxFrameRate>0.0 ? 1.0/_runMaxFrameRate : 0.0;
osg::Timer_t startFrameTick = osg::Timer::instance()->tick();
@@ -676,7 +676,7 @@ void ViewerBase::renderingTraversals()
if (getViewerStats() && getViewerStats()->collectStats("scene"))
{
int frameNumber = frameStamp ? frameStamp->getFrameNumber() : 0;
unsigned int frameNumber = frameStamp ? frameStamp->getFrameNumber() : 0;
Views views;
getViews(views);