Changeset 2123 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

02/17/07 22:48:12 (17 years ago)

Author:

mattausch

Message:

worded on obj loading in Ogre

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (9 diffs)

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

@@ -1050 +1050 @@
                                                                                                    preprocessorObjects, 
                                                                                                    bconverter);
+
+        //Debug << " view cells parsed in "
+        //        << TimeDiff(startTime, GetTime()) * 1e-3f << " secs" << endl;
+        
 
         if (!success)
@@ -3687 +3691 @@
         vector<ObjectPvs>::iterator oit = pvsList.begin();
 
+        PvsData pvsData;
+
         for (vit = interior->mChildren.begin(); vit != vit_end; ++ vit, ++ oit)
         {
@@ -3694 +3700 @@
                 while (pit.HasMoreEntries())
                 {               
-                        ObjectPvsEntry entry = pit.Next();
-
-                        Intersectable *intersect = entry.mObject;
+                        Intersectable *intersect = pit.Next(pvsData);
 
                         if (!intersect->Mailed())
@@ -3702 +3706 @@
                                 intersect->Mail();
 
-                                pvs.AddSampleDirty(intersect, entry.mData.mSumPdf);
+                                pvs.AddSampleDirty(intersect, pvsData.mSumPdf);
                         }
                 }
@@ -4179 +4183 @@
                         while (pit.HasMoreEntries())
                         {               
-                                ObjectPvsEntry entry = pit.Next();
+                                Intersectable *intersect = pit.Next();
 
                 // output PVS of view cell
-                                Intersectable *intersect = entry.mObject;
-                                
                                 if (!intersect->Mailed())
                                 {
@@ -4684 +4686 @@
                         while (pit.HasMoreEntries())
                         {               
-                                ObjectPvsEntry entry = pit.Next();
-                                
                                 //-- output PVS of view cell
-                                Intersectable *intersect = entry.mObject;
+                                Intersectable *intersect = pit.Next();
+
                                 if (!intersect->Mailed())
                                 {
@@ -5501 +5502 @@
                         while (pit.HasMoreEntries())
                         {
-                                ObjectPvsEntry entry = pit.Next();              
-                                Intersectable *intersect = entry.mObject;
+                                Intersectable *intersect = pit.Next();          
                                 
                                 if (!intersect->Mailed())
@@ -6283 +6283 @@
                 while (pit.HasMoreEntries())
                 {               
-                        ObjectPvsEntry entry = pit.Next();
+                        Intersectable *obj = pit.Next();
                                 
-                        BvhNode *node = static_cast<BvhNode *>(entry.mObject);
+                        BvhNode *node = static_cast<BvhNode *>(obj);
                         
                         // hack!!
@@ -6496 +6496 @@
                         while (pit.HasMoreEntries())
                         {               
-                                ObjectPvsEntry entry = pit.Next();
+                                Intersectable *intersect = pit.Next();
                                 
-                                Intersectable *intersect = entry.mObject;
-
                                 if (!intersect->Mailed())
                                 {