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

Fixed warnings

Browse Source
This commit is contained in:
Robert Osfield
2012-02-21 10:42:59 +00:00
parent 67ce0d5244
commit aea4d1a261
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/dae/daeRMaterials.cpp
View File

@@ -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();
// <blinn>
// 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
{

2
src/osgPlugins/dae/daeWSceneObjects.cpp
View File

@@ -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)
{