Changeset 9385

Timestamp:

12/17/08 18:11:13 (5 years ago)

Author:

robert

Message:

Fixed warnings

Location:

OpenSceneGraph/trunk/src/osgViewer

Files:

• CompositeViewer.cpp (modified) (1 diff)
• Renderer.cpp (modified) (1 diff)
• ScreenCaptureHandler.cpp (modified) (1 diff)
• StatsHandler.cpp (modified) (4 diffs)
• View.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

@@ -992 +992 @@
         View* view = vitr->get();
 
-        Scene* scene = view->getScene();
-
         {
             // call any camera update callbacks, but only traverse that callback, don't traverse its subgraph

OpenSceneGraph/trunk/src/osgViewer/Renderer.cpp

@@ -346 +346 @@
     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();

OpenSceneGraph/trunk/src/osgViewer/ScreenCaptureHandler.cpp

@@ -139 +139 @@
       _numTimeValuesRecorded(0),
       _timeForReadPixels(0.0),
+      _timeForMemCpy(0.0),
+      _timeForCaptureOperation(0.0),
       _timeForFullCopy(0.0),
-      _timeForMemCpy(0.0),
-      _captureOperation(0)
+      _timeForFullCopyAndOperation(0.0),
+      _previousFrameTick(0)
 {
     _previousFrameTick = osg::Timer::instance()->tick();

OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp

@@ -239 +239 @@
 {
     osgViewer::GraphicsWindow* window = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
-    osg::GraphicsContext* context;
     
     if (!window)
@@ -249 +248 @@
 
         window = windows.front();
-
-                
-        context = window;
-    }
-
-    _camera->setGraphicsContext(context);
-
-    _camera->setViewport(0, 0, context->getTraits()->width, context->getTraits()->height);
+    }
+
+    _camera->setGraphicsContext(window);
+
+    _camera->setViewport(0, 0, window->getTraits()->width, window->getTraits()->height);
     _camera->setRenderOrder(osg::Camera::POST_RENDER, 10);
 
@@ -829 +825 @@
         _maxValue(maxValue),
         _averageValue(averageValue),
-        _multiplier(multiplier),
         _filerequestlist(filerequestlist),
-        _compilelist(compilelist)
+        _compilelist(compilelist),
+        _multiplier(multiplier)
     {
     }
@@ -889 +885 @@
     osg::ref_ptr<osgText::Text> _filerequestlist;
     osg::ref_ptr<osgText::Text> _compilelist;
-    double _multiplier;
+    double              _multiplier;
     char                _tmpText[128];
     osg::Timer_t        _tickLastUpdated;

OpenSceneGraph/trunk/src/osgViewer/View.cpp

@@ -211 +211 @@
         rhs_osgViewer->_coordinateSystemNodePath.clear();
         
-        rhs_osgViewer->_displaySettings;
+        rhs_osgViewer->_displaySettings = 0;
     }
 #endif
@@ -1115 +1115 @@
     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;
@@ -1155 +1153 @@
     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);