Changeset 2117 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

02/15/07 13:19:17 (17 years ago)

Author:

mattausch

Message:

implemented bit pvs (warnin: only worjs for preprocessing)

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (13 diffs)

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

@@ -65 +65 @@
         while (pit.HasMoreEntries())
         {
-                ObjectPvsEntry entry = pit.Next();
-
-                if (!entry.mObject->Mailed())
-                {
-                        entry.mObject->Mail();
+                Intersectable *obj = pit.Next();
+
+                if (!obj->Mailed())
+                {
+                        obj->Mail();
                         ++ count;
                 }
@@ -92 +92 @@
         while (pit.HasMoreEntries())
         {
-                ObjectPvsEntry entry = pit.Next();
-                entry.mObject->Mail();
+                pit.Next()->Mail();
         }
 
@@ -100 +99 @@
         while (pit.HasMoreEntries())
         {
-                ObjectPvsEntry entry = pit.Next();
-
-                Intersectable *obj = entry.mObject;
-                if (!obj->Mailed())
+                if (!pit.Next()->Mailed())
                         ++ pvs;
         }
@@ -847 +843 @@
         while (pit.HasMoreEntries())
         {
-                ObjectPvsEntry entry = pit.Next();
-
-                Intersectable *obj = entry.mObject;
+                Intersectable *obj = pit.Next();
 
                 obj->Mail();
@@ -859 +853 @@
         while (pit2.HasMoreEntries())
         {
-                ObjectPvsEntry entry = pit2.Next();
-                Intersectable *obj = entry.mObject;
-
+                Intersectable *obj = pit2.Next();
+                
                 // test if object already considered    
                 if (!obj->Mailed())
@@ -1681 +1674 @@
                 while (pit.HasMoreEntries())
                 {               
-                        const ObjectPvsEntry &entry = pit.Next();
-                        Intersectable *obj = entry.mObject;
-                        obj->Mail();
+                        pit.Next()->Mail();
                 }
         }
@@ -1695 +1686 @@
                 while (pit.HasMoreEntries())
                 {               
-                        const ObjectPvsEntry &entry = pit.Next();
-                        Intersectable *obj = entry.mObject;
-
-                        obj->IncMail();
+                        pit.Next()->IncMail();
                 }
         }
@@ -1705 +1693 @@
     interior->GetPvs().Clear(false);
                 
+        PvsData pvsData;
+
         // only the objects which are present in all leaf pvs 
         // should remain in the parent pvs
@@ -1716 +1706 @@
                 while (pit.HasMoreEntries())
                 {               
-                        ObjectPvsEntry entry = pit.Next();
-
-                        if (entry.mObject->Mailed(mail))
+                        Intersectable *obj = pit.Next(pvsData);
+
+                        if (obj->Mailed(mail))
                         {       
-                                interior->GetPvs().AddSample(entry.mObject, entry.mData.mSumPdf);
+                                interior->GetPvs().AddSample(obj, pvsData.mSumPdf);
                         }
                 }
@@ -1733 +1723 @@
 
                 ObjectPvs newPvs;
-
+                
                 while (pit.HasMoreEntries())
                 {               
-                        const ObjectPvsEntry &entry = pit.Next();
-                        Intersectable *obj = entry.mObject;
-
-                        /*if (obj->Mailed(mail))
-                        {
-                                vc->GetPvs().RemoveSample(entry.mObject, Limits::Infinity))
-                        }*/
+                        Intersectable *obj = pit.Next(pvsData);
+
                         if (!obj->Mailed(mail))
                         {
-                                newPvs.AddSampleDirty(obj, entry.mData.mSumPdf);
+                                newPvs.AddSampleDirty(obj, pvsData.mSumPdf);
                         }
                 }
@@ -1872 +1857 @@
                 while (oit.HasMoreEntries())
                 {
-                        ObjectPvsEntry entry = oit.Next();
-                        Intersectable *intersect = entry.mObject;
+                        Intersectable *intersect = oit.Next();
 
                         if (!intersect->Mailed())
@@ -2390 +2374 @@
         while (it.HasMoreEntries())
         {
-                ObjectPvsEntry entry = it.Next();
-                Intersectable *obj = entry.mObject;
+                Intersectable *obj = it.Next();
 
                 // hack: just output full pvs
@@ -2408 +2391 @@
                 else
                 {
-                        stream << entry.mObject->GetId() << " ";
+                        stream << obj->GetId() << " ";
                 }
         }