Changeset 570 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

01/23/06 18:34:47 (18 years ago)

Author:

mattausch

Message:

construction method for view cells

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -1980 +1980 @@
                                 bool isAdjacent = true;
 
-                        /*      if (1)
+                                if (1)
                                 {
                                         // test all planes of current node if still adjacent
@@ -2014 +2014 @@
                                                 }
                                         }
-                                }*/
+                                }
                                 // neighbor was found
                                 if (isAdjacent)
@@ -3115 +3115 @@
         queue<BspMergeCandidate> *backQueue = &queue2;
 
-#if 1
-    Exporter *exporter = Exporter::GetExporter("neighors.x3d");
-
-        if (exporter)
-        {
-                cout << "exporting neighbors ... ";
-                exporter->ExportGeometry(objects);
-        }
-
-        // HACK for visualization
-        //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)));
-        
-        
         while (!mMergeQueue.empty())
         {
@@ -3137 +3120 @@
                 shuffleQueue->push(mc);
                 mMergeQueue.pop();
-
-                // visualize neighbors
-                Material m = RandomMaterial();
-                exporter->SetForcedMaterial(m);
-        
-
-                if (!mc.GetLeaf1()->Mailed())
-                {
-                        BspNodeGeometry geom1;
-                        ConstructGeometry(mc.GetLeaf1(), geom1);
-                        //m.mDiffuseColor.r = (mc.GetLeaf1()->GetViewCell()->GetId() & 256)/ 255.0f;
-                        //m.mDiffuseColor.g = ((mc.GetLeaf1()->GetViewCell()->GetId()>>8) & 256)/ 255.0f;
-                        //m.mDiffuseColor.b = ((mc.GetLeaf1()->GetViewCell()->GetId()>>16) & 256)/ 255.0f;
-                        //exporter->SetForcedMaterial(m);
-                        exporter->ExportPolygons(geom1.mPolys);
-                        mc.GetLeaf1()->Mail();
-                }
-
-                if (!mc.GetLeaf2()->Mailed())
-                {
-                        BspNodeGeometry geom2;
-                        ConstructGeometry(mc.GetLeaf2(), geom2);
-                        //m.mDiffuseColor.r = (mc.GetLeaf2()->GetViewCell()->GetId() & 256)/ 255.0f;
-                        //m.mDiffuseColor.g = ((mc.GetLeaf2()->GetViewCell()->GetId()>>8) & 256)/ 255.0f;
-                        //m.mDiffuseColor.b = ((mc.GetLeaf2()->GetViewCell()->GetId()>>16) & 256)/ 255.0f;
-                        //exporter->SetForcedMaterial(m);
-                        exporter->ExportPolygons(geom2.mPolys);
-                        mc.GetLeaf2()->Mail();
-                }               
-        }
-
-        if (exporter)
-        {
-                cout << "finished" << endl;
-                delete exporter;
-        }
-#else
-        while (!mMergeQueue.empty())
-        {
-                BspMergeCandidate mc = mMergeQueue.top();
-                shuffleQueue->push(mc);
-                mMergeQueue.pop();
-        }
-#endif
+        }
+
         const int numPasses = 5;
         int pass = 0;
@@ -3257 +3198 @@
         //const int pvs1 = SubtractedPvsSize(vc1, leaf, *leaf->mPvs);
         const int pvs1 = SubtractedPvsSize(vc1->GetPvs(), *leaf->mPvs);
-        
         const int pvs2 = AddedPvsSize(vc2->GetPvs(), *leaf->mPvs);
 
@@ -3277 +3217 @@
         }
 
-        const float cost1 = (float)pvs1 * p1;
-        const float cost2 = (float)pvs2 * p2;
+        const float cost1 = (float)pvs1;// * p1;
+        const float cost2 = (float)pvs2;// * p2;
 
         return cost1 + cost2;
@@ -3330 +3270 @@
         BspViewCell *vc2 = leaf2->GetViewCell();
 
-        float cost1; 
-        float cost2; 
-
-        if (mUseAreaForPvs)
+        float cost1 = vc1->GetPvs().GetSize(); 
+        float cost2 = vc2->GetPvs().GetSize(); 
+
+        /*if (mUseAreaForPvs)
         {
                 cost1 = vc1->GetPvs().GetSize() * vc1->GetArea();
@@ -3342 +3282 @@
                 cost1 = vc1->GetPvs().GetSize() * vc1->GetVolume();
                 cost2 = vc2->GetPvs().GetSize() * vc2->GetVolume();
-        }
+        }*/
 
         const float oldCost = cost1 + cost2;
@@ -3450 +3390 @@
 }
 
+
 /************************************************************************/
 /*                BspMergeCandidate implementation                      */