Added support for osgVolue::SampleRatioProperty. Fixed build errors when compiling with ref_ptr<> automatic type conversion.

2014-01-21 18:48:53 +00:00
parent e48d6812fa
commit 1678dc3562
4 changed files with 62 additions and 39 deletions
--- a/include/osgPresentation/deprecated/SlideShowConstructor
+++ b/include/osgPresentation/deprecated/SlideShowConstructor
@@ -307,6 +307,7 @@ public:
            alphaValue("1.0"),
            cutoffValue("0.1"),
            sampleDensityValue("0.005"),
+            sampleRatioValue("1.0"),
            colorSpaceOperation(osg::NO_COLOR_SPACE_OPERATION),
            colorModulate(1.0f,1.0f,1.0f,1.0f),
            technique(RayTraced)
@@ -325,6 +326,9 @@ public:
        std::string                             sampleDensityValue;
        std::string                             sampleDensityWhenMovingValue;

+        std::string                             sampleRatioValue;
+        std::string                             sampleRatioWhenMovingValue;
+
        osg::ColorSpaceOperation                colorSpaceOperation;
        osg::Vec4                               colorModulate;
        Technique                               technique;