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

updates for windows build.

Browse Source
This commit is contained in:
Robert Osfield
2001-12-15 10:00:43 +00:00
parent 478274ae7d
commit def6234d8c
25 changed files with 143 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgPlugins/osg/StateSet.cpp
View File

@@ -97,7 +97,7 @@ void initGLNames()
// itr!=s_GLNameToGLModeMap.end();
// ++itr)
// {
// cout << "Name ["<<itr->first<<","<<itr->second<<"]"<<endl;
// cout << "Name ["<<itr->first<<","<<itr->second<<"]"<< std::endl;
// }
first_time = false;
@@ -356,24 +356,24 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw)
switch(stateset.getRenderingHint())
{
case(StateSet::DEFAULT_BIN):
fw<<"DEFAULT_BIN"<<endl;
fw<<"DEFAULT_BIN"<< std::endl;
break;
case(StateSet::OPAQUE_BIN):
fw<<"OPAQUE_BIN"<<endl;
fw<<"OPAQUE_BIN"<< std::endl;
break;
case(StateSet::TRANSPARENT_BIN):
fw<<"TRANSPARENT_BIN"<<endl;
fw<<"TRANSPARENT_BIN"<< std::endl;
break;
default:
fw<<stateset.getRenderingHint()<<endl;
fw<<stateset.getRenderingHint()<< std::endl;
break;
}
fw.indent()<<"renderBinMode "<<StateSet_getRenderBinModeStr(stateset.getRenderBinMode())<<endl;
fw.indent()<<"renderBinMode "<<StateSet_getRenderBinModeStr(stateset.getRenderBinMode())<< std::endl;
if (stateset.getRenderBinMode()!=StateSet::INHERIT_RENDERBIN_DETAILS)
{
fw.indent()<<"binNumber "<<stateset.getBinNumber()<<endl;
fw.indent()<<"binName "<<stateset.getBinName()<<endl;
fw.indent()<<"binNumber "<<stateset.getBinNumber()<< std::endl;
fw.indent()<<"binName "<<stateset.getBinName()<< std::endl;
}
@@ -387,12 +387,12 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw)
GLModeToGLNameMap::iterator nitr = s_GLModeToGLNameMap.find(mitr->first);
if (nitr!=s_GLModeToGLNameMap.end())
{
fw.indent() << nitr->second << " " << StateSet_getModeStr(mitr->second) << endl;
fw.indent() << nitr->second << " " << StateSet_getModeStr(mitr->second) << std::endl;
}
else
{
// no name defined for GLMode so just pass its value to fw.
fw.indent() << "0x" << std::hex << (osg::uint)mitr->first << std::dec <<" " << StateSet_getModeStr(mitr->second) << endl;
fw.indent() << "0x" << std::hex << (osg::uint)mitr->first << std::dec <<" " << StateSet_getModeStr(mitr->second) << std::endl;
}
}