Changeset 11654

Timestamp:

06/24/10 19:15:27 (3 years ago)

Author:

robert

Message:

Added beginnings of shader composition with the shells of the ShaderComposer? and ShaderAttribute? classes. This aren't
functional yet, but a useful placeholders for future fucntionality.

Location:

OpenSceneGraph/trunk

Files:

• include/osg/ShaderAttribute (added)
• include/osg/ShaderComposer (added)
• include/osg/State (modified) (3 diffs)
• include/osg/StateAttribute (modified) (2 diffs)
• src/osg/CMakeLists.txt (modified) (2 diffs)
• src/osg/ShaderAttribute.cpp (added)
• src/osg/State.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/State

@@ -22 +22 @@
 #include <osg/Observer>
 
+#include <osg/ShaderComposer>
 #include <osg/FrameStamp>
 #include <osg/DisplaySettings>
@@ -141 +142 @@
         inline unsigned int getContextID() const { return _contextID; }
 
+
+        /** Set the ShaderComposor object that implements shader composition.*/
+        void setShaderComposer(ShaderComposer* sc) { _shaderComposer = sc; }
+
+        /** Get the ShaderComposor object.*/
+        ShaderComposer* getShaderComposer() { return _shaderComposer.get(); }
+
+        /** Get the const ShaderComposor object.*/
+        const ShaderComposer* getShaderComposer() const { return _shaderComposer.get(); }
+
+
         /** Push stateset onto state stack.*/
         void pushStateSet(const StateSet* dstate);
@@ -1340 +1352 @@
         GraphicsContext*            _graphicsContext;
         unsigned int                _contextID;
+        osg::ref_ptr<ShaderComposer> _shaderComposer;
+
         ref_ptr<FrameStamp>         _frameStamp;
 

OpenSceneGraph/trunk/include/osg/StateAttribute

@@ -36 +36 @@
 class NodeVisitor;
 class State;
+class ShaderComposer;
 class StateSet;
 class Texture;
@@ -316 +317 @@
         virtual void apply(State&) const {}
 
+        /* compose associated shaders via the ShaderComposer. */
+        virtual void compose(ShaderComposer& composer) const {}
+
         /** Default to nothing to compile - all state is applied immediately. */
         virtual void compileGLObjects(State&) const {}

OpenSceneGraph/trunk/src/osg/CMakeLists.txt

@@ -138 +138 @@
     ${HEADER_PATH}/ShadeModel
     ${HEADER_PATH}/Shader
+    ${HEADER_PATH}/ShaderAttribute
+    ${HEADER_PATH}/ShaderComposer
     ${HEADER_PATH}/ShadowVolumeOccluder
     ${HEADER_PATH}/Shape
@@ -302 +304 @@
     ShadeModel.cpp
     Shader.cpp
+    ShaderAttribute.cpp
+    ShaderComposer.cpp
     ShadowVolumeOccluder.cpp
     Shape.cpp

OpenSceneGraph/trunk/src/osg/State.cpp

@@ -42 +42 @@
     _graphicsContext = 0;
     _contextID = 0;
+
+    _shaderComposer = new ShaderComposer;
+
     _identity = new osg::RefMatrix(); // default RefMatrix constructs to identity.
     _initialViewMatrix = _identity;