From 6de63f097b18749d6c9b82b1918c24ebc6c6a859 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 28 Jun 2004 12:52:13 +0000 Subject: [PATCH] From Eric Sokolowsky. Added missing blend modes into .osg reading and writing and fixed typo. --- src/osgPlugins/osg/BlendFunc.cpp | 4 ++++ src/osgProducer/ViewerEventHandler.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/osgPlugins/osg/BlendFunc.cpp b/src/osgPlugins/osg/BlendFunc.cpp index 162013283..337902339 100644 --- a/src/osgPlugins/osg/BlendFunc.cpp +++ b/src/osgPlugins/osg/BlendFunc.cpp @@ -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; diff --git a/src/osgProducer/ViewerEventHandler.cpp b/src/osgProducer/ViewerEventHandler.cpp index 1f1a19407..25010f006 100644 --- a/src/osgProducer/ViewerEventHandler.cpp +++ b/src/osgProducer/ViewerEventHandler.cpp @@ -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<