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

Timestamp:

05/08/07 13:04:43 (17 years ago)

Author:

mattausch

Message:

cleaned up project files

File:

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

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

@@ -6652 +6652 @@
         stream << "</ViewCells>" << endl;
 
+
         //////////////////////
         //-- export the view space hierarchy
@@ -6808 +6809 @@
 }
 
-
-#if 1
 
 void VspOspViewCellsManager::EvalViewCellPartition()
@@ -6898 +6897 @@
                         Debug << "statistics computed in " << timeDiff * 1e-3 << " secs" << endl;
 
-#if 0
-                        //////////////
-                        // filtered stats
-
-                        sprintf(suffix, "-%09d-eval-filter.log", castSamples);
-                        const string filename2 = string(statsPrefix) + string(suffix);
-
-                        startTime = GetTime();
-                        
-                        cout << "compute new statistics for filtered pvs ... " << endl;
-
-                        ofstream ofstr2(filename2.c_str());
-                        mHierarchyManager->EvaluateSubdivision2(ofstr2, splitsStepSize, true);
-
-                        timeDiff = TimeDiff(startTime, GetTime());
-                        cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
-                        cout << "*************************************" << endl;
-                        Debug << "filtered statistics computed in " << timeDiff * 1e-3 << " secs" << endl;
-#endif
-
-                        // only for debugging purpose
-                        if (0)
-                        {
-                                ViewCellContainer viewCells;
-                                mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), viewCells);
-
-                                ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
-                                int pvsSize = 0;
-
-                                for (vit = viewCells.begin(); vit != vit_end; ++ vit)
-                                {
-                                        pvsSize += (*vit)->GetPvs().GetSize();
-                                }
-
-                                cout << "debug entries: " << pvsSize << ", memcost: " 
-                                         << (float)pvsSize * ObjectPvs::GetEntrySize() << endl;
-                        }
                         ++ pass;
                 }
@@ -6959 +6921 @@
 
                 //for (int pass = histoStepSize; pass <= numLeaves; pass += histoStepSize)
-                if (1)
-                {
-                        string filename;
-
-                        cout << "computing histogram for " << pass << " view cells" << endl;
-
-                        //////////////////////////////////////////
-            //-- evaluate histogram for pvs size
-
-                        cout << "computing pvs histogram for " << pass << " view cells" << endl;
-
-                        sprintf(str, "-%09d-histo-pvs2.log", pass);
-                        filename = string(statsPrefix) + string(str);
-
-                        EvalViewCellHistogramForPvsSize(filename, pass);
-                }
-        }
-}
-
-#endif
+
+                string filename;
+
+                cout << "computing histogram for " << pass << " view cells" << endl;
+
+                /////////////////////////////
+                //-- evaluate histogram for pvs size
+
+                cout << "computing pvs histogram for " << pass << " view cells" << endl;
+
+                sprintf(str, "-%09d-histo-pvs2.log", pass);
+                filename = string(statsPrefix) + string(str);
+
+                EvalViewCellHistogramForPvsSize(filename, pass);
+        }
+}
+
 
 void VspOspViewCellsManager::FinalizeViewCells(const bool createMesh)
@@ -6993 +6952 @@
 
 #if TEST_PACKETS
-#ifdef USE_SSE
-
-float ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays,
-                                                                                                   const bool addContributions,
-                                                                                                   const bool storeViewCells,
-                                                                                                   const bool useHitObjects)
-{
+
+float VspOspViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays,
+                                                                                                                 const bool addContributions,
+                                                                                                                 const bool storeViewCells,
+                                                                                                                 const bool useHitObjects)
+{
+        if (!ViewCellsConstructed()) 
+                return 0;
+        
         float sum = 0.0f;
-
         VssRayContainer::const_iterator it, it_end = rays.end();
 
         VssRayContainer tmpRays;        
-        RayPacket packet;
 
         for (it = rays.begin(); it != it_end; ++ it) 
         {
-                if (!ViewCellsConstructed()) 
-                {
-                        // view cells not yet constructed
-                        // just take the lenghts of the rays as contributions
-                        if ((*it)->mTerminationObject)
+                sum += ComputeSampleContribution(*(*it), addContributions, storeViewCells, useHitObjects);
+
+                tmpRays.push_back(new VssRay(*(*it)));
+                
+                if (tmpRays.size() == 4)
+                {
+                        // cast packets of 4 rays
+                        RayPacket packet(tmpRays);
+                        mHierarchyManager->CastLineSegment(packet);
+                
+                        for (int i = 0; i < 4; ++ i)
                         {
-                                sum += (*it)->Length();
+                                ComputeSampleContribution(*tmpRays[i], addContributions, true, useHitObjects);
+
+                                //////////
+                                // compare results
+
+                                cout << "ray " << i << ": " << (int)tmpRays[i]->mViewCells.size() << " " << (int)packet.mViewCells[i].size() << endl;
                         }
-                } 
-                else 
-                {
-                        sum += ComputeSampleContribution(*(*it), addContributions, storeViewCells, useHitObjects);
-
-                        tmpRays.push_back(new VssRay(*it));
+
                         
-                        if (tmpRays.size() == 4)
-                        {
-                                // cast packets of 4 rays
-                                RayPacket packet(tmpRays);
-                                mHierarchyManager->CastLineSegment(packet);
-
-                                for (int i = 0; i < 4; ++ i)
-                                {
-                                        ComputeSampleContribution(tmpRays[i], addContributions, true, useHitObjects);
-                                }
-
-                                // compare results
-                                //////////
-
-                                CLEAR_CONTAINER(tmpRays);
-                        }
-                }
-        }
+                        
+                        CLEAR_CONTAINER(tmpRays);
+                }
+        }
+cout << "=================\nhere6"<<endl;
+        CLEAR_CONTAINER(tmpRays);
 
         cout << "view cell cast time: " << viewCellCastTimer.TotalTime() << " s" << endl;
@@ -7053 +7006 @@
 
 #endif
-#endif
-
-}
+
+
+}