Fixed warnings
This commit is contained in:
parent
c01ed02147
commit
288e1853b9
@ -991,8 +991,6 @@ void CompositeViewer::updateTraversal()
|
||||
{
|
||||
View* view = vitr->get();
|
||||
|
||||
Scene* scene = view->getScene();
|
||||
|
||||
{
|
||||
// call any camera update callbacks, but only traverse that callback, don't traverse its subgraph
|
||||
// leave that to the scene update traversal.
|
||||
|
@ -345,7 +345,7 @@ void Renderer::draw()
|
||||
{
|
||||
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();
|
||||
|
||||
|
@ -138,9 +138,11 @@ WindowCaptureCallback::ContextData::ContextData(osg::GraphicsContext* gc, Mode m
|
||||
_reportTimingFrequency(100),
|
||||
_numTimeValuesRecorded(0),
|
||||
_timeForReadPixels(0.0),
|
||||
_timeForFullCopy(0.0),
|
||||
_timeForMemCpy(0.0),
|
||||
_captureOperation(0)
|
||||
_timeForCaptureOperation(0.0),
|
||||
_timeForFullCopy(0.0),
|
||||
_timeForFullCopyAndOperation(0.0),
|
||||
_previousFrameTick(0)
|
||||
{
|
||||
_previousFrameTick = osg::Timer::instance()->tick();
|
||||
|
||||
|
@ -238,7 +238,6 @@ void StatsHandler::reset()
|
||||
void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
|
||||
{
|
||||
osgViewer::GraphicsWindow* window = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
|
||||
osg::GraphicsContext* context;
|
||||
|
||||
if (!window)
|
||||
{
|
||||
@ -248,14 +247,11 @@ void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
|
||||
if (windows.empty()) return;
|
||||
|
||||
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->setProjectionMatrix(osg::Matrix::ortho2D(0,1280,0,1024));
|
||||
@ -828,9 +824,9 @@ struct PagerCallback : public virtual osg::NodeCallback
|
||||
_minValue(minValue),
|
||||
_maxValue(maxValue),
|
||||
_averageValue(averageValue),
|
||||
_multiplier(multiplier),
|
||||
_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> _filerequestlist;
|
||||
osg::ref_ptr<osgText::Text> _compilelist;
|
||||
double _multiplier;
|
||||
double _multiplier;
|
||||
char _tmpText[128];
|
||||
osg::Timer_t _tickLastUpdated;
|
||||
};
|
||||
|
@ -210,7 +210,7 @@ void View::take(osg::View& rhs)
|
||||
|
||||
rhs_osgViewer->_coordinateSystemNodePath.clear();
|
||||
|
||||
rhs_osgViewer->_displaySettings;
|
||||
rhs_osgViewer->_displaySettings = 0;
|
||||
}
|
||||
#endif
|
||||
computeActiveCoordinateSystemNodePath();
|
||||
@ -1114,8 +1114,6 @@ static osg::Geometry* createParoramicSphericalDisplayDistortionMesh(const osg::V
|
||||
osg::Vec3d center(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);
|
||||
bool 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;
|
||||
float screenRadius = heightVector.length() * 0.5f;
|
||||
|
||||
double rotation = 0.0;
|
||||
|
||||
|
||||
geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
|
||||
|
||||
for(int i=0;i<noSteps;++i)
|
||||
|
Loading…
Reference in New Issue
Block a user