From 92a6b0020d870e7669ae19af487e1109ed83e8b6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 20 Apr 2010 10:35:33 +0000 Subject: [PATCH] Changed the AbmientBias type from Vec2d to Vec2 as use of double is inappropriate. --- include/osgShadow/ParallelSplitShadowMap | 8 ++++---- src/osgShadow/ParallelSplitShadowMap.cpp | 4 ++-- .../serializers/osgShadow/ParallelSplitShadowMap.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/osgShadow/ParallelSplitShadowMap b/include/osgShadow/ParallelSplitShadowMap index d71f6b4f2..93c6a8d03 100644 --- a/include/osgShadow/ParallelSplitShadowMap +++ b/include/osgShadow/ParallelSplitShadowMap @@ -100,10 +100,10 @@ class OSGSHADOW_EXPORT ParallelSplitShadowMap : public ShadowTechnique inline const osg::Light* getUserLight() const { return _userLight; } /** Set the values for the ambient bias the shader will use.*/ - void setAmbientBias(const osg::Vec2d& ambientBias ); + void setAmbientBias(const osg::Vec2& ambientBias ); /** Get the values for the ambient bias the shader will use.*/ - const osg::Vec2d& getAmbientBias() const { return _ambientBias; } + const osg::Vec2& getAmbientBias() const { return _ambientBias; } /** * you can overwrite the fragment shader if you like to modify it yourself, own fragment shader can be used @@ -190,7 +190,7 @@ class OSGSHADOW_EXPORT ParallelSplitShadowMap : public ShadowTechnique bool _debug_color_in_GLSL; - osg::Vec2f _polgyonOffset; + osg::Vec2 _polgyonOffset; bool _user_polgyonOffset_set; unsigned int _resolution; @@ -209,7 +209,7 @@ class OSGSHADOW_EXPORT ParallelSplitShadowMap : public ShadowTechnique SplitCalcMode _SplitCalcMode; osg::Uniform* _ambientBiasUniform; - osg::Vec2d _ambientBias; + osg::Vec2 _ambientBias; }; } diff --git a/src/osgShadow/ParallelSplitShadowMap.cpp b/src/osgShadow/ParallelSplitShadowMap.cpp index 738966a96..09816a88b 100644 --- a/src/osgShadow/ParallelSplitShadowMap.cpp +++ b/src/osgShadow/ParallelSplitShadowMap.cpp @@ -244,7 +244,7 @@ ParallelSplitShadowMap::ParallelSplitShadowMap(osg::Geode** gr, int icountplanes _userLight(NULL), _GLSL_shadow_filtered(true), _ambientBiasUniform(NULL), - _ambientBias(0.1,0.3) + _ambientBias(0.1f,0.3f) { _displayTexturesGroupingNode = gr; _number_of_splits = icountplanes; @@ -275,7 +275,7 @@ ParallelSplitShadowMap::ParallelSplitShadowMap(const ParallelSplitShadowMap& cop { } -void ParallelSplitShadowMap::setAmbientBias(const osg::Vec2d& ambientBias) +void ParallelSplitShadowMap::setAmbientBias(const osg::Vec2& ambientBias) { _ambientBias = ambientBias; if (_ambientBiasUniform ) _ambientBiasUniform->set(osg::Vec2f(_ambientBias.x(), _ambientBias.y())); diff --git a/src/osgWrappers/serializers/osgShadow/ParallelSplitShadowMap.cpp b/src/osgWrappers/serializers/osgShadow/ParallelSplitShadowMap.cpp index bb3e8972e..0a2f47d63 100644 --- a/src/osgWrappers/serializers/osgShadow/ParallelSplitShadowMap.cpp +++ b/src/osgWrappers/serializers/osgShadow/ParallelSplitShadowMap.cpp @@ -16,7 +16,7 @@ REGISTER_OBJECT_WRAPPER( osgShadow_ParallelSplitShadowMap, ADD_DOUBLE_SERIALIZER( MoveVCamBehindRCamFactor, 0.0 ); // _move_vcam_behind_rcam_factor ADD_DOUBLE_SERIALIZER( MinNearDistanceForSplits, 5.0 ); // _split_min_near_dist ADD_OBJECT_SERIALIZER( UserLight, osg::Light, NULL ); // _userLight - ADD_VEC2D_SERIALIZER( AmbientBias, osg::Vec2d() ); // _ambientBias + ADD_VEC2_SERIALIZER( AmbientBias, osg::Vec2() ); // _ambientBias BEGIN_ENUM_SERIALIZER2( SplitCalculationMode, osgShadow::ParallelSplitShadowMap::SplitCalcMode, SPLIT_EXP ); ADD_ENUM_VALUE( SPLIT_LINEAR );