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

Timestamp:

01/16/06 03:23:29 (18 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -27 +27 @@
 mViewCellsFinished(false)
 {
-        mSceneBox.Initialize();
+        mViewSpaceBox.Initialize();
         ParseEnvironment();
 }
@@ -39 +39 @@
 mViewCellsFinished(false)
 {
-        mSceneBox.Initialize();
+        mViewSpaceBox.Initialize();
         ParseEnvironment();
 }
@@ -77 +77 @@
 int ViewCellsManager::Construct(VssRayContainer &rays)
 {
-        VssPreprocessor preprocessor;
-
-
-
-        return 0;
+/*      VssPreprocessor preprocessor;
+
+        VssRayContainer vssRays;
+        preprocessor->GenerateVssRays(mConstructionSamples, vssRays);
+        Construct(preprocessor->mObjects, vssRays);
+        
+        // add rays to output rays
+        while (!vssRays.empty)
+        {
+                rays.push_back(vssRays.back());
+                vssRays.pop_back();
+        }
+
+        const int importanceRays = 1000000;
+        preprocessor->GenerateVssRays(max(importanceRays, mPostProcessSamples);
+
+        PostProcess(preprocesor->mObjects, importanceRays);
+        Visualize(preprocessor->mObjects, importanceRays);
+
+        // add rays to output rays
+        while (!importanceRays.empty)
+        {
+                rays.push_back(importanceRays.back());
+                importanceRays.pop_back();
+        }
+*/
+        return (int)rays.size();
 }
 
@@ -99 +121 @@
 bool ViewCellsManager::GetViewPoint(Vector3 &viewPoint) const
 {
-        viewPoint = mSceneBox.GetRandomPoint();
+        viewPoint = mViewSpaceBox.GetRandomPoint();
 
         return true;
@@ -107 +129 @@
 bool ViewCellsManager::ViewPointValid(const Vector3 &viewPoint) const
 {
-        return mSceneBox.IsInside(viewPoint);
+        return mViewSpaceBox.IsInside(viewPoint);
 }
 
@@ -333 +355 @@
 void ViewCellsManager::SetViewSpaceBox(const AxisAlignedBox3 &box)
 {
-        mSceneBox = box;
+        mViewSpaceBox = box;
 }
 
@@ -339 +361 @@
 AxisAlignedBox3 ViewCellsManager::GetViewSpaceBox() const
 {
-        return mSceneBox;
+        return mViewSpaceBox;
 }
 
@@ -358 +380 @@
 void ViewCellsManager::ComputeSampleContributions(VssRay &ray)
 {
-  ViewCellContainer viewcells;
-
-  ray.mPvsContribution = 0;
-  ray.mRelativePvsContribution = 0.0f;
-
-  // matt TODO: remove this!!
-  Ray hray(ray);
-  float tmin = 0, tmax = 1.0;
-
-  //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
-  if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
+        ViewCellContainer viewcells;
+
+        ray.mPvsContribution = 0;
+        ray.mRelativePvsContribution = 0.0f;
+
+        // matt TODO: remove this!!
+        Ray hray(ray);
+        float tmin = 0, tmax = 1.0;
+
+        //hray.Init(ray.GetOrigin(), ray.GetDir(), Ray::LINE_SEGMENT);
+        if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
         return;
 
-  Vector3 origin = hray.Extrap(tmin);
-  Vector3 termination = hray.Extrap(tmax);
-
-  CastLineSegment(origin,
-                                  termination,
-                                  viewcells);
-  //Debug << "constribution: " << (int)viewcells.size() << endl;
-  // copy viewcells memory efficiently
-  const bool storeViewcells = false;
-  if (storeViewcells) {
-        ray.mViewCells.reserve(viewcells.size());
-        ray.mViewCells = viewcells;
-  }
-
-  ViewCellContainer::const_iterator it = viewcells.begin();
-
-  bool addInPlace = false;
-
-  if (addInPlace) {
-        for (; it != viewcells.end(); ++it) {
-          ViewCell *viewcell = *it;
-
-          // if ray not outside of view space
-          float contribution;
-          bool added =
-                viewcell->GetPvs().AddSample(ray.mTerminationObject,
-                                                                         contribution
-                                                                         );
-          if (added)
-                ray.mPvsContribution++;
-
-          ray.mRelativePvsContribution += contribution;
-        }
-  } else {
-    for (; it != viewcells.end(); ++it) {
-          ViewCell *viewcell = *it;
-          // if ray not outside of view space
-          float contribution;
-          if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
-                                                                                                   contribution
-                                                                                                   ))
-                ray.mPvsContribution++;
-
-          ray.mRelativePvsContribution += contribution;
-        }
-
-        for (it = viewcells.begin(); it != viewcells.end(); ++it) {
-          ViewCell *viewcell = *it;
-          // if ray not outside of view space
-          viewcell->GetPvs().AddSample(ray.mTerminationObject);
-        }
-  }
+        Vector3 origin = hray.Extrap(tmin);
+        Vector3 termination = hray.Extrap(tmax);
+
+        CastLineSegment(origin,
+                                        termination,
+                                        viewcells);
+        //Debug << "constribution: " << (int)viewcells.size() << endl;
+        // copy viewcells memory efficiently
+        const bool storeViewcells = false;
+        if (storeViewcells)
+        {
+                ray.mViewCells.reserve(viewcells.size());
+                ray.mViewCells = viewcells;
+        }
+
+        ViewCellContainer::const_iterator it = viewcells.begin();
+
+        bool addInPlace = false;
+
+        if (addInPlace) 
+        {
+                for (; it != viewcells.end(); ++it) {
+                        ViewCell *viewcell = *it;
+
+                        // if ray not outside of view space
+                        float contribution;
+                        bool added =
+                        viewcell->GetPvs().AddSample(ray.mTerminationObject,
+                                                                                        contribution
+                                                                                        );
+                        if (added)
+                        ray.mPvsContribution++;
+
+                        ray.mRelativePvsContribution += contribution;
+                }
+        } 
+        else 
+        {
+                for (; it != viewcells.end(); ++it) {
+                        ViewCell *viewcell = *it;
+                        // if ray not outside of view space
+                        float contribution;
+                        if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
+                                                                                                                contribution
+                                                                                                                ))
+                        ray.mPvsContribution++;
+                        ray.mRelativePvsContribution += contribution;
+                }
+
+                for (it = viewcells.begin(); it != viewcells.end(); ++it) {
+                        ViewCell *viewcell = *it;
+                        // if ray not outside of view space
+                        viewcell->GetPvs().AddSample(ray.mTerminationObject);
+                }
+        }
 }
 
@@ -1456 +1481 @@
                   << (int)constructionRays.size() << " samples" << endl;
 
-        mVspKdTree->Construct(constructionRays, &mSceneBox);
+        mVspKdTree->Construct(constructionRays, &mViewSpaceBox);
         Debug << mVspKdTree->GetStatistics() << endl;
 
@@ -1468 +1493 @@
         mVspKdTree->RefineViewCells(rays);
 
-                // collapse siblings belonging to the same view cell
+        // collapse siblings belonging to the same view cell
         mVspKdTree->CollapseTree();
 
@@ -1827 +1852 @@
         Debug << "saved rays: " << (int)savedRays.size() << endl;
 
-        mVspBspTree->Construct(constructionRays, &mSceneBox);
+        mVspBspTree->Construct(constructionRays, &mViewSpaceBox);
 
         Debug << mVspBspTree->GetStatistics() << endl;
@@ -1982 +2007 @@
         }
 
-        EvaluateViewCellsStats();
-
-        // view cells already finished post processing step
+        
+        // view cells already finished before post processing step (i.e. because they were loaded)
         if (mViewCellsFinished)
+        {
+                EvaluateViewCellsStats();
                 return 0;
+        }
+        
+
+        // check if new view cells turned invalid
+        mVspBspTree->CheckValidy();
+        ResetViewCells();
+
 
         VssRayContainer postProcessRays;
@@ -2038 +2071 @@
         for (int i = 0; i < limit; ++ i)
         {
-                viewPoint = mSceneBox.GetRandomPoint();
+                viewPoint = mViewSpaceBox.GetRandomPoint();
                 if (mVspBspTree->ViewPointValid(viewPoint))
                 {
@@ -2051 +2084 @@
 bool VspBspViewCellsManager::ViewPointValid(const Vector3 &viewPoint) const
 {
-        return mSceneBox.IsInside(viewPoint) &&
+        return mViewSpaceBox.IsInside(viewPoint) &&
                    mVspBspTree->ViewPointValid(viewPoint);
 }
@@ -2072 +2105 @@
                 if (exporter)
                 {
+                        if (1)
+                        {
+                                exporter->SetWireframe();
+                                exporter->ExportBox(mViewSpaceBox);
+                                exporter->SetFilled();
+                        }
+
                         if (mExportGeometry)
+                        {
                                 exporter->ExportGeometry(objects);
+                        }
 
                         // export rays
@@ -2099 +2141 @@
         }
 
-        // export single view cells
+        //-- export single view cells
         ExportBspPvs(objects, visRays);
 }
@@ -2167 +2209 @@
                 VssRayContainer vcRays;
                 Intersectable::NewMail();
-#if 0
+#if 0 // largest view cell pvs first
                 BspViewCell *vc = dynamic_cast<BspViewCell *>(mViewCells[i]);
 #else
@@ -2301 +2343 @@
                                                                                           ViewCell *vc) const
 {
-#if 1
-    if (vc->GetMesh())
+        if (vc->GetMesh())
         {
                 exporter->ExportMesh(vc->GetMesh());
@@ -2312 +2353 @@
                 ConstructGeometry(dynamic_cast<BspViewCell *>(vc), geom);
         exporter->ExportPolygons(geom.mPolys);
-#else
-
-        Material m2;
-        m2.mDiffuseColor.b = 0.3f + Random(0.7f);
-        m2.mDiffuseColor.r = 0.0f;//0.3f + Random(0.7f);
-        m2.mDiffuseColor.g = 0.3f + Random(0.7f);
-        Material m;
-        m.mDiffuseColor.b = 0.0f;
-        m.mDiffuseColor.r = 1.0f;
-        m.mDiffuseColor.g = 0.0f;
-
-        BspViewCell *bspVc = dynamic_cast<BspViewCell *>(vc);
-        vector<BspLeaf *>::const_iterator it, it_end = bspVc->mLeaves.end();
-
-        for (it = bspVc->mLeaves.begin(); it != it_end; ++ it)
-        {
-                if ((*it)->Mailed())
-                        exporter->SetForcedMaterial(m);
-                else
-                        exporter->SetForcedMaterial(m2);
-                        //exporter->ResetForcedMaterial();
-                BspNodeGeometry geom;
-                mVspBspTree->ConstructGeometry(*it, geom);
-                exporter->ExportPolygons(geom.mPolys);
-        }
-#endif
 }