Changeset 3235

Timestamp:

08/05/04 12:01:32 (9 years ago)

Author:

robert

Message:

Added s/getClearColor and deprecated s/getBackgroundColor(). Re-implemented
setClearColor so that it passes on its value to Camera::setClearColor(), and
changed OsgSceneHandler? to use the Camera::getClearColor() on each new frame
to ensure that it reflects the settings of the camera correctly.

Location:

OpenSceneGraph/trunk

Files:

• include/osgProducer/OsgCameraGroup (modified) (2 diffs)
• src/osgProducer/OsgCameraGroup.cpp (modified) (4 diffs)
• src/osgProducer/OsgSceneHandler.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgProducer/OsgCameraGroup

@@ -106 +106 @@
 
 
-        void setBackgroundColor( const osg::Vec4& backgroundColor );
-
-        osg::Vec4& getBackgroundColor() { return _background_color; }
-
-        const osg::Vec4& getBackgroundColor() const { return _background_color; }
+#ifdef USE_DEPRECATED_API
+        void setBackgroundColor( const osg::Vec4& backgroundColor) { setClearColor(backgroundColor); }
+
+        const osg::Vec4& getBackgroundColor() const { return getClearColor(); }
+#endif
+
+        void setClearColor( const osg::Vec4& clearColor );
+
+        const osg::Vec4& getClearColor() const;
 
 
@@ -185 +189 @@
 
         osg::ref_ptr<osg::StateSet>             _global_stateset;
-        osg::Vec4                               _background_color;
+        osg::Vec4                               _clear_color;
         float                                   _LODScale;
         

OpenSceneGraph/trunk/src/osgProducer/OsgCameraGroup.cpp

@@ -213 +213 @@
     _scene_data = NULL;
     _global_stateset = NULL;
-    _background_color.set( 0.2f, 0.2f, 0.4f, 1.0f );
+    _clear_color.set( 0.2f, 0.2f, 0.4f, 1.0f );
     _LODScale = 1.0f;
 
@@ -296 +296 @@
         sv->setFrameStamp( _frameStamp.get() );
         sv->setGlobalStateSet( _global_stateset.get() );
-        sv->setClearColor( _background_color );
         sv->setLODScale( _LODScale );
         sv->setFusionDistance( _fusionDistanceMode, _fusionDistanceValue );
@@ -316 +315 @@
 }
 
-void OsgCameraGroup::setBackgroundColor( const osg::Vec4& backgroundColor ) 
-{
-    _background_color = backgroundColor;
-    setUpSceneViewsWithData();
+void OsgCameraGroup::setClearColor( const osg::Vec4& clearColor ) 
+{
+    _clear_color = clearColor;
+    for(unsigned int i=0;i<getNumberOfCameras();++i)
+    {
+        Producer::Camera *cam = _cfg->getCamera(i);
+        cam->setClearColor(_clear_color[0],_clear_color[1],_clear_color[2],_clear_color[3]);
+    }
+}
+
+const osg::Vec4& OsgCameraGroup::getClearColor() const
+{
+    return _clear_color;
 }
 
@@ -424 +432 @@
         Producer::Camera *cam = _cfg->getCamera(i);
         Producer::RenderSurface* rs = cam->getRenderSurface();
+        
+        cam->setClearColor(_clear_color[0],_clear_color[1],_clear_color[2],_clear_color[3]);
         
         // create the scene handler.

OpenSceneGraph/trunk/src/osgProducer/OsgSceneHandler.cpp

@@ -55 +55 @@
     _sceneView->setViewport( x, y, w, h );
 
+    osg::Vec4 clear_color;
+    cam.getClearColor(clear_color[0],clear_color[1],clear_color[2],clear_color[3]);
+    _sceneView->setClearColor(clear_color);
+
     _sceneView->cull();
 }