Have taken a few more steps towards support for view dependant transformations

by adding a ComputeTransformCallback to osg::Transform, and have now removed
the recently added AutoTransform since it is nolonger required.  Have also
updated CullVisitor to account for the new ways for tracking transformation
matrices in the scene.

src/osgUtil/CullVisitor.cpp

@@ -54,15 +54,15 @@ class PrintVisitor : public NodeVisitor
             moveOut();
         }
 
-        virtual void apply(Geode& node)      { apply((Node&)node); }
-        virtual void apply(Billboard& node)  { apply((Geode&)node); }
-        virtual void apply(LightSource& node){ apply((Node&)node); }
+        virtual void apply(Geode& node)         { apply((Node&)node); }
+        virtual void apply(Billboard& node)     { apply((Geode&)node); }
+        virtual void apply(LightSource& node)   { apply((Node&)node); }
         
-        virtual void apply(Group& node)      { apply((Node&)node); }
-        virtual void apply(Transform& node)  { apply((Group&)node); }
-        virtual void apply(Switch& node)     { apply((Group&)node); }
-        virtual void apply(LOD& node)        { apply((Group&)node); }
-        virtual void apply(Impostor& node)   { apply((LOD&)node); }
+        virtual void apply(Group& node)         { apply((Node&)node); }
+        virtual void apply(Transform& node)     { apply((Group&)node); }
+        virtual void apply(Switch& node)        { apply((Group&)node); }
+        virtual void apply(LOD& node)           { apply((Group&)node); }
+        virtual void apply(Impostor& node)      { apply((LOD&)node); }
 
    protected:
     
@@ -479,7 +479,7 @@ void CullVisitor::setCamera(const Camera& camera)
 
 }
 
-void CullVisitor::pushCullViewState(const Matrix* matrix)
+void CullVisitor::pushCullViewState(Matrix* matrix)
 {
 
     osg::ref_ptr<CullViewState> nvs = new CullViewState;
@@ -487,20 +487,18 @@ void CullVisitor::pushCullViewState(const Matrix* matrix)
     Matrix* inverse_world = NULL;
 
     if (matrix)
-    {
+    {    
         if (_cvs.valid() && _cvs->_matrix.valid())
         {
-            nvs->_matrix = new Matrix;
-            nvs->_matrix->mult(*matrix,*(_cvs->_matrix));
-        }
-        else
-        {
-            nvs->_matrix = new Matrix(*matrix);
+            matrix->postMult(*(_cvs->_matrix));
         }
 
-        inverse_world = new Matrix;
-        inverse_world->invert(*(nvs->_matrix));
-        nvs->_inverse = inverse_world;
+        nvs->_matrix = matrix;
+
+        inverse_world = createOrReuseMatrix();
+        inverse_world->invert(*(matrix));
+        nvs->_inverse = inverse_world;        
+        
     }
     else
     {
@@ -1034,7 +1032,6 @@ void CullVisitor::apply(Group& node)
     _cullingModeStack.pop_back();
 }
 
-
 void CullVisitor::apply(Transform& node)
 {
     // return if object's bounding sphere is culled.
@@ -1051,7 +1048,12 @@ void CullVisitor::apply(Transform& node)
     StateSet* node_state = node.getStateSet();
     if (node_state) pushStateSet(node_state);
 
-    pushCullViewState(&node.getLocalToWorldMatrix());
+    ref_ptr<osg::Matrix> matrix = createOrReuseMatrix();
+    matrix->makeIdentity();
+    node.getLocalToWorldMatrix(*matrix,this);
+    pushCullViewState(matrix.get());
+
+//    pushCullViewState(&node.getMatrix());
 
     traverse(node);
 
@@ -1064,7 +1066,6 @@ void CullVisitor::apply(Transform& node)
     _cullingModeStack.pop_back();
 }
 
-
 void CullVisitor::apply(Switch& node)
 {
     apply((Group&)node);

src/osgUtil/IntersectVisitor.cpp

@@ -505,7 +505,10 @@ void IntersectVisitor::apply(Transform& node)
 {
     if (!enterNode(node)) return;
 
-    pushMatrix(node.getLocalToWorldMatrix());
+    osg::ref_ptr<Matrix> matrix = new Matrix;
+    node.getLocalToWorldMatrix(*matrix,this);
+
+    pushMatrix(*matrix);
 
     traverse(node);
 

src/osgUtil/RenderBin.cpp

@@ -185,7 +185,12 @@ bool RenderBin::getStats(osg::Statistics* primStats)
             primStats->addOpaque(); // number of geosets
             if (rl->_matrix.get()) primStats->addMatrix(); // number of matrices
             if (dw) { // then tot up the types 1-14
+                // commenting out as having intrusive stats in base classes is
+                // undersirable.
                 dw->getStats(*primStats); // use sub-class to find the stats for each drawable
+                
+                // use an AttributeOption to get the stats we require.
+                dw->applyAttributeOperation(*primStats);
             }
         }
         somestats=true;