Changeset 582 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

02/02/06 19:16:39 (18 years ago)

Author:

mattausch

Message:

fixed bug in mergueue to find root of merge and sort out doube view cells

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (20 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -56 +56 @@
         environment->GetBoolValue("ViewCells.PostProcess.useRaysForMerge", mUseRaysForMerge);
         
-        environment->GetIntValue("ViewCells.active", mNumActiveViewCells);
+        environment->GetIntValue("ViewCells.active", mNumMergedViewCells);
 
         mMinPvsSize = emptyViewCells ? 1 : 0;
@@ -107 +107 @@
 {
         cout << "disposing samples ... ";
+        long startTime = GetTime();
+        int n = (int)rays.size();
+
         if (outRays)
         {
@@ -121 +124 @@
         }
         cout << "finished" << endl;
+        Debug << "disposed " << n << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 }
 
@@ -519 +523 @@
 
 
-ViewCellInterior *ViewCellsManager::MergeViewCells(ViewCell &left, ViewCell &right) const
+ViewCellInterior *ViewCellsManager::MergeViewCells(ViewCell *left, ViewCell *right) const
 {
         // generate parent view cell
@@ -525 +529 @@
 
         // merge pvs
-        vc->GetPvs().Merge(left.GetPvs(), right.GetPvs());
+        vc->GetPvs().Merge(left->GetPvs(), right->GetPvs());
 
         //-- merge ray sets
         if (0)
         {
-                stable_sort(left.mPiercingRays.begin(), left.mPiercingRays.end());
-                stable_sort(right.mPiercingRays.begin(), right.mPiercingRays.end());
-
-                std::merge(left.mPiercingRays.begin(), left.mPiercingRays.end(),
-                                   right.mPiercingRays.begin(), right.mPiercingRays.end(),
+                stable_sort(left->mPiercingRays.begin(), left->mPiercingRays.end());
+                stable_sort(right->mPiercingRays.begin(), right->mPiercingRays.end());
+
+                std::merge(left->mPiercingRays.begin(), left->mPiercingRays.end(),
+                                   right->mPiercingRays.begin(), right->mPiercingRays.end(),
                                    vc->mPiercingRays.begin());
         }
 
 
-        vc->SetupChildLink(&left);
-        vc->SetupChildLink(&right);
-
+        vc->SetupChildLink(left);
+        vc->SetupChildLink(right);
+
+
+        return vc;
+}
+
+
+ViewCellInterior *ViewCellsManager::MergeViewCells(ViewCellContainer &children) const
+{
+        ViewCellInterior *vc = new ViewCellInterior();//GenerateViewCell();
+
+        ViewCellContainer::const_iterator it, it_end = children.end();
+
+        for (it = children.begin(); it != it_end; ++ it)
+        {
+                // merge pvs
+                vc->GetPvs().Merge(vc->GetPvs(), (*it)->GetPvs());
+
+                vc->SetupChildLink(*it);
+        }
 
         return vc;
@@ -845 +867 @@
                 if (!mOnlyValidViewCells || (*it)->GetValid())
                 {
-                        ExportColor(exporter, *it);
-                        ExportViewCellGeometry(exporter, *it);
-                }
-        }
+                        ExportColor(exporter, *it);             
+                        ExportViewCellGeometry(exporter, *it);          
+                }
+        }
+
 }
 
@@ -1175 +1198 @@
                 VssRayContainer vcRays;
                 Intersectable::NewMail();
-#if 0
-                BspViewCell *vc = dynamic_cast<BspViewCell *>(mViewCells[i]);
-#else
-                BspViewCell *vc = dynamic_cast<BspViewCell *>(mViewCells[Random((int)mViewCells.size())]);
-#endif
+                ViewCell *vc;
+
+                if (0)
+                        vc = mViewCells[i];
+                else
+                        vc = mViewCells[Random((int)mViewCells.size())];
+
                 cout << "creating output for view cell " << i << " ... ";
 
@@ -1213 +1238 @@
 
                         //-- export view cell
+#if VC_HISTORY
                         mBspTree->ConstructGeometry(vc, vcGeom);
                         exporter->ExportPolygons(vcGeom.mPolys);
+#endif
                 }
 
@@ -1271 +1298 @@
                 // cast line segment to get intersections with bsp leaves
                 CastLineSegment(vssRay->mTermination, vssRay->mOrigin, viewCells);
-
+#if VC_HISTORY
                 ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
                 for (vit = viewCells.begin(); vit != vit_end; ++ vit)
                 {
-                        BspViewCell *vc = dynamic_cast<BspViewCell *>(*vit);
+                        ViewCell *vc = *vit;
                         ray->intersections.push_back(BspIntersection(0, vc->mLeaf));
                 }
-
+#endif
                 mBspRays.push_back(ray);
         }
@@ -1334 +1361 @@
         {
                 BspNodeGeometry geom;
-                mBspTree->ConstructGeometry(
-                        dynamic_cast<BspViewCell *>(vc), geom);
+#if VC_HISTORY
+                mBspTree->ConstructGeometry(vc, geom);
                 exporter->ExportPolygons(geom.mPolys);
+#endif
         }
 }
@@ -2081 +2109 @@
         {
                 // we can use the view cells tree hierarchy to get the right set
-                mViewCellsTree->CollectBestViewCellSet(mViewCells, mNumActiveViewCells);
+                mViewCellsTree->CollectBestViewCellSet(mViewCells, mNumMergedViewCells);
         }
 
@@ -2380 +2408 @@
                         for (vit = mViewCells.begin(); vit != mViewCells.end(); ++ vit)
                         {
-                                BspViewCell *vc = dynamic_cast<BspViewCell *>(*vit);
+                                ViewCell *vc = *vit;
 
                                 vm = RandomMaterial();
@@ -2547 +2575 @@
                         for (vit = mViewCells.begin(); vit != mViewCells.end(); ++ vit)
                         {
-                                BspViewCell *vc = dynamic_cast<BspViewCell *>(*vit);
+                                ViewCell *vc = *vit;
 
                                 ViewCellContainer leaves;
@@ -2658 +2686 @@
                 VssRayContainer vcRays;
                 Intersectable::NewMail();
-                BspViewCell *vc;
+                ViewCell *vc;
         
                 if (0) // largest view cell pvs first
-                {
-                        vc = dynamic_cast<BspViewCell *>(mViewCells[i]);
-                }
+                        vc = mViewCells[i];
                 else
-                {
-                        vc = dynamic_cast<BspViewCell *>
-                                (mViewCells[Random((int)mViewCells.size())]);
-                }
+                        vc = mViewCells[Random((int)mViewCells.size())];
 
         if (1)
@@ -2678 +2701 @@
                                 for     (int j = 0; j < (int)ray->mViewCells.size(); ++ j)
                                 {
-                                        BspViewCell *bspVc = dynamic_cast<BspViewCell *>(ray->mViewCells[j]);
-                                        BspLeaf *leaf = bspVc->mLeaf;
-                                        if (vc == bspVc)
+                                        ViewCell *rayvc = ray->mViewCells[j];
+#if VC_HISTORY
+                                        BspLeaf *leaf = rayvc->mLeaf;
+                                        if (vc == rayvc)
                                                 vcRays.push_back(ray);
+#endif
                                 }
                         }
@@ -2835 +2860 @@
 
         BspNodeGeometry geom;
-        mVspBspTree->
-                ConstructGeometry(dynamic_cast<BspViewCell *>(vc), geom);
+        mVspBspTree->ConstructGeometry(vc, geom);
         exporter->ExportPolygons(geom.mPolys);
 }
@@ -2845 +2869 @@
         ViewCellContainer leaves;
         mViewCellsTree->CollectLeaves(vc, leaves);
-
 
         int maxDist = 0;
@@ -2886 +2909 @@
 
         BspNodeGeometry geom;
-        BspViewCell *bspVc = dynamic_cast<BspViewCell *>(vc);
-        mVspBspTree->ConstructGeometry(bspVc, geom);
+        
+        mVspBspTree->ConstructGeometry(vc, geom);
 
         Mesh *mesh = new Mesh();
@@ -2984 +3007 @@
 void VspBspViewCellsManager::Finalize(ViewCell *viewCell, const bool createMesh)
 {
-        BspViewCell *vc = dynamic_cast<BspViewCell *>(viewCell);
-        CreateMesh(vc);
+        CreateMesh(viewCell);
 
         float area = 0;
@@ -2991 +3013 @@
 
         ViewCellContainer leaves;
-        mViewCellsTree->CollectLeaves(vc, leaves);
+        mViewCellsTree->CollectLeaves(viewCell, leaves);
 
         ViewCellContainer::const_iterator it, it_end = leaves.end();