Changeset 1110 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

07/10/06 18:18:22 (18 years ago)

Author:

mattausch

Message:

working with object pvss

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• VspOspTree.cpp (modified) (4 diffs)
• VspOspTree.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp

@@ -775 +775 @@
         // add front and back view cell to "Potentially Visbilie View Cells" 
         // of the objects in front and back pvs
-        RemoveParentViewCellReferences(tData.mNode->mViewCell);
-        AddViewCellReferences(frontLeaf->mViewCell);
-        AddViewCellReferences(backLeaf->mViewCell);
+        RemoveParentViewCellReferences(tData.mNode->GetViewCell());
+        AddViewCellReferences(frontLeaf->GetViewCell());
+        AddViewCellReferences(backLeaf->GetViewCell());
 
 
@@ -863 +863 @@
 
                 // remove reference count of view cells
-                -- object->mViewCellPvs;
-
-                set<KdLeaf *>::const_iterator kit, kit_end = obj->mKdLeaves.end();
-
-                for (kit = obj->mKdLeaves.begin(); kit != kit_end; ++ kit)
-                {
-                        KdLeaf *leaf = *kit;
-
-                        if (!leaf->Mailed())
-                        {
-                                leaf->mViewCellPvs.RemoveSample(parent, high_contri);
-                                leaf->Mail();
-                        }
-                }
+                object->mViewCellPvs.RemoveSample(parent, high_contri);
         }
 }
@@ -886 +873 @@
 
         // Add front view cell to the object pvsss
-        ObjectPvsMap::const_iterator oit, oit_end = front->GetPvs().mEntries.end();
-
-        for (oit = front->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+        ObjectPvsMap::const_iterator oit, oit_end = vc->GetPvs().mEntries.end();
+
+        for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
         {
                 Intersectable *object = (*oit).first;
 
                 // increase reference count of view cells
-                ++ object->mViewCellPvs;
-
-                set<KdLeaf *>::const_iterator kit, kit_end = obj->mKdLeaves.end();
-
-                for (kit = obj->mKdLeaves.begin(); kit != kit_end; ++ kit)
-                {
-                        KdLeaf *leaf = *kit;
-
-                        if (!leaf->Mailed())
-                        {
-                                leaf->mViewCellPvs.AddSample(front, 1);
-                                leaf->Mail();
-                        }
-                }
+                object->mViewCellPvs.AddSample(vc, 1);
         }
 }
@@ -944 +918 @@
                 }
 
-                Intersectable *obj = ray->mOriginObject;
+                obj = ray->mOriginObject;
 
                 if (obj) 

GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.h

@@ -736 +736 @@
                 the objects.
         */
-        void RemoveParentViewCellReferences(ViewCell *parent);
+        void RemoveParentViewCellReferences(ViewCell *parent) const;
+
         /** Adds references to the view cell to the kd nodes associated with the objects.
         */