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

From Eric Sokolowsky. Added missing blend modes into .osg reading and writing

Browse Source 
and fixed typo.
This commit is contained in:
Robert Osfield
2004-06-28 12:52:13 +00:00
parent 20de9666dd
commit 6de63f097b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/osg/BlendFunc.cpp
View File

@@ -83,6 +83,8 @@ bool BlendFunc_matchModeStr(const char* str,int& mode)
else if (strcmp(str,"SRC_ALPHA_SATURATE")==0) mode = BlendFunc::SRC_ALPHA_SATURATE;
else if (strcmp(str,"SRC_COLOR")==0) mode = BlendFunc::SRC_COLOR;
else if (strcmp(str,"ZERO")==0) mode = BlendFunc::ZERO;
else if (strcmp(str,"CONSTANT_ALPHA")==0) mode = BlendFunc::CONSTANT_ALPHA;
else if (strcmp(str,"ONE_MINUS_CONSTANT_ALPHA")==0) mode = BlendFunc::ONE_MINUS_CONSTANT_ALPHA;
else return false;
return true;
@@ -103,6 +105,8 @@ const char* BlendFunc_getModeStr(int value)
case(BlendFunc::SRC_ALPHA_SATURATE) : return "SRC_ALPHA_SATURATE";
case(BlendFunc::SRC_COLOR) : return "SRC_COLOR";
case(BlendFunc::ZERO) : return "ZERO";
case(BlendFunc::CONSTANT_ALPHA) : return "CONSTANT_ALPHA";
case(BlendFunc::ONE_MINUS_CONSTANT_ALPHA): return "ONE_MINUS_CONSTANT_ALPHA";
}
return NULL;

2
src/osgProducer/ViewerEventHandler.cpp
View File

@@ -801,7 +801,7 @@ bool ViewerEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActio
{
if (osgDB::writeNodeFile(*node,_writeNodeFileName.c_str()))
{
std::cout<<"writen nodes to file "<<_writeNodeFileName<<std::endl;
std::cout<<"written nodes to file "<<_writeNodeFileName<<std::endl;
}
}