Changeset 1789 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

11/25/06 00:19:18 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (15 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -1956 +1956 @@
 }
 
-
+/*
 void
 ViewCellsManager::AddSampleContributions(const VssRayContainer &rays)
@@ -1964 +1964 @@
 
   VssRayContainer::const_iterator it, it_end = rays.end();
-
+cout <<"here60"<<endl;
   for (it = rays.begin(); it != it_end; ++ it) {
         AddSampleContributions(*(*it));
   }
 }
-
+*/
 
 int ViewCellsManager::GetMinPvsSize() const
@@ -1983 +1983 @@
 }
 
-
+/*
 void
 ViewCellsManager::AddSampleContributions(VssRay &ray)
-{
+{cout << "here12" << endl;
         // assumes viewcells have been stored...
         ViewCellContainer *viewcells = &ray.mViewCells;
@@ -2008 +2008 @@
         }
 }
-
+*/
 
 float ViewCellsManager::ComputeSampleContribution(VssRay &ray,
                                                                                                   const bool addRays,
                                                                                                   const bool storeViewCells)
-{
+{cout << "$$$$$$$$$$$$$4here10" << endl;
         ViewCellContainer viewcells;
 
@@ -3470 +3470 @@
         if (sortViewCells)
         {       // sort view cells to visualize the largest view cells
-                stable_sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
+                sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
         }
 
@@ -4824 +4824 @@
         {
                 // sort view cells to visualize the largest view cells
-                stable_sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
+                sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
         }
 
@@ -5278 +5278 @@
 
 
-VspOspViewCellsManager::VspOspViewCellsManager(ViewCellsTree *vcTree, const string &hierarchyType)
+VspOspViewCellsManager::VspOspViewCellsManager(ViewCellsTree *vcTree, 
+                                                                                           const string &hierarchyType)
 : ViewCellsManager(vcTree)
 {
@@ -5297 +5298 @@
         mHierarchyManager->SetViewCellsTree(mViewCellsTree);
 }
+
 
 Intersectable *
@@ -5307 +5309 @@
 #endif
 }
+
 
 HierarchyManager *VspOspViewCellsManager::CreateHierarchyManager(const string &hierarchyType)
@@ -5675 +5678 @@
         Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
 
-        Vector3 scale(0.9f, 0.9f, 0.9f);
+        //Vector3 scale(0.9f, 0.9f, 0.9f);
+        Vector3 scale(1.0f, 1.0f, 1.0f);
+
         if (exporter)
         {
@@ -5773 +5778 @@
         {
                 // sort view cells to visualize the view cells with highest render cost
-                stable_sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
+                sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
         }
 
@@ -6055 +6060 @@
         float tmin = 0, tmax = 1.0;
 
-        
         if (!GetViewSpaceBox().GetRaySegment(hray, tmin, tmax) || (tmin > tmax))
                 return 0;
@@ -6069 +6073 @@
         if (storeViewCells)
         {       
-          // copy viewcells memory efficiently
-          ray.mViewCells.reserve(viewcells.size());
-          ray.mViewCells = viewcells;
+                // copy viewcells memory efficiently
+                ray.mViewCells.reserve(viewcells.size());
+                ray.mViewCells = viewcells;
         }
 
@@ -6078 +6082 @@
         Intersectable *terminationObj = GetIntersectable(ray, true);
         Intersectable *originObj = GetIntersectable(ray, false);
-          
-        for (; it != viewcells.end(); ++ it) {
-          ViewCell *viewcell = *it;
-          
-          if (viewcell->GetValid())
+
+        for (; it != viewcells.end(); ++ it) 
+        {
+                ViewCell *viewcell = *it;
+
+                if (viewcell->GetValid())
                 {       // if ray not outside of view space
-                  float contribution;
-                  
-                  if (terminationObj) 
+                        float contribution;
+
+                        if (terminationObj) 
                         {
-                          // todo: maybe not correct for kd node pvs
-                          if (viewcell->GetPvs().GetSampleContribution(
-                                                                                                                   terminationObj, ray.mPdf, contribution))
+                                // todo: maybe not correct for kd node pvs
+                        /*      if (viewcell->GetPvs().GetSampleContribution(
+                                        terminationObj, ray.mPdf, contribution))
                                 {
-                                  ++ ray.mPvsContribution;
+                                        ++ ray.mPvsContribution;
                                 }
-                          
-                          ray.mRelativePvsContribution += contribution;
+                                ray.mRelativePvsContribution += contribution;*/
                         }
-                        
-                  ////////////////
-                  //-- for directional sampling it is important to count 
-                  //-- only contributions made in one direction!
-                  //-- the other contributions of this sample will be counted for the opposite ray!
-                  
+
+                        ////////////////
+                        //-- for directional sampling it is important to count 
+                        //-- only contributions made in one direction!
+                        //-- the other contributions of this sample will be counted for the opposite ray!
+
 #if SAMPLE_ORIGIN_OBJECTS
-                  
-                  if (originObj && 
-                          viewcell->GetPvs().GetSampleContribution(originObj,
-                                                                                                           ray.mPdf,
-                                                                                                           contribution))
+
+                /*      if (originObj && 
+                                viewcell->GetPvs().GetSampleContribution(originObj,
+                                                                                                                 ray.mPdf,
+                                                                                                                 contribution))
                         {
-                          ++ ray.mPvsContribution;
-                          ray.mRelativePvsContribution += contribution;
-                        }
+                                ++ ray.mPvsContribution;
+                                ray.mRelativePvsContribution += contribution;
+                        }*/
 #endif
                 }
         }
-        
+
         if (!addRays)
         {
@@ -6131 +6135 @@
 
                 //$$JB hack
-                viewCell->GetPvs().AddSample(terminationObj, ray.mPdf);
-                
+                float contrib;
+                //viewCell->GetPvs().AddSampleDirtyCheck(terminationObj, ray.mPdf, contrib);
+                viewCell->GetPvs().AddSample(terminationObj, ray.mPdf);//, contrib);
+
+                if (viewCell->GetPvs().GetSize() == 50)
+                //if (viewCell->GetPvs().RequiresResort())
+                {Intersectable::NewMail();
+                cout << "\nbefore sort: " << viewCell->GetPvs().GetLastSorted() << " \n";
+                        ObjectPvsIterator pit = viewCell->GetPvs().GetIterator(); int i = 0;
+                        while (pit.HasMoreEntries())
+                        {               
+                                ObjectPvsEntry entry = pit.Next();
+                Intersectable *object = entry.mObject;
+
+                                if ((i ++) == viewCell->GetPvs().GetLastSorted())
+                                        cout << "| ";
+                                
+                                //if (object->Mailed()) cout << "error!!"<<endl;
+                                object->Mail();
+                                cout << (int)object << " ";
+                        }
+
+                        //viewCell->GetPvs().Sort();
+                        
+                        /*cout << "\nafter sort\n";
+                        pit = viewCell->GetPvs().GetIterator(); i = 0;
+                        while (pit.HasMoreEntries())
+                        {               
+                                ObjectPvsEntry entry = pit.Next();
+                Intersectable *object = entry.mObject;
+
+                                if ((i ++) == viewCell->GetPvs().GetLastSorted())
+                                        cout << "| ";   
+                                cout << (int)object << " ";
+                        }*/
+                }
+                //else cout << "b";
 #if SAMPLE_ORIGIN_OBJECTS
-                viewCell->GetPvs().AddSample(originObj, ray.mPdf);
-#endif                  
-        }
-        
+                //viewCell->GetPvs().AddSample(originObj, ray.mPdf);
+#endif
+        }
+
         return ABS_CONTRIBUTION_WEIGHT*ray.mPvsContribution +
-          (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
+                (1.0f - ABS_CONTRIBUTION_WEIGHT)*ray.mRelativePvsContribution;
 }