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

Timestamp:

01/23/06 15:44:19 (18 years ago)

Author:

mattausch

Message:

debug version for testing shuffling and visualizing neighbors

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (10 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)
@@ -3092 +3092 @@
 int VspBspTree::RefineViewCells(const VssRayContainer &rays, const ObjectContainer &objects)
 {
-        int shuffled = 0;
-
         Debug << "refining " << (int)mMergeQueue.size() << " candidates " << endl;
+        
         BspLeaf::NewMail();
 
@@ -3116 +3115 @@
         queue<BspMergeCandidate> *backQueue = &queue2;
 
+#if 1
     Exporter *exporter = Exporter::GetExporter("neighors.x3d");
 
@@ -3125 +3125 @@
 
         // 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)));
-        */
-        Material m;
-        m.mDiffuseColor.r = 0;
-        m.mDiffuseColor.g = 0;
-        m.mDiffuseColor.b = 0;
-
+        //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())
         {
@@ -3142 +3138 @@
                 mMergeQueue.pop();
 
-
                 // visualize neighbors
-                m = RandomMaterial();
+                Material m = RandomMaterial();
                 exporter->SetForcedMaterial(m);
-                
-                BspNodeGeometry geom1, geom2;
-
-                ConstructGeometry(mc.GetLeaf1(), geom1);
-                ConstructGeometry(mc.GetLeaf1(), geom2);
-
-                //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);
-                
-                //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);
+        
+
+                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();
+                }               
         }
 
@@ -3170 +3173 @@
                 delete exporter;
         }
-
+#else
+        while (!mMergeQueue.empty())
+        {
+                BspMergeCandidate mc = mMergeQueue.top();
+                shuffleQueue->push(mc);
+                mMergeQueue.pop();
+        }
+#endif
         const int numPasses = 5;
         int pass = 0;
         int passShuffled = 0;
-
+        int shuffled = 0;
+
+        BspLeaf::NewMail();
 
         do
@@ -3220 +3232 @@
 }
 
-/*inline int SubtractedPvsSize(BspViewCell *vc, BspLeaf *l, const ObjectPvs &pvs2)
+
+// recomputes pvs size minus pvs of leaf l
+#if 0
+inline int SubtractedPvsSize(BspViewCell *vc, BspLeaf *l, const ObjectPvs &pvs2)
 {
         ObjectPvs pvs;
@@ -3228 +3243 @@
                         pvs.AddPvs(*(*it)->mPvs);
         return pvs.GetSize();
-}*/
-
+}
+#endif
+
+// computes pvs1 minus pvs2
 inline int SubtractedPvsSize(ObjectPvs pvs1, const ObjectPvs &pvs2)
 {
@@ -3240 +3257 @@
         //const int pvs1 = SubtractedPvsSize(vc1, leaf, *leaf->mPvs);
         const int pvs1 = SubtractedPvsSize(vc1->GetPvs(), *leaf->mPvs);
+        
         const int pvs2 = AddedPvsSize(vc2->GetPvs(), *leaf->mPvs);
 
-        // dont' shuffle leaves with pvs > max
+        // don't shuffle leaves with pvs > max
         if (pvs1 + pvs2 > mViewCellsManager->GetMaxPvsSize())
                 return 1e15f;