From 6e65a9955ea98834fada08149df901a5e4eda65e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 21 Jul 2015 14:22:01 +0000 Subject: [PATCH] Added check for validity of OpenFlight shininess value. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@14999 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgPlugins/OpenFlight/PaletteRecords.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/OpenFlight/PaletteRecords.cpp b/src/osgPlugins/OpenFlight/PaletteRecords.cpp index 0afcdaf91..707f0ad38 100644 --- a/src/osgPlugins/OpenFlight/PaletteRecords.cpp +++ b/src/osgPlugins/OpenFlight/PaletteRecords.cpp @@ -220,7 +220,15 @@ protected: material->setDiffuse (osg::Material::FRONT_AND_BACK,osg::Vec4(diffuse,alpha)); material->setSpecular(osg::Material::FRONT_AND_BACK,osg::Vec4(specular,alpha)); material->setEmission(osg::Material::FRONT_AND_BACK,osg::Vec4(emissive,alpha)); - material->setShininess(osg::Material::FRONT_AND_BACK,shininess); + + if (shininess>=0.0f) + { + material->setShininess(osg::Material::FRONT_AND_BACK,shininess); + } + else + { + OSG_INFO<<"Warning: OpenFlight shininess value out of range: "<setDiffuse (osg::Material::FRONT_AND_BACK,osg::Vec4(diffuse,alpha)); material->setSpecular(osg::Material::FRONT_AND_BACK,osg::Vec4(specular,alpha)); material->setEmission(osg::Material::FRONT_AND_BACK,osg::Vec4(emissive,alpha)); - material->setShininess(osg::Material::FRONT_AND_BACK,shininess); + + if (shininess>=0.0f) + { + material->setShininess(osg::Material::FRONT_AND_BACK,shininess); + } + else + { + OSG_INFO<<"Warning: OpenFlight shininess value out of range: "<