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

Fixed OsgCameraGroup::setLODScale so that it now uses the local CullSettings

Browse Source 
objects.
This commit is contained in:
Robert Osfield
2004-10-18 18:56:26 +00:00
parent b79337d7f8
commit ebab2ccab4
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgProducer/OsgCameraGroup
View File

@@ -126,7 +126,7 @@ class OSGPRODUCER_EXPORT OsgCameraGroup : public Producer::CameraGroup
void setLODScale( float scale );
float getLODScale() const { return _LODScale; }
float getLODScale() const;
void setFusionDistance( osgUtil::SceneView::FusionDistanceMode mode,float value=1.0f);
@@ -197,7 +197,6 @@ class OSGPRODUCER_EXPORT OsgCameraGroup : public Producer::CameraGroup
osg::ref_ptr<osg::StateSet> _global_stateset;
osg::Vec4 _clear_color;
float _LODScale;
osgUtil::SceneView::FusionDistanceMode _fusionDistanceMode;
float _fusionDistanceValue;

10
src/osgProducer/OsgCameraGroup.cpp
View File

@@ -213,7 +213,6 @@ void OsgCameraGroup::_init()
_scene_data = NULL;
_global_stateset = NULL;
_clear_color.set( 0.2f, 0.2f, 0.4f, 1.0f );
_LODScale = 1.0f;
_fusionDistanceMode = osgUtil::SceneView::PROPORTIONAL_TO_SCREEN_DISTANCE;
_fusionDistanceValue = 1.0f;
@@ -295,7 +294,6 @@ void OsgCameraGroup::setUpSceneViewsWithData()
sv->setFrameStamp( _frameStamp.get() );
sv->setGlobalStateSet( _global_stateset.get() );
sv->setLODScale( _LODScale );
sv->setFusionDistance( _fusionDistanceMode, _fusionDistanceValue );
}
}
@@ -331,11 +329,15 @@ const osg::Vec4& OsgCameraGroup::getClearColor() const
void OsgCameraGroup::setLODScale( float scale )
{
// need to set a local variable?
_LODScale = scale;
getCullSettings().setLODScale(scale);
setUpSceneViewsWithData();
}
float OsgCameraGroup::getLODScale() const
{
return getCullSettings().getLODScale();
}
void OsgCameraGroup::setFusionDistance( osgUtil::SceneView::FusionDistanceMode mode,float value)
{
// need to set a local variable?