Changeset 338

Timestamp:

10/21/06 13:43:40 (2 years ago)

Author:

dirk

Message:

Fixed hierarchical update for GeoStatsAttachment?

Files:

• branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.cpp (modified) (12 diffs)
• branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.h (modified) (1 diff)
• branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentTest.cpp (modified) (11 diffs)

branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.cpp

@@ -59 +59 @@
-The GeoStatsAttachment keeps track of some core Geometry Characteristics like
-the number of vertices used, the number of points, lines or triangles created
- It can be calculated 
+
-
-It is designed as an attachment so that it can be kept inside the graph. It
-can also be used to keep aggregated information about subtrees, by adding up
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-*/
@@ -128 +133 @@
-void GeoStatsAttachment::reset(void)
-{
+    // Don't change it unless it's valid.
+    // Needed to protect intermediate results
+    if(!getValid())
+        return; 
+        
-    setVertices               (0);
-    setPoints                 (0);
@@ -135 +145 @@
-    setStoredAttributeBytes   (0);
-
-tru
+fals
-}
-
@@ -260 +270 @@
-}
-
+/*! Create a GeoStatsAttachment for the given Geometry
+*/
-GeoStatsAttachmentPtr GeoStatsAttachment::calcStatic(GeometryPtrArg geo)
-{
@@ -267 +279 @@
-    
-    return st;
+}
+
+
+/*! Access the GeoStatsAttachemnt in \a arg, if it has one. Return NullFC
+otherwise.
+*/
+GeoStatsAttachmentPtr GeoStatsAttachment::get(AttachmentContainerPtr arg)
+{
+    return cast_dynamic<GeoStatsAttachmentPtr>(
+            arg->findAttachment(GeoStatsAttachment::getClassType()));
+
+}
+
+/*! Access the GeoStatsAttachemnt in \a arg, if it has one. Return NullFC
+otherwise.
+*/
+GeoStatsAttachmentPtr GeoStatsAttachment::get(AttachmentContainer *arg)
+{
+    return cast_dynamic<GeoStatsAttachmentPtr>(
+            arg->findAttachment(GeoStatsAttachment::getClassType()));
+
-}
-
@@ -272 +305 @@
-/*                              Updates                                   */
-
-GeoStats to the given 
+a new GeoStatsAttachment to the given \a obj.
-*/
-void
+GeoStatsAttachmentPtr
-{
-    GeoStatsAttachmentPtr st = GeoStatsAttachment::create();
-    
-    st->attachTo(obj);
-
-
-
+
+
+
+
+
-*/
-void GeoStatsAttachment::attachTo(AttachmentContainerPtr obj)
@@ -303 +338 @@
-    obj->addAttachment(st);
-    
-setValid(false
+reset(
-    
-    obj->addChangedFunctor(GeoStatsAttachment::invalidateFunctor, 
@@ -311 +346 @@
-void GeoStatsAttachment::validate(void)
-{
+    commitChanges();
+    
-    // Still valid? Do nothing.
-    if(getValid())
-        return; 
-        
-    commitChanges();
-    
-    AttachmentContainerPtr cont = 
-        cast_dynamic<AttachmentContainerPtr>(getParents()[0]);
@@ -337 +372 @@
-    if(n != NullFC)
-    {
-Check
+Validate
-        GeometryPtr g = cast_dynamic<GeometryPtr>(n->getCore());
-        if(g != NullFC)
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        for(UInt32 i = 0; i < n->getNChildren(); ++i)
-        {
-            NodePtr c = n->getChild(i);
-            
-
-
-
-
-
-
+
+
+
-            {
-cast_dynamic<GeoStatsAttachmentPtr>(a
+GeoStatsAttachment::addTo(c
-            }
-            else // Need to add an attachment to it
-            {
-                s = GeoStatsAttachment::create();
-                c->addAttachment(s);
-            }
-            
-            s->validate();
-            
-            *this += s;
-
-
+
+
+
+
-}
-
@@ -388 +428 @@
-    
-    // Find the attachment
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    if(st->getParents().size())
-    {
-        FieldContainerPtr p = st->getParents()[0]; // Can't have more than 1
-        
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if(n != NullFC)
-        {
-n
-n
+NodePtr par
+par
-        }
-    }
@@ -429 +476 @@
-    setStoredAttributeBytes   (getStoredAttributeBytes() + 
-                                   arg->getStoredAttributeBytes());
+    setValid(true);
-}
-
@@ -441 +489 @@
-    setStoredAttributeBytes   (getStoredAttributeBytes() - 
-                                   arg->getStoredAttributeBytes());
+    setValid(true);
-}
-

branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachment.h

@@ -101 +101 @@
-    /*! \}                                                                 */
-    /*---------------------------------------------------------------------*/
+    /*! \name                     Access                                   */
+    /*! \{                                                                 */
+
+    static GeoStatsAttachmentPtr    get(AttachmentContainerPtr  arg);
+
+    static GeoStatsAttachmentPtr    get(AttachmentContainer    *arg);
+
+
+    /*! \}                                                                 */
+    /*---------------------------------------------------------------------*/
-    /*! \name                    Updating                                  */
-    /*! \{                                                                 */
-
-void
+GeoStatsAttachmentPtr
-
-    void attachTo(AttachmentContainerPtr obj);

branches/Dirk_RenderTraversalWork/Source/System/NodeCores/Drawables/Geometry/Util/OSGGeoStatsAttachmentTest.cpp

@@ -93 +93 @@
-        
-        commitChanges();
+        
+        sumVertices = sumPoints = sumLines = sumTriangles = 
+            sumProcessedAttributeBytes = sumStoredAttributeBytes = 0;
+            
+        for(UInt32 i = 0; i < nGeos; ++i)
+        {
+            sumVertices += geoVertices[i];
+            sumPoints += geoPoints[i];
+            sumLines += geoLines[i];
+            sumTriangles += geoTriangles[i];
+            sumProcessedAttributeBytes += geoProcessedAttributeBytes[i];
+            sumStoredAttributeBytes += geoStoredAttributeBytes[i];
+            
+        }
-    }
-    
@@ -113 +127 @@
-    UInt32 geoStoredAttributeBytes[nGeos];
-    
+    // Summed stats data
+    UInt32 sumVertices;
+    UInt32 sumPoints;
+    UInt32 sumLines;
+    UInt32 sumTriangles;
+    UInt32 sumProcessedAttributeBytes;
+    UInt32 sumStoredAttributeBytes;
+    
-    // Nodes for tree test
-    RefPtr<NodePtr> nodes[nGeos];
@@ -119 +141 @@
-};
-
-#if 0
-TEST_FIXTURE(GSAFixture, BasicCreationAndCalculation)
-{
@@ -182 +203 @@
-    
-    RefPtr<GeoStatsAttachmentPtr> st;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -202 +236 @@
-    
-    RefPtr<GeoStatsAttachmentPtr> st;
-
-
+
-
-    CHECK(st != NullFC);
@@ -209 +242 @@
-    st->attachTo(geos[1]);
-
-
-
+
-
-    CHECK(st == NullFC);   // Removed from old one? 
-
-
-
+
-
-    CHECK(st != NullFC);    // Attached to new one? 
@@ -238 +269 @@
-    
-    RefPtr<GeoStatsAttachmentPtr> st;
-
-
+
-
-    CHECK(st != NullFC);
@@ -260 +290 @@
-    
-    RefPtr<GeoStatsAttachmentPtr> st;
-
-
+
-
-    CHECK(st != NullFC);
@@ -281 +310 @@
-    
-    RefPtr<GeoStatsAttachmentPtr> st;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// Automatic Invalidation
-OnGeometry
+GeometryOn
-{    
-    GeoStatsAttachment::addTo(geos[0]);
-    
-    RefPtr<GeoStatsAttachmentPtr> st;
-
-
+
-
-    CHECK(st != NullFC);
@@ -319 +345 @@
-    CHECK_EQUAL(geoStoredAttributeBytes[0], st->getStoredAttributeBytes());
-    
-S
+_STRIP
-    geos[0]->getLengths()->push_back(3);
-    geos[0]->getIndex(0)->push_back(0);
@@ -342 +368 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+