Changeset 569

Timestamp:

01/23/06 15:58:00 (18 years ago)

Author:

bittner

Message:

viewcell validy setting functions extended

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• GlRenderer.cpp (modified) (1 diff)
• Makefile (modified) (1 diff)
• RssPreprocessor.cpp (modified) (2 diffs)
• RssTree.cpp (modified) (7 diffs)
• RssTree.h (modified) (2 diffs)
• ViewCell.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (11 diffs)
• ViewCellsManager.h (modified) (6 diffs)
• default.env (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -202 +202 @@
                                                         0.0f);
   
-  //  viewcells->GetViewPoint(mViewPoint);
-
-  mViewPoint =  mSceneGraph->GetBox().GetPoint(pVector);
+  mViewCellsManager->GetViewPoint(mViewPoint);
+
+  // mViewPoint =  mSceneGraph->GetBox().GetPoint(pVector);
   
   mViewDirection = Normalize(Vector3(sin(dVector.x),

trunk/VUT/GtpVisibilityPreprocessor/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.0) on: ?t 19. I 16:46:41 2006
+# Generated by qmake (2.00a) (Qt 4.1.0) on: po 23. I 11:09:15 2006
 # Project:  preprocessor.pro
 # Template: app

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -489 +489 @@
           "#TotalSamples\n" <<totalSamples<<endl<<
           "#RssSamples\n" <<rssSamples<<endl;
-        
-
+
+        {
+          VssRayContainer contributingRays;
+          mVssRays.GetContributingRays(contributingRays, mPass);
+          mStats<<"#NUM_CONTRIBUTING_RAYS\n"<<(int)contributingRays.size()<<endl;
+        }
+        
         mVssRays.PrintStatistics(mStats);
         mViewCellsManager->PrintPvsStatistics(mStats);
@@ -543 +548 @@
   
   // viewcells->UpdatePVS(newVssRays);
-  
-
+  Debug<<"Valid viewcells before set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
+  // cull viewcells with PVS > median (0.5f)
+  mViewCellsManager->SetValidityPercentage(0, 0.5f); 
+  Debug<<"Valid viewcells after set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
+  
   while (1) {
         SimpleRayContainer rays;

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

@@ -336 +336 @@
           GetRoot(objects[i])->bbox = objects[i]->GetBox();
         }
-
         stat.nodes = i;
+        stat.leaves = i;
   } else {
         mRoots.resize(1);
@@ -347 +347 @@
         mRoots[0] = leaf;
         stat.nodes = 1;
+        stat.leaves = 1;
   }
 
@@ -356 +357 @@
           
           // first construct a leaf that will get subdivide
-          RssTreeLeaf *leaf = (RssTreeLeaf *) GetRoot(info.GetObject());
+          RssTreeLeaf *leaf = (RssTreeLeaf *) GetRoot(info.GetSourceObject());
 
           leaf->AddRay(info);
@@ -1094 +1095 @@
   
   stat.nodes+=2;
+  stat.leaves += 1;
   stat.splits[axis]++;
 
@@ -1410 +1412 @@
   stack<RayTraversalData> tstack;
 
-  RssTreeNode *root = GetRoot(info.GetObject());
+  RssTreeNode *root = GetRoot(info.GetSourceObject());
   tstack.push(RayTraversalData(root, info));
   
@@ -1550 +1552 @@
 
   stat.nodes -= collapsedNodes - 1;
+  stat.leaves -= collapsedNodes/2 - 1;
   stat.rayRefs -= totalRayCount - rayCount;
   
@@ -2771 +2774 @@
 {
   if (mPerObjectTree && object) {
-        int id = object->GetId();
-        if (id >= mRoots.size())
+        int id = object->GetId()-1;
+        if (id < 0 || id >= mRoots.size()) {
+          Debug<<"Error: object Id out of range, Id="<<id<<" roots.size()="<<mRoots.size()<<
+                endl<<flush;
           id = mRoots.size()-1; // $$ last tree is used by all unsigned objects
+        }
         return mRoots[id];
   } else

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.h

@@ -42 +42 @@
   // total number of nodes
   int nodes;
+  // number of leaves
+  int leaves;
   // number of splits along each of the axes
   int splits[7];
@@ -90 +92 @@
   int Nodes() const {return nodes;}
   int Interior() const { return nodes/2; }
-  int Leaves() const { return (nodes/2) + 1; }
+  int Leaves() const { return Nodes() - Interior(); }
 
   void Reset() {

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.h

@@ -137 +137 @@
         bool GetValid() const;
 
+  static bool SmallerPvs(const ViewCell *a,
+                                                 const ViewCell *b) {
+        return a->GetPvs().GetSize() < b->GetPvs().GetSize();
+  }
+
 protected:
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -124 +124 @@
                                                                          int maxPvsSize) const
 {
-        if ((vc->GetPvs().GetSize() > mMaxPvsSize) ||
-                (vc->GetPvs().GetSize() < mMinPvsSize))
-        {
-                return false;
-        }
-
-        return true;
+
+  if ((vc->GetPvs().GetSize() > maxPvsSize) ||
+          (vc->GetPvs().GetSize() < minPvsSize))
+        {
+          return false;
+        }
+  
+  return true;
 }
 
@@ -141 +142 @@
 }
 
+void
+ViewCellsManager::SetValidity(
+                                                          int minPvsSize, 
+                                                          int maxPvsSize) const
+{
+  ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+  
+  for (it = mViewCells.begin(); it != it_end; ++ it) {
+        SetValidity(*it, minPvsSize, maxPvsSize);
+  }
+}
+
+void
+ViewCellsManager::SetValidityPercentage(
+                                                                                const float minValid,
+                                                                                const float maxValid
+                                                                                )
+{
+  sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
+  
+  int start = mViewCells.size()*minValid;
+  int end = mViewCells.size()*maxValid;
+  
+  for (int i=0; i < mViewCells.size(); i++)
+        mViewCells[i]->SetValid(i >= start && i <= end);
+}
+
+int
+ViewCellsManager::CountValidViewcells() const
+{
+  ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+  int valid = 0;
+  for (it = mViewCells.begin(); it != it_end; ++ it) {
+        if ((*it)->GetValid())
+          valid++;
+  }
+  return valid;
+}
 
 bool ViewCellsManager::LoadViewCells(const string filename, ObjectContainer *objects)
@@ -171 +210 @@
 bool ViewCellsManager::ViewPointValid(const Vector3 &viewPoint) const
 {
+  if (!ViewCellsConstructed())
         return mViewSpaceBox.IsInside(viewPoint);
+  else {
+        if (!mViewSpaceBox.IsInside(viewPoint))
+          return false;
+        ViewCell *viewcell = GetViewCell(viewPoint);
+        if (!viewcell || !viewcell->GetValid())
+          return false;
+  }
+  return true;
 }
 
@@ -487 +535 @@
   for (it = viewcells->begin(); it != viewcells->end(); ++it) {
         ViewCell *viewcell = *it;
-        // if ray not outside of view space
-        viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+        if (viewcell->GetValid()) {
+          // if ray not outside of view space
+          viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+        }
   }
 }
@@ -526 +576 @@
   if (storeViewcells)
   {
-          ray.mViewCells.reserve(viewcells.size());
-          ray.mViewCells = viewcells;
-          }
+        ray.mViewCells.reserve(viewcells.size());
+        ray.mViewCells = viewcells;
+  }
 
   ViewCellContainer::const_iterator it = viewcells.begin();
@@ -535 +585 @@
   for (; it != viewcells.end(); ++it) {
         ViewCell *viewcell = *it;
-        // if ray not outside of view space
-        float contribution;
-        if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
-                                                                                                 ray.mPdf,
-                                                                                                 contribution
-                                                                                                 ))
-          ray.mPvsContribution++;
-        ray.mRelativePvsContribution += contribution;
+        if (viewcell->GetValid()) {
+          // if ray not outside of view space
+          float contribution;
+          if (viewcell->GetPvs().GetSampleContribution(ray.mTerminationObject,
+                                                                                                   ray.mPdf,
+                                                                                                   contribution
+                                                                                                   ))
+                ray.mPvsContribution++;
+          ray.mRelativePvsContribution += contribution;
+        }
   }
 
@@ -548 +600 @@
         for (it = viewcells.begin(); it != viewcells.end(); ++it) {
           ViewCell *viewcell = *it;
-          // if ray not outside of view space
-          viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
-        }
-
+          if (viewcell->GetValid()) {
+                // if ray not outside of view space
+                viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+          }
+        }
+  
   return ray.mRelativePvsContribution;
 }
@@ -1179 +1233 @@
 
 
-ViewCell *BspViewCellsManager::GetViewCell(const Vector3 &point)
+ViewCell *BspViewCellsManager::GetViewCell(const Vector3 &point) const
 {
   if (!mBspTree)
@@ -1880 +1934 @@
 }
 
+
+
 int VspBspViewCellsManager::Construct(const ObjectContainer &objects,
                                                                           const VssRayContainer &rays)
@@ -2209 +2265 @@
 bool VspBspViewCellsManager::ViewPointValid(const Vector3 &viewPoint) const
 {
-        return mViewSpaceBox.IsInside(viewPoint) &&
-                   mVspBspTree->ViewPointValid(viewPoint);
+  // $$JB -> implemented in viewcellsmanager (slower, but allows dynamic
+  // validy update in preprocessor for all managers)
+  return ViewCellsManager::ViewPointValid(viewPoint);
+  
+  //    return mViewSpaceBox.IsInside(viewPoint) &&
+  //               mVspBspTree->ViewPointValid(viewPoint);
 }
 
@@ -2518 +2578 @@
 
 
-ViewCell *VspBspViewCellsManager::GetViewCell(const Vector3 &point)
+ViewCell *VspBspViewCellsManager::GetViewCell(const Vector3 &point) const
 {
         if (!mVspBspTree)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -182 +182 @@
 
         /** Get a viewcell containing the specified point */
-        virtual ViewCell *GetViewCell(const Vector3 &point) = 0;
+        virtual ViewCell *GetViewCell(const Vector3 &point) const = 0;
   
         virtual void PrintPvsStatistics(ostream &s);
@@ -267 +267 @@
                                                          int maxPvsSize) const;
 
+  /** sets validy of all viewcells */
+        virtual void SetValidity(
+                                                         int minPvsSize, 
+                                                         int maxPvsSize) const;
+
+  /** set valid viewcells in the range of pvs. sorts the viewcells
+          according to the pvs and then pickups those in the ranges */
+  
+  void
+  SetValidityPercentage(
+                                                const float minValid,
+                                                const float maxValid
+                                                );
+
+  int
+  CountValidViewcells() const;
+
         /** Returns maximal allowed pvs size.
         */
@@ -417 +434 @@
 
         /** Get a viewcell containing the specified point */
-        ViewCell *GetViewCell(const Vector3 &point);
+        ViewCell *GetViewCell(const Vector3 &point) const;
 
         void CreateMesh(ViewCell *vc);
@@ -482 +499 @@
         */
         //  virtual void PrintStatistics(ostream &s) const;
-        ViewCell *GetViewCell(const Vector3 &point) { return NULL; }
+        ViewCell *GetViewCell(const Vector3 &point) const { return NULL; }
 
         float GetProbability(ViewCell *viewCell);
@@ -540 +557 @@
                                                 ViewCellContainer &viewcells);
 
-        ViewCell *GetViewCell(const Vector3 &point) { return NULL; }
+        ViewCell *GetViewCell(const Vector3 &point) const { return NULL; }
 
         float GetProbability(ViewCell *viewCell);
@@ -600 +617 @@
         float GetRendercost(ViewCell *viewCell, float objRendercost) const;
         
-        ViewCell *GetViewCell(const Vector3 &point);
+        ViewCell *GetViewCell(const Vector3 &point) const;
 
         bool GetViewPoint(Vector3 &viewPoint) const;

trunk/VUT/GtpVisibilityPreprocessor/src/default.env

@@ -13 +13 @@
 #;../data/vienna/vienna-plane.x3d
 # filename ../data/vienna/viewcells-25-sel.x3d
-# filename ../data/atlanta/atlanta2.x3d
+filename ../data/atlanta/atlanta2.x3d
 #filename ../data/soda/soda.dat
-filename ../data/soda/soda5.dat
+# filename ../data/soda/soda5.dat
 }
 
@@ -25 +25 @@
 #       type vss
         type rss
-        detectEmptyViewSpace true
+        detectEmptyViewSpace false
         pvsRenderErrorSamples 10000
 
@@ -97 +97 @@
 RssTree {
         epsilon         1e-6
-        perObjectTree true
+        perObjectTree false
 
         maxDepth        40
@@ -200 +200 @@
         }
         
-        filename ../data/soda/viewcells_soda5-2.xml
-#       filename ../data/atlanta/viewcells_atlanta2.xml
+#       filename ../data/soda/viewcells_soda5-2.xml
+        filename ../data/atlanta/viewcells_atlanta2.xml
 #       filename ../data/atlanta/atlanta_viewcells_large.x3d
 #       filename ../data/vienna/viewcells-25-sel.x3d