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

Timestamp:

01/18/08 16:28:30 (16 years ago)

Author:

mattausch

Message:

worked on dynamic objects

File:

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

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

@@ -2407 +2407 @@
                                                                                                    Intersectable *obj,
                                                                                                    const Vector3 &pt,
-                                                                                                   const bool addSamplesToPvs)
+                                                                                                   bool addSamplesToPvs)
 {
         // check if we are outside of view space
@@ -2424 +2424 @@
         if (addSamplesToPvs) 
         {
+                //if (obj->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)cout << "here12 " << endl;
+
                 hasAbsContribution = viewCell->GetPvs().AddSampleDirtyCheck(obj, ray.mPdf);
                 //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf);
@@ -2437 +2439 @@
                         viewCell->GetPvs().GetSampleContribution(obj, ray.mPdf, relContribution);
         }
-
-        //cout << "here6: " << ray.GetDir() << " ";
 
         // $$ clear the relative contribution as it is currently not correct anyway
@@ -2483 +2483 @@
 
 void
-ViewCellsManager::DeterminePvsObjects(
-                                                                          VssRayContainer &rays,
-                                                                          const bool useHitObjects)
+ViewCellsManager::DeterminePvsObjects(VssRayContainer &rays,
+                                                                          bool useHitObjects)
 {
         if (!useHitObjects) 
@@ -2498 +2497 @@
                         // set only the termination object
                         vssRay->mTerminationObject = GetIntersectable(*vssRay, true);
+                        
+                        if (vssRay->mTerminationObject->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)     
+                                cout << "r";
+
 #if 0
-                  if (vssRay->mTerminationObject == NULL) {
-                        cerr<<"Error in DeterminePvsObjects - termination object maps to NULL!"<<endl;
-                  }
+                  if (vssRay->mTerminationObject == NULL)
+                          cerr<<"Error in DeterminePvsObjects - termination object maps to NULL!"<<endl;
 #endif
                 }
         }
-  
 }
 
@@ -2547 +2548 @@
 float
 ViewCellsManager::ComputeSampleContribution(VssRay &ray,
-                                                                                        const bool addRays,
-                                                                                        const bool storeViewCells,
-                                                                                        const bool useHitObjects)
+                                                                                        bool addRays,
+                                                                                        bool storeViewCells,
+                                                                                        bool useHitObjects)
 {
         ray.mPvsContribution = 0;
@@ -2595 +2596 @@
                 // traverse the view space subdivision
                 CastLineSegment(origin, termination, viewCells);
-
                 lastVssRay = &ray;
         }
@@ -2631 +2631 @@
         pvsTimer.Entry();
 #endif
-        
+        //if (terminationObj->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)
+        //      cout << "found tmi: " << Intersectable::GetTypeName(terminationObj) << " " << viewCells.size() << endl;
         bool contri = false;
         ViewCellContainer::const_iterator it = viewCells.begin();
@@ -2638 +2639 @@
         {
                 if (ComputeViewCellContribution(*it, 
-                                                ray, 
-                                                                        terminationObj, 
-                                                                        ray.mTermination, 
-                                                                        addRays))
+                                                    ray, 
+                                                                                terminationObj, 
+                                                                                ray.mTermination, 
+                                                                                addRays))
                 {
                         contri = true;
@@ -3166 +3167 @@
 void ViewCellsManager::MergeViewCellsRecursivly(ObjectPvs &pvs, 
                                                                                                 const ViewCellContainer &viewCells, 
-                                                                                                const int leftIdx, 
-                                                                                                const int rightIdx) const
+                                                                                                int leftIdx, 
+                                                                                                int rightIdx) const
 {
         if (leftIdx == rightIdx)