Changeset 1582 for GTP/trunk/Lib

Timestamp:

10/07/06 23:13:47 (18 years ago)

Author:

bittner

Message:

ViewcellsManager? issue solved

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Camera.cpp (modified) (1 diff)
• Preprocessor.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (2 diffs)
• ViewCellsManager.h (modified) (4 diffs)

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

@@ -71 +71 @@
                 ray.mFlags &= ~(Ray::STORE_TESTED_OBJECTS|Ray::STORE_KDLEAVES);
           
-          if (tree->CastRay(ray))
+          if (tree->CastRay(ray)) 
                 if (ray.intersections.size()) {
+                  cout<<"I";
                   sort(ray.intersections.begin(), ray.intersections.end());
                   MeshInstance *mesh = (MeshInstance*)ray.intersections[0].mObject;

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

@@ -431 +431 @@
           cout << "loading view cells from " << buf << endl;
           
-          mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects, true);
+          // $$ does not compile -> commented out
+          mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects, true, NULL);
           
           if (!mViewCellsManager)

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

@@ -1856 +1856 @@
                         {                       
                                 if (viewcell->GetPvs().GetSampleContribution(
-                                                                                                                         ray.mTerminationObject,
-                                                                                                                         ray.mPdf,
-                                                                                                                         contribution))
-                                  {
+                                                        ray.mTerminationObject,
+                                                        ray.mPdf,
+                                                        contribution))
+                                {
                                         ++ ray.mPvsContribution;
-                                  }
-                                ray.mRelativePvsContribution += contribution;
-                                
+                                        ray.mRelativePvsContribution += contribution;
+                                }
                         }
                         
 #if SAMPLE_ORIGIN_OBJECTS
-                        
+
                         // 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 oposite ray!
-                        
+
                         if (ray.mOriginObject && 
                                 viewcell->GetPvs().GetSampleContribution(ray.mOriginObject,
                                                                                                                  ray.mPdf,
                                                                                                                  contribution))
-                          {
+                        {
                                 ++ ray.mPvsContribution;
-                          }
-                        ray.mRelativePvsContribution += contribution;
+                                ray.mRelativePvsContribution += contribution;
+                        }
 #endif
                 }
@@ -5517 +5516 @@
                         {
                                 ++ ray.mPvsContribution;
+                                ray.mRelativePvsContribution += contribution;
                         }
-                        ray.mRelativePvsContribution += contribution;
 #endif
                 }

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

@@ -430 +430 @@
         bool GetExportPvs() const;
 
-
-  Preprocessor *GetPreprocessor() {
-        return mPreprocessor;
-  }
-  
-  void SetPreprocessor(Preprocessor *p) {
-        mPreprocessor = p;
-  }
+        /////////////////////////////
+        // static members
+        
+        /** Loads view cells from file. The view cells manager is created with 
+                respect to the loaded view cells.
+
+                @param filename the filename of the view cells
+                @param objects the scene objects
+                @param finalizeViewCells if the view cells should be post processed, i.e.
+                        a mesh is created representing the geometry
+                @param bconverter a conversion routine working with the similarities of bounding
+                boxes: if there is a certain similarity of overlap between bounding boxes, two tested
+                candidate objects are considered to be the same objects
+                @returns the view cells manager if loading was successful, false otherwise
+        */
+        static ViewCellsManager *LoadViewCells(const string &filename, 
+                                                                                   ObjectContainer *objects, 
+                                                                                   const bool finalizeViewCells,
+                                                                                   BoundingBoxConverter *bconverter = NULL);
 
 
@@ -523 +534 @@
         
         void ViewCellsManager::ResetPvs();
-
+  
+  Preprocessor *GetPreprocessor() const {
+        return mPreprocessor;
+  }
+
+  void SetPreprocessor(Preprocessor *p) {
+        mPreprocessor = p;
+  }
 
 protected:
@@ -623 +641 @@
         void UpdatePvsForEvaluation(ViewCell *root, ObjectPvs &pvs);
 
-        
+
+  
         ////////////////////////////////////////////////
 
@@ -720 +739 @@
 
         ~BspViewCellsManager();
-  
+
         int ConstructSubdivision(const ObjectContainer &objects, 
                                   const VssRayContainer &rays);