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

Convesion of osg::notify to OSG_INFO etc.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-28 15:47:52 +00:00
parent e753be1b20
commit a79a8d30f9
67 changed files with 775 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/osg/Material.cpp
View File

@@ -92,7 +92,7 @@ void Material::setAmbient(Face face, const Vec4& ambient )
_ambientBack = _ambientFront;
break;
default:
notify(NOTICE)<<"Notice: invalid Face passed to Material::setAmbient()."<<std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::setAmbient()."<<std::endl;
}
}
@@ -108,12 +108,12 @@ const Vec4& Material::getAmbient(Face face) const
case(FRONT_AND_BACK):
if (!_ambientFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getAmbient(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK ambient colors."<< std::endl;
OSG_NOTICE<<"Notice: Material::getAmbient(FRONT_AND_BACK) called on material "<< std::endl;
OSG_NOTICE<<" with separate FRONT and BACK ambient colors."<< std::endl;
}
return _ambientFront;
}
notify(NOTICE)<<"Notice: invalid Face passed to Material::getAmbient()."<< std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::getAmbient()."<< std::endl;
return _ambientFront;
}
@@ -139,7 +139,7 @@ void Material::setDiffuse(Face face, const Vec4& diffuse )
_diffuseBack = _diffuseFront;
break;
default:
notify(NOTICE)<<"Notice: invalid Face passed to Material::setDiffuse()."<< std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::setDiffuse()."<< std::endl;
break;
}
}
@@ -156,12 +156,12 @@ const Vec4& Material::getDiffuse(Face face) const
case(FRONT_AND_BACK):
if (!_diffuseFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getDiffuse(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK diffuse colors."<< std::endl;
OSG_NOTICE<<"Notice: Material::getDiffuse(FRONT_AND_BACK) called on material "<< std::endl;
OSG_NOTICE<<" with separate FRONT and BACK diffuse colors."<< std::endl;
}
return _diffuseFront;
}
notify(NOTICE)<<"Notice: invalid Face passed to Material::getDiffuse()."<< std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::getDiffuse()."<< std::endl;
return _diffuseFront;
}
@@ -187,7 +187,7 @@ void Material::setSpecular(Face face, const Vec4& specular )
_specularBack = _specularFront;
break;
default:
notify(NOTICE)<<"Notice: invalid Face passed to Material::setSpecular()."<< std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::setSpecular()."<< std::endl;
break;
}
}
@@ -204,12 +204,12 @@ const Vec4& Material::getSpecular(Face face) const
case(FRONT_AND_BACK):
if (!_specularFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getSpecular(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK specular colors."<< std::endl;
OSG_NOTICE<<"Notice: Material::getSpecular(FRONT_AND_BACK) called on material "<< std::endl;
OSG_NOTICE<<" with separate FRONT and BACK specular colors."<< std::endl;
}
return _specularFront;
}
notify(NOTICE)<<"Notice: invalid Face passed to Material::getSpecular()."<< std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::getSpecular()."<< std::endl;
return _specularFront;
}
@@ -235,7 +235,7 @@ void Material::setEmission(Face face, const Vec4& emission )
_emissionBack = _emissionFront;
break;
default:
notify(NOTICE)<<"Notice: invalid Face passed to Material::setEmission()."<< std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::setEmission()."<< std::endl;
break;
}
}
@@ -252,12 +252,12 @@ const Vec4& Material::getEmission(Face face) const
case(FRONT_AND_BACK):
if (!_emissionFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getEmission(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK emission colors."<< std::endl;
OSG_NOTICE<<"Notice: Material::getEmission(FRONT_AND_BACK) called on material "<< std::endl;
OSG_NOTICE<<" with separate FRONT and BACK emission colors."<< std::endl;
}
return _emissionFront;
}
notify(NOTICE)<<"Notice: invalid Face passed to Material::getEmission()."<< std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::getEmission()."<< std::endl;
return _emissionFront;
}
@@ -282,7 +282,7 @@ void Material::setShininess(Face face, float shininess )
_shininessBack = shininess;
break;
default:
notify(NOTICE)<<"Notice: invalid Face passed to Material::setShininess()."<< std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::setShininess()."<< std::endl;
break;
}
}
@@ -299,12 +299,12 @@ float Material::getShininess(Face face) const
case(FRONT_AND_BACK):
if (!_shininessFrontAndBack)
{
notify(NOTICE)<<"Notice: Material::getShininess(FRONT_AND_BACK) called on material "<< std::endl;
notify(NOTICE)<<" with separate FRONT and BACK shininess colors."<< std::endl;
OSG_NOTICE<<"Notice: Material::getShininess(FRONT_AND_BACK) called on material "<< std::endl;
OSG_NOTICE<<" with separate FRONT and BACK shininess colors."<< std::endl;
}
return _shininessFront;
}
notify(NOTICE)<<"Notice: invalid Face passed to Material::getShininess()."<< std::endl;
OSG_NOTICE<<"Notice: invalid Face passed to Material::getShininess()."<< std::endl;
return _shininessFront;
}
@@ -439,6 +439,6 @@ void Material::apply(State&) const
glMaterialf( GL_BACK, GL_SHININESS, _shininessBack );
}
#else
osg::notify(osg::NOTICE)<<"Warning: Material::apply(State&) - not supported."<<std::endl;
OSG_NOTICE<<"Warning: Material::apply(State&) - not supported."<<std::endl;
#endif
}