Changeset 2517 for OpenSceneGraph/trunk/examples/osgvertexprogram/osgvertexprogram.cpp

Timestamp:

12/09/03 15:07:44 (9 years ago)

Author:

robert

Message:

Removed osg::Transform::ComputeTransformCallback? from osg::Transform.

Updated various dependant files to reimplemt callbacks as Transform subclasses.

Files:

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

OpenSceneGraph/trunk/examples/osgvertexprogram/osgvertexprogram.cpp

@@ -197 +197 @@
 
 
-struct MoveEarthySkyWithEyePointCallback : public osg::Transform::ComputeTransformCallback
-{
+class MoveEarthySkyWithEyePointTransform : public osg::Transform
+{
+public:
     /** Get the transformation matrix which moves from local coords to world coords.*/
-    virtual bool computeLocalToWorldMatrix(osg::Matrix& matrix,const osg::Transform*, osg::NodeVisitor* nv) const 
+    virtual bool computeLocalToWorldMatrix(osg::Matrix& matrix,osg::NodeVisitor* nv) const 
     {
         osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
@@ -212 +213 @@
 
     /** Get the transformation matrix which moves from world coords to local coords.*/
-    virtual bool computeWorldToLocalMatrix(osg::Matrix& matrix,const osg::Transform*, osg::NodeVisitor* nv) const
+    virtual bool computeWorldToLocalMatrix(osg::Matrix& matrix,osg::NodeVisitor* nv) const
     {
         osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
@@ -263 +264 @@
 
 
-    osg::Transform* transform = new osg::Transform;
+    osg::Transform* transform = new MoveEarthySkyWithEyePointTransform;
     transform->setCullingActive(false);
-    transform->setComputeTransformCallback(new MoveEarthySkyWithEyePointCallback);
     transform->addChild(geode);