Changeset 11668 for OpenSceneGraph/trunk/examples/osgshadercomposition/osgshadercomposition.cpp

Timestamp:

07/06/10 14:19:26 (3 years ago)

Author:

robert

Message:

Added compile/release and resize of GL objects to ShaderAttribute?.

Removed the StateAttribute::compose() method.

Fixed the default type value in ShaderAttribute?

Files:

• OpenSceneGraph/trunk/examples/osgshadercomposition/osgshadercomposition.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgshadercomposition/osgshadercomposition.cpp

@@ -32 +32 @@
     osg::Vec3d position(0.0,0.0,0.0);
 
+    osg::ShaderAttribute* sa1 = NULL;
+
     {
         osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
@@ -41 +43 @@
         osg::StateSet* stateset = pat->getOrCreateStateSet();
         osg::ShaderAttribute* sa = new osg::ShaderAttribute;
+        //sa->setType(osg::StateAttribute::Type(10000));
+        sa1 = sa;
         stateset->setAttribute(sa);
 
@@ -73 +77 @@
 
     }
+#if 1
+    {
+        osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform;
+        pat->setPosition(position);
+        pat->addChild(node);
 
+        position.x() += spacing;
+
+        osg::StateSet* stateset = pat->getOrCreateStateSet();
+        osg::ShaderAttribute* sa = new osg::ShaderAttribute;
+        //sa->setType(osg::StateAttribute::Type(10000));
+        stateset->setAttribute(sa);
+
+        // reuse the same ShaderComponent as the first branch
+        sa->setShaderComponent(sa1->getShaderComponent());
+        sa->addUniform(new osg::Uniform("myColour",osg::Vec4(1.0f,1.0f,0.0f,1.0f)));
+
+        group->addChild(pat);
+
+    }
+#endif
     return group;
 }