Changeset 566

Timestamp:

01/23/06 03:34:48 (18 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (8 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -273 +273 @@
                                                    AxisAlignedBox3 *forcedBoundingBox)
 {
-    mStat.nodes = 1;
+        mStat.nodes = 1;
         mBox.Initialize();      // initialise BSP tree bounding box
 
@@ -2640 +2640 @@
                                 mMergeQueue.push(mc);
                                 ++ candidates;
+                                if ((candidates % 1000) == 0)
+                                {
+                                        cout << "collected " << candidates << " merge candidates" << endl;
+                                }
                         }
                 }
@@ -3121 +3125 @@
 
         // HACK for visualization
-        ViewCellContainer viewCells;
+        /*ViewCellContainer viewCells;
         ViewCell::NewMail();
         CollectViewCells(mRoot, true, viewCells, true);
         for (int i = 0; i < viewCells.size(); ++i)
                 viewCells[i]->SetId((int)RandomValue(0, Real(256*256*256)));
-        
+        */
         Material m;
         m.mDiffuseColor.r = 0;
@@ -3138 +3142 @@
                 mMergeQueue.pop();
 
+
+                // visualize neighbors
                 m = RandomMaterial();
-                // visualize neighbors
                 exporter->SetForcedMaterial(m);
                 
@@ -3151 +3156 @@
                 //m.mDiffuseColor.b = ((mc.GetLeaf1()->GetViewCell()->GetId()>>16) & 256)/ 255.0f;
                 exporter->SetForcedMaterial(m);
-
                 exporter->ExportPolygons(geom1.mPolys);
                 
@@ -3158 +3162 @@
                 //m.mDiffuseColor.b = ((mc.GetLeaf2()->GetViewCell()->GetId()>>16) & 256)/ 255.0f;
                 //exporter->SetForcedMaterial(m);
-
                 exporter->ExportPolygons(geom2.mPolys);
         }
@@ -3239 +3242 @@
         const int pvs2 = AddedPvsSize(vc2->GetPvs(), *leaf->mPvs);
 
+        // dont' shuffle leaves with pvs > max
         if (pvs1 + pvs2 > mViewCellsManager->GetMaxPvsSize())
                 return 1e15f;
@@ -3255 +3259 @@
         }
 
-        const float cost1 = pvs1 * p1;
-        const float cost2 = pvs2 * p2;
+        const float cost1 = (float)pvs1 * p1;
+        const float cost2 = (float)pvs2 * p2;
 
         return cost1 + cost2;