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

Fixed warnings

Browse Source
This commit is contained in:
Robert Osfield 2008-12-17 17:11:13 +00:00
parent c01ed02147
commit 288e1853b9
5 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgViewer/CompositeViewer.cpp
View File

@ -991,8 +991,6 @@ void CompositeViewer::updateTraversal()
{ {
View* view = vitr->get(); View* view = vitr->get();
Scene* scene = view->getScene();
{ {
// call any camera update callbacks, but only traverse that callback, don't traverse its subgraph // call any camera update callbacks, but only traverse that callback, don't traverse its subgraph
// leave that to the scene update traversal. // leave that to the scene update traversal.

2
src/osgViewer/Renderer.cpp
View File

@ -345,7 +345,7 @@ void Renderer::draw()
{ {
DEBUG_MESSAGE<<"draw() "<<this<<std::endl; DEBUG_MESSAGE<<"draw() "<<this<<std::endl;
osg::Timer_t startDrawTick = osg::Timer::instance()->tick(); // osg::Timer_t startDrawTick = osg::Timer::instance()->tick();
osgUtil::SceneView* sceneView = _drawQueue.takeFront(); osgUtil::SceneView* sceneView = _drawQueue.takeFront();

6
src/osgViewer/ScreenCaptureHandler.cpp
View File

@ -138,9 +138,11 @@ WindowCaptureCallback::ContextData::ContextData(osg::GraphicsContext* gc, Mode m
_reportTimingFrequency(100), _reportTimingFrequency(100),
_numTimeValuesRecorded(0), _numTimeValuesRecorded(0),
_timeForReadPixels(0.0), _timeForReadPixels(0.0),
_timeForFullCopy(0.0),
_timeForMemCpy(0.0), _timeForMemCpy(0.0),
_captureOperation(0) _timeForCaptureOperation(0.0),
_timeForFullCopy(0.0),
_timeForFullCopyAndOperation(0.0),
_previousFrameTick(0)
{ {
_previousFrameTick = osg::Timer::instance()->tick(); _previousFrameTick = osg::Timer::instance()->tick();

14
src/osgViewer/StatsHandler.cpp
View File

@ -238,7 +238,6 @@ void StatsHandler::reset()
void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer) void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
{ {
osgViewer::GraphicsWindow* window = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext()); osgViewer::GraphicsWindow* window = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
osg::GraphicsContext* context;
if (!window) if (!window)
{ {
@ -248,14 +247,11 @@ void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
if (windows.empty()) return; if (windows.empty()) return;
window = windows.front(); window = windows.front();
context = window;
} }
_camera->setGraphicsContext(context); _camera->setGraphicsContext(window);
_camera->setViewport(0, 0, context->getTraits()->width, context->getTraits()->height); _camera->setViewport(0, 0, window->getTraits()->width, window->getTraits()->height);
_camera->setRenderOrder(osg::Camera::POST_RENDER, 10); _camera->setRenderOrder(osg::Camera::POST_RENDER, 10);
_camera->setProjectionMatrix(osg::Matrix::ortho2D(0,1280,0,1024)); _camera->setProjectionMatrix(osg::Matrix::ortho2D(0,1280,0,1024));
@ -828,9 +824,9 @@ struct PagerCallback : public virtual osg::NodeCallback
_minValue(minValue), _minValue(minValue),
_maxValue(maxValue), _maxValue(maxValue),
_averageValue(averageValue), _averageValue(averageValue),
_multiplier(multiplier),
_filerequestlist(filerequestlist), _filerequestlist(filerequestlist),
_compilelist(compilelist) _compilelist(compilelist),
_multiplier(multiplier)
{ {
} }
@ -888,7 +884,7 @@ struct PagerCallback : public virtual osg::NodeCallback
osg::ref_ptr<osgText::Text> _averageValue; osg::ref_ptr<osgText::Text> _averageValue;
osg::ref_ptr<osgText::Text> _filerequestlist; osg::ref_ptr<osgText::Text> _filerequestlist;
osg::ref_ptr<osgText::Text> _compilelist; osg::ref_ptr<osgText::Text> _compilelist;
double _multiplier; double _multiplier;
char _tmpText[128]; char _tmpText[128];
osg::Timer_t _tickLastUpdated; osg::Timer_t _tickLastUpdated;
}; };

8
src/osgViewer/View.cpp
View File

@ -210,7 +210,7 @@ void View::take(osg::View& rhs)
rhs_osgViewer->_coordinateSystemNodePath.clear(); rhs_osgViewer->_coordinateSystemNodePath.clear();
rhs_osgViewer->_displaySettings; rhs_osgViewer->_displaySettings = 0;
} }
#endif #endif
computeActiveCoordinateSystemNodePath(); computeActiveCoordinateSystemNodePath();
@ -1114,8 +1114,6 @@ static osg::Geometry* createParoramicSphericalDisplayDistortionMesh(const osg::V
osg::Vec3d center(0.0,0.0,0.0); osg::Vec3d center(0.0,0.0,0.0);
osg::Vec3d eye(0.0,0.0,0.0); osg::Vec3d eye(0.0,0.0,0.0);
bool centerProjection = false;
double distance = sqrt(sphere_radius*sphere_radius - collar_radius*collar_radius); double distance = sqrt(sphere_radius*sphere_radius - collar_radius*collar_radius);
bool flip = false; bool flip = false;
bool texcoord_flip = false; bool texcoord_flip = false;
@ -1154,9 +1152,7 @@ static osg::Geometry* createParoramicSphericalDisplayDistortionMesh(const osg::V
osg::Vec3 screenCenter = origin + widthVector*0.5f + heightVector*0.5f; osg::Vec3 screenCenter = origin + widthVector*0.5f + heightVector*0.5f;
float screenRadius = heightVector.length() * 0.5f; float screenRadius = heightVector.length() * 0.5f;
double rotation = 0.0;
geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED); geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
for(int i=0;i<noSteps;++i) for(int i=0;i<noSteps;++i)