Added osg::BlendFunci, osg::BlendEquationi and osg::ColorMaski StateAttrirbutes that wrap the glBlendFunci, glBlendEquationi and glColorMaski functions

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14563 16af8721-9629-0410-8352-f15c8da7e697

include/osg/BlendEquation

@@ -110,6 +110,9 @@ class OSG_EXPORT BlendEquation : public StateAttribute
 
             void (GL_APIENTRY * glBlendEquation)(GLenum mode);
             void (GL_APIENTRY * glBlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha);
+
+            void (GL_APIENTRY * glBlendEquationi)(GLuint buf,  GLenum mode);
+            void (GL_APIENTRY * glBlendEquationSeparatei)(GLuint buf, GLenum modeRGB, GLenum modeAlpha);
         };
 
     protected :

include/osg/BlendEquationi

@@ -0,0 +1,78 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSG_BLENDEQUATIONI
+#define OSG_BLENDEQUATIONI 1
+
+#include <osg/BlendEquation>
+
+namespace osg {
+
+/** Encapsulates glBlendEquationi function : the index version of glBlendEquation for multiple render target.
+*/
+class OSG_EXPORT BlendEquationi : public BlendEquation
+{
+    public :
+
+        BlendEquationi();
+
+        BlendEquationi(unsigned int buf, Equation equation):
+            BlendEquation(equation),
+            _index(buf) {}
+
+        BlendEquationi(unsigned int buf, Equation equationRGB, Equation equationAlpha):
+            BlendEquation(equationRGB, equationAlpha),
+            _index(buf) {}
+            
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        BlendEquationi(const BlendEquationi& cm,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
+            BlendEquation(cm,copyop),
+            _index(cm._index) {}
+
+        META_StateAttribute(osg, BlendEquationi, BLENDEQUATION);
+
+        /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
+        virtual int compare(const StateAttribute& sa) const
+        {
+            // Check for equal types, then create the rhs variable
+            // used by the COMPARE_StateAttribute_Parameter macros below.
+            COMPARE_StateAttribute_Types(BlendEquationi,sa)
+
+            COMPARE_StateAttribute_Parameter(_index);
+
+            return BlendEquation::compare(sa);
+        }
+
+        /** Return the buffer index as the member identifier.*/
+        virtual unsigned int getMember() const { return _index; }
+
+        /** Set the renderbuffer index of the BlendEquationi. */
+        void setIndex(unsigned int buf) { _index = buf; }
+
+        /** Get the renderbuffer index of the BlendEquationi. */
+        unsigned int getIndex() const { return _index; }
+
+        virtual void apply(State& state) const;
+
+    protected:
+
+        virtual ~BlendEquationi();
+
+        unsigned int    _index;
+
+};
+
+}
+
+#endif

include/osg/BlendFunc

@@ -15,8 +15,6 @@
 #define OSG_BLENDFUNC 1
 
 #include <osg/StateAttribute>
-#include <osg/GLExtensions>
-
 
 #ifndef GL_VERSION_1_2
 #define GL_CONSTANT_COLOR                 0x8001
@@ -166,6 +164,9 @@ class OSG_EXPORT BlendFunc : public StateAttribute
 
             bool                isBlendFuncSeparateSupported;
             void (GL_APIENTRY * glBlendFuncSeparate) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha) ;
+
+            void (GL_APIENTRY * glBlendFunci) (GLuint buf, GLenum src, GLenum dst);
+            void (GL_APIENTRY * glBlendFuncSeparatei) (GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha) ;
         };
 
 

include/osg/BlendFunci

@@ -0,0 +1,77 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSG_BLENDFUNCI
+#define OSG_BLENDFUNCI 1
+
+#include <osg/BlendFunc>
+
+namespace osg {
+
+/** Encapsulates glBlendFunci function : the index version of glBlendEquation for multiple render target.
+*/
+class OSG_EXPORT BlendFunci : public BlendFunc
+{
+    public :
+
+        BlendFunci();
+
+        BlendFunci(unsigned int buf, GLenum source, GLenum destination):
+            BlendFunc(source, destination),
+            _index(buf) {}
+
+        BlendFunci(unsigned int buf, GLenum source, GLenum destination, GLenum source_alpha, GLenum destination_alpha):
+            BlendFunc(source, destination, source_alpha, destination_alpha),
+            _index(buf) {}
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        BlendFunci(const BlendFunci& cm,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
+            BlendFunc(cm,copyop),
+            _index(cm._index) {}
+
+        META_StateAttribute(osg, BlendFunci, BLENDFUNC);
+
+        /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
+        virtual int compare(const StateAttribute& sa) const
+        {
+            // Check for equal types, then create the rhs variable
+            // used by the COMPARE_StateAttribute_Parameter macros below.
+            COMPARE_StateAttribute_Types(BlendFunci,sa)
+
+            COMPARE_StateAttribute_Parameter(_index);
+
+            return BlendFunc::compare(sa);
+        }
+
+        /** Return the buffer index as the member identifier.*/
+        virtual unsigned int getMember() const { return _index; }
+
+        /** Set the renderbuffer index of the BlendFunci. */
+        void setIndex(unsigned int buf) { _index = buf; }
+
+        /** Get the renderbuffer index of the BlendFunci. */
+        unsigned int getIndex() const { return _index; }
+
+        virtual void apply(State& state) const;
+
+    protected:
+
+        virtual ~BlendFunci();
+
+        unsigned int    _index;
+
+};
+
+}
+
+#endif

include/osg/ColorMaski

@@ -0,0 +1,81 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSG_COLORMASKI
+#define OSG_COLORMASKI 1
+
+#include <osg/ColorMask>
+
+namespace osg {
+
+/** Encapsulates glColorMaski function : the index version of glColorMask for multiple render target.
+*/
+class OSG_EXPORT ColorMaski : public ColorMask
+{
+    public :
+
+        ColorMaski();
+
+        ColorMaski(unsigned int buf, bool red, bool green, bool blue, bool alpha):
+            ColorMask(red, green,blue,alpha),
+            _index(buf) {}
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        ColorMaski(const ColorMaski& cm,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
+            ColorMask(cm,copyop),
+            _index(cm._index) {}
+
+        META_StateAttribute(osg, ColorMaski, COLORMASK);
+
+        /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
+        virtual int compare(const StateAttribute& sa) const
+        {
+            // Check for equal types, then create the rhs variable
+            // used by the COMPARE_StateAttribute_Parameter macros below.
+            COMPARE_StateAttribute_Types(ColorMaski,sa)
+
+            COMPARE_StateAttribute_Parameter(_index);
+
+            return ColorMask::compare(sa);
+        }
+
+        /** Return the buffer index as the member identifier.*/
+        virtual unsigned int getMember() const { return _index; }
+
+        /** Set the renderbuffer index of the ColorMaski. */
+        void setIndex(unsigned int buf) { _index = buf; }
+
+        /** Get the renderbuffer index of the ColorMaski. */
+        unsigned int getIndex() const { return _index; }
+
+        virtual void apply(State& state) const;
+
+        /** Encapsulates queries of extension availability, obtains extension function pointers. */
+        struct OSG_EXPORT Extensions : public osg::Referenced
+        {
+            Extensions(unsigned int contextID);
+
+            void (GL_APIENTRY * glColorMaski)(GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+        };
+
+    protected:
+
+        virtual ~ColorMaski();
+
+        unsigned int    _index;
+
+};
+
+}
+
+#endif

src/osg/BlendEquation.cpp

@@ -40,6 +40,9 @@ BlendEquation::Extensions::Extensions(unsigned int contextID)
 
     setGLExtensionFuncPtr(glBlendEquation, "glBlendEquation", "glBlendEquationEXT");
     setGLExtensionFuncPtr(glBlendEquationSeparate, "glBlendEquationSeparate", "glBlendEquationSeparateEXT");
+
+    setGLExtensionFuncPtr(glBlendEquationi, "glBlendEquationi", "glBlendEquationiARB");
+    setGLExtensionFuncPtr(glBlendEquationSeparatei, "glBlendEquationSeparatei", "glBlendEquationSeparateiARB");
 }
 
 BlendEquation::BlendEquation():

src/osg/BlendEquationi.cpp

@@ -0,0 +1,55 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+#include <osg/BlendEquationi>
+#include <osg/GLExtensions>
+#include <osg/State>
+
+using namespace osg;
+
+BlendEquationi::BlendEquationi():
+    _index(0)
+{
+}
+
+
+BlendEquationi::~BlendEquationi()
+{
+}
+
+void BlendEquationi::apply(State& state) const
+{
+    const Extensions* extensions = state.get<Extensions>();
+    if (_equationRGB == _equationAlpha)
+    {
+        if (extensions->glBlendEquationi)
+        {
+            extensions->glBlendEquationi(static_cast<GLuint>(_index), static_cast<GLenum>(_equationRGB));
+        }
+        else
+        {
+            OSG_WARN<<"Warning: BlendEquationi::apply(..) not supported by OpenGL driver." << std::endl;
+        }
+    }
+    else
+    {
+        if (extensions->glBlendEquationSeparatei)
+        {
+            extensions->glBlendEquationSeparatei(static_cast<GLuint>(_index), static_cast<GLenum>(_equationRGB), static_cast<GLenum>(_equationAlpha));
+        }
+        else
+        {
+            OSG_WARN<<"Warning: BlendEquation::apply(..) failed, glBlendEquationSeparatei not supported by OpenGL driver." << std::endl;
+        }
+    }
+}
+

src/osg/BlendFunc.cpp

@@ -25,6 +25,9 @@ BlendFunc::Extensions::Extensions(unsigned int contextID)
                                     strncmp((const char*)glGetString(GL_VERSION), "1.4", 3) >= 0;
 
     setGLExtensionFuncPtr(glBlendFuncSeparate, "glBlendFuncSeparate", "glBlendFuncSeparateEXT");
+
+    setGLExtensionFuncPtr(glBlendFunci, "glBlendFunci", "glBlendFunciARB");
+    setGLExtensionFuncPtr(glBlendFuncSeparatei, "glBlendFuncSeparatei", "glBlendFuncSeparateiARB");
 }
 
 BlendFunc::BlendFunc():

src/osg/BlendFunci.cpp

@@ -0,0 +1,56 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+#include <osg/BlendFunci>
+#include <osg/GLExtensions>
+#include <osg/State>
+
+using namespace osg;
+
+BlendFunci::BlendFunci():
+    _index(0)
+{
+}
+
+
+BlendFunci::~BlendFunci()
+{
+}
+
+void BlendFunci::apply(State& state) const
+{
+    const Extensions* extensions = state.get<Extensions>();
+    if (_source_factor != _source_factor_alpha ||
+        _destination_factor != _destination_factor_alpha)
+    {
+        if (extensions->glBlendFuncSeparatei)
+        {
+            extensions->glBlendFuncSeparatei(static_cast<GLuint>(_index), _source_factor, _destination_factor, _source_factor_alpha, _destination_factor_alpha);
+        }
+        else
+        {
+            OSG_WARN<<"Warning: BlendFunc::apply(..) failed, BlendFuncSeparatei is not support by OpenGL driver."<<std::endl;
+        }
+    }
+    else
+    {
+        if (extensions->glBlendFunci)
+        {
+            extensions->glBlendFunci(static_cast<GLuint>(_index), _source_factor, _destination_factor);
+        }
+        else
+        {
+            OSG_WARN<<"Warning: BlendFunc::apply(..) failed, BlendFunci is not support by OpenGL driver."<<std::endl;
+        }
+    }
+}
+

src/osg/CMakeLists.txt

@@ -30,7 +30,9 @@ SET(TARGET_H
     ${HEADER_PATH}/Billboard
     ${HEADER_PATH}/BlendColor
     ${HEADER_PATH}/BlendEquation
+    ${HEADER_PATH}/BlendEquationi
     ${HEADER_PATH}/BlendFunc
+    ${HEADER_PATH}/BlendFunci
     ${HEADER_PATH}/BoundingBox
     ${HEADER_PATH}/BoundingSphere
     ${HEADER_PATH}/BoundsChecking
@@ -48,6 +50,7 @@ SET(TARGET_H
     ${HEADER_PATH}/ClusterCullingCallback
     ${HEADER_PATH}/CollectOccludersVisitor
     ${HEADER_PATH}/ColorMask
+    ${HEADER_PATH}/ColorMaski
     ${HEADER_PATH}/ColorMatrix
     ${HEADER_PATH}/ComputeBoundsVisitor
     ${HEADER_PATH}/ConvexPlanarOccluder
@@ -230,7 +233,9 @@ SET(TARGET_SRC
     Billboard.cpp
     BlendColor.cpp
     BlendEquation.cpp
+    BlendEquationi.cpp
     BlendFunc.cpp
+    BlendFunci.cpp
     BufferIndexBinding.cpp
     BufferObject.cpp
     Callback.cpp
@@ -243,6 +248,7 @@ SET(TARGET_SRC
     ClusterCullingCallback.cpp
     CollectOccludersVisitor.cpp
     ColorMask.cpp
+    ColorMaski.cpp
     ColorMatrix.cpp
     ComputeBoundsVisitor.cpp
     ConvexPlanarOccluder.cpp

src/osg/ColorMaski.cpp

@@ -0,0 +1,47 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+#include <osg/ColorMaski>
+#include <osg/GLExtensions>
+#include <osg/State>
+
+using namespace osg;
+
+// Set up extensions
+ColorMaski::Extensions::Extensions(unsigned int contextID)
+{
+    setGLExtensionFuncPtr(glColorMaski, "glColorMaski", "glColorMaskiARB");
+}
+
+
+ColorMaski::ColorMaski():
+    _index(0)
+{
+}
+
+ColorMaski::~ColorMaski()
+{
+}
+
+void ColorMaski::apply(State& state) const
+{
+    const Extensions* extensions = state.get<Extensions>();
+    if (extensions->glColorMaski)
+    {
+        extensions->glColorMaski((GLboolean)_index, (GLboolean)_red,(GLboolean)_green,(GLboolean)_blue,(GLboolean)_alpha);
+    }
+    else
+    {
+        OSG_WARN<<"Warning: ColorMaski::apply(..) failed, glColorMaski is not support by OpenGL driver."<<std::endl;
+    }
+}
+

src/osgWrappers/serializers/osg/BlendEquationi.cpp

@@ -0,0 +1,12 @@
+#include <osg/BlendEquationi>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( BlendEquationi,
+                         new osg::BlendEquationi,
+                         osg::BlendEquationi,
+                         "osg::Object osg::StateAttribute osg::BlendEquation osg::BlendEquationi" )
+{
+    ADD_UINT_SERIALIZER( Index, 0 );
+}

src/osgWrappers/serializers/osg/BlendFunci.cpp

@@ -0,0 +1,12 @@
+#include <osg/BlendFunci>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( BlendFunci,
+                         new osg::BlendFunci,
+                         osg::BlendFunci,
+                         "osg::Object osg::StateAttribute osg::BlendFunc osg::BlendFunci" )
+{
+    ADD_UINT_SERIALIZER( Index, 0 );
+}

src/osgWrappers/serializers/osg/ColorMaski.cpp

@@ -0,0 +1,12 @@
+#include <osg/ColorMaski>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( ColorMaski,
+                         new osg::ColorMaski,
+                         osg::ColorMaski,
+                         "osg::Object osg::StateAttribute osg::ColorMask osg::ColorMaski" )
+{
+    ADD_UINT_SERIALIZER( Index, 0 );
+}