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

Changed the std::hex and std::dec to hex and dec to get it compile under VisualStudio,

Browse Source 
and added a using namespace std to keep it compiling on all other compilers!
This commit is contained in:
Robert Osfield
2002-12-16 10:05:55 +00:00
parent c6b6e200a4
commit 88424530b4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgPlugins/osg/LineStipple.cpp
View File

@@ -6,6 +6,7 @@
using namespace osg;
using namespace osgDB;
using namespace std;
// forward declare functions to use later.
bool LineStipple_readLocalData(Object& obj, Input& fr);
@@ -53,7 +54,7 @@ bool LineStipple_writeLocalData(const Object& obj,Output& fw)
const LineStipple& linestipple = static_cast<const LineStipple&>(obj);
fw.indent() << "factor " << linestipple.getFactor() << std::endl;
fw.indent() << "pattern 0x" << std::hex << linestipple.getPattern() << std::dec << std::endl;
fw.indent() << "pattern 0x" << hex << linestipple.getPattern() << dec << std::endl;
return true;
}

5
src/osgPlugins/osg/Stencil.cpp
View File

@@ -6,6 +6,7 @@
using namespace osg;
using namespace osgDB;
using namespace std;
// forward declare functions to use later.
bool Stencil_readLocalData(Object& obj, Input& fr);
@@ -106,13 +107,13 @@ bool Stencil_writeLocalData(const Object& obj,Output& fw)
fw.indent() << "function " << Stencil_getFuncStr(stencil.getFunction()) << std::endl;
fw.indent() << "functionRef " << stencil.getFunctionRef() << std::endl;
fw.indent() << "functionMask 0x" << std::hex << stencil.getFunctionMask() << std::dec << std::endl;
fw.indent() << "functionMask 0x" << hex << stencil.getFunctionMask() << dec << std::endl;
fw.indent() << "stencilFailOperation " << Stencil_getOperationStr(stencil.getStencilFailOperation()) << std::endl;
fw.indent() << "stencilPassAndDepthFailOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthFailOperation()) << std::endl;
fw.indent() << "stencilPassAndDepthPassOperation " << Stencil_getOperationStr(stencil.getStencilPassAndDepthPassOperation()) << std::endl;
fw.indent() << "writeMask 0x" << std::hex << stencil.getWriteMask() << std::dec << std::endl;
fw.indent() << "writeMask 0x" << hex << stencil.getWriteMask() << dec << std::endl;
return true;
}