Changeset 9385

Show
Ignore:
Timestamp:
12/17/08 18:11:13 (6 years ago)
Author:
robert
Message:

Fixed warnings

Location:
OpenSceneGraph/trunk/src/osgViewer
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

    r9209 r9385  
    992992        View* view = vitr->get(); 
    993993 
    994         Scene* scene = view->getScene(); 
    995  
    996994        { 
    997995            // call any camera update callbacks, but only traverse that callback, don't traverse its subgraph 
  • OpenSceneGraph/trunk/src/osgViewer/Renderer.cpp

    r9208 r9385  
    346346    DEBUG_MESSAGE<<"draw() "<<this<<std::endl; 
    347347 
    348     osg::Timer_t startDrawTick = osg::Timer::instance()->tick(); 
     348    // osg::Timer_t startDrawTick = osg::Timer::instance()->tick(); 
    349349 
    350350    osgUtil::SceneView* sceneView = _drawQueue.takeFront(); 
  • OpenSceneGraph/trunk/src/osgViewer/ScreenCaptureHandler.cpp

    r9343 r9385  
    139139      _numTimeValuesRecorded(0), 
    140140      _timeForReadPixels(0.0), 
     141      _timeForMemCpy(0.0), 
     142      _timeForCaptureOperation(0.0), 
    141143      _timeForFullCopy(0.0), 
    142       _timeForMemCpy(0.0), 
    143       _captureOperation(0) 
     144      _timeForFullCopyAndOperation(0.0), 
     145      _previousFrameTick(0) 
    144146{ 
    145147    _previousFrameTick = osg::Timer::instance()->tick(); 
  • OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp

    r9194 r9385  
    239239{ 
    240240    osgViewer::GraphicsWindow* window = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext()); 
    241     osg::GraphicsContext* context; 
    242241     
    243242    if (!window) 
     
    249248 
    250249        window = windows.front(); 
    251  
    252                  
    253         context = window; 
    254     } 
    255  
    256     _camera->setGraphicsContext(context); 
    257  
    258     _camera->setViewport(0, 0, context->getTraits()->width, context->getTraits()->height); 
     250    } 
     251 
     252    _camera->setGraphicsContext(window); 
     253 
     254    _camera->setViewport(0, 0, window->getTraits()->width, window->getTraits()->height); 
    259255    _camera->setRenderOrder(osg::Camera::POST_RENDER, 10); 
    260256 
     
    829825        _maxValue(maxValue), 
    830826        _averageValue(averageValue), 
    831         _multiplier(multiplier), 
    832827        _filerequestlist(filerequestlist), 
    833         _compilelist(compilelist) 
     828        _compilelist(compilelist), 
     829        _multiplier(multiplier) 
    834830    { 
    835831    } 
     
    889885    osg::ref_ptr<osgText::Text> _filerequestlist; 
    890886    osg::ref_ptr<osgText::Text> _compilelist; 
    891     double _multiplier; 
     887    double              _multiplier; 
    892888    char                _tmpText[128]; 
    893889    osg::Timer_t        _tickLastUpdated; 
  • OpenSceneGraph/trunk/src/osgViewer/View.cpp

    r9377 r9385  
    211211        rhs_osgViewer->_coordinateSystemNodePath.clear(); 
    212212         
    213         rhs_osgViewer->_displaySettings; 
     213        rhs_osgViewer->_displaySettings = 0; 
    214214    } 
    215215#endif 
     
    11151115    osg::Vec3d eye(0.0,0.0,0.0); 
    11161116     
    1117     bool centerProjection = false; 
    1118  
    11191117    double distance = sqrt(sphere_radius*sphere_radius - collar_radius*collar_radius); 
    11201118    bool flip = false; 
     
    11551153    osg::Vec3 screenCenter = origin + widthVector*0.5f + heightVector*0.5f; 
    11561154    float screenRadius = heightVector.length() * 0.5f; 
    1157  
    1158     double rotation = 0.0; 
    1159  
     1155     
    11601156    geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED); 
    11611157