Changeset 880 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

05/03/06 01:13:24 (18 years ago)

Author:

mattausch

Message:

added filter to online stuff (not fully working, too slow
)

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCell.cpp (modified) (1 diff)
• ViewCell.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (2 diffs)
• ViewCellsManager.h (modified) (2 diffs)
• ViewCellsParser.cpp (modified) (1 diff)

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

@@ -174 +174 @@
 {
         return mPvs;
+}
+
+
+void ViewCell::SetPvs(const ObjectPvs &pvs)
+{
+        mPvs = pvs;
 }
 

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

@@ -117 +117 @@
 
         ObjectPvs &GetPvs();
+
+        void SetPvs(const ObjectPvs &pvs);
 
         /** Type of view cells.

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

@@ -4959 +4959 @@
         Vector3 bsize = mViewSpaceBox.Size();
         const Vector3 viewPoint(mViewSpaceBox.Center());
-        float w = Magnitude(mViewSpaceBox.Size())*mFilterWidth;
+        float w = Magnitude(mViewSpaceBox.Size()) * mFilterWidth;
         const Vector3 width = Vector3(w);
         
@@ -4980 +4980 @@
 
                 exporter->SetForcedMaterial(RgbColor(0,1,0));
-                ExportViewCellGeometry(exporter,  GetViewCell(viewPoint));
+                ExportViewCellGeometry(exporter, GetViewCell(viewPoint));
 
                 //exporter->ResetForcedMaterial();

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

@@ -43 +43 @@
   ViewCell *mViewCell;
 
-  // input parameter is the render budget for the PrVS
+  // input parameter is the render budget for the PrVs
   float mRenderBudget;
 
@@ -467 +467 @@
                                                                                 ViewCellContainer &viewCells) const;
 
+        /** Tests the visibility filter functionality.
+        */
         virtual void TestFilter(const ObjectContainer &objects) {};
 

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

@@ -300 +300 @@
                                   lower_bound(mObjects->begin(), mObjects->end(), (Intersectable *)&dummyInst, ilt);
                                 
-                                Intersectable *obj = *oit;
-                                
-                                if (obj->GetId() == objId)
+                                                        
+                                if ((oit != mObjects->end()) && ((*oit)->GetId() == objId))
                                 {
-                                  // $$JB we should store a float a per object which corresponds
-                                  // to sumof pdfs, i.e. its relative visibility
-                                  // temporarily set to 1.0f
-                                        viewCell->GetPvs().AddSample(obj, 1.0f);                                
+                                        // $$JB we should store a float a per object which corresponds
+                                        // to sumof pdfs, i.e. its relative visibility
+                                        // temporarily set to 1.0f
+                                        viewCell->GetPvs().AddSample(*oit, 1.0f);                               
                                 }
                                 else
                                 {
-                                        Debug << "error: object does not exist" << endl;
+                                        Debug << "error: object with id " << objId << " does not exist" << endl;
                                 }
                         }