From aea4d1a261f47aaafc8e09f6c2a07d7bc2fd83f5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 21 Feb 2012 10:42:59 +0000 Subject: [PATCH] Fixed warnings --- src/osgPlugins/dae/daeRMaterials.cpp | 10 ---------- src/osgPlugins/dae/daeWSceneObjects.cpp | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/osgPlugins/dae/daeRMaterials.cpp b/src/osgPlugins/dae/daeRMaterials.cpp index 22216e905..53511e876 100644 --- a/src/osgPlugins/dae/daeRMaterials.cpp +++ b/src/osgPlugins/dae/daeRMaterials.cpp @@ -307,7 +307,6 @@ void daeReader::processProfileCOMMON(osg::StateSet *ss, domProfile_COMMON *pc ) } } - xsNCName DiffuseTextureName = NULL; osg::ref_ptr< osg::Material > mat = new osg::Material(); // // elements: @@ -364,9 +363,6 @@ void daeReader::processProfileCOMMON(osg::StateSet *ss, domProfile_COMMON *pc ) ss->setTextureAttribute( textureUnit, new osg::TexEnv(osg::TexEnv::MODULATE) ); ss->setTextureAttribute( textureUnit, DiffuseStateAttribute ); } - - // Save the texture name for later - DiffuseTextureName = b->getDiffuse()->getTexture()->getTexture(); } else { @@ -441,9 +437,6 @@ void daeReader::processProfileCOMMON(osg::StateSet *ss, domProfile_COMMON *pc ) ss->setTextureAttribute( textureUnit, new osg::TexEnv(osg::TexEnv::MODULATE) ); ss->setTextureAttribute( textureUnit, DiffuseStateAttribute ); } - - // Save the texture name for later - DiffuseTextureName = p->getDiffuse()->getTexture()->getTexture(); } else { @@ -516,9 +509,6 @@ void daeReader::processProfileCOMMON(osg::StateSet *ss, domProfile_COMMON *pc ) ss->setTextureAttribute( textureUnit, new osg::TexEnv(osg::TexEnv::MODULATE) ); ss->setTextureAttribute( textureUnit, DiffuseStateAttribute ); } - - // Save the texture name for later - DiffuseTextureName = l->getDiffuse()->getTexture()->getTexture(); } else { diff --git a/src/osgPlugins/dae/daeWSceneObjects.cpp b/src/osgPlugins/dae/daeWSceneObjects.cpp index adaa515e6..12d51db8d 100644 --- a/src/osgPlugins/dae/daeWSceneObjects.cpp +++ b/src/osgPlugins/dae/daeWSceneObjects.cpp @@ -359,7 +359,7 @@ void daeWriter::apply( osg::LightSource &node ) osg::Vec3 direction = pOsgLight->getDirection(); osg::Vec4 ambientColor = pOsgLight->getAmbient(); osg::Vec4 diffuseColor = pOsgLight->getDiffuse(); - osg::Vec4 specularColor = pOsgLight->getSpecular(); + //osg::Vec4 specularColor = pOsgLight->getSpecular(); if (position.w() == 0) {