Changeset 2686 for GTP/trunk/Lib/Vis/Preprocessing/src/RandomViewCellsHandler.cpp

Timestamp:

05/18/08 00:30:13 (16 years ago)

Author:

mattausch

Message:

fixed several problems

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RandomViewCellsHandler.cpp (modified) (4 diffs)

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

@@ -136 +136 @@
 
         ViewCellPoints *currentViewCell = NULL;
-        int i = 0;
-        int j = 0;
+
+        AxisAlignedBox3 bbox = mViewCellsManager->GetViewSpaceBox();
 
         string buf;
@@ -152 +152 @@
                                 currentViewCell->first = mViewCellsManager->GetViewCellById(id);
                                         
-                                if (1)//i ++ < 5)
-                                {
-                                        viewCells.push_back(currentViewCell);
-                                        j = 0;
-                                }
+                                viewCells.push_back(currentViewCell);
+
                                 break;
                         }
@@ -164 +161 @@
                                 sscanf(buf.c_str(), "p %f %f %f %f %f %f", &pt.x, &pt.y, &pt.z, &dir.x, &dir.y, &dir.z);
                                 
+                                if (0)
+                                {
+                                        // add new point to view space box
+                                        if (!bbox.IsInside(pt))
+                                                bbox.Include(pt);
+                                }
+                                else
+                                {
+                                        // other variant: clamp to box
+                                        bbox.ClampToBox(pt);
+                                }
+
                                 SimpleRay ray(pt, dir, 0, 1);
 
-                                if (1)//j ++ < 5)
-                                        currentViewCell->second.push_back(ray);
+                                // no view cell specified => create dummy view cell
+                                if (!currentViewCell)
+                                {
+                                        currentViewCell = new ViewCellPoints();
+                                        viewCells.push_back(currentViewCell);
+                                        currentViewCell->first = NULL;
+                                }
+
+                                currentViewCell->second.push_back(ray);
 
                                 break;
@@ -175 +191 @@
                 }
         }
+
+        // set updated view space box containing all view points
+        mViewCellsManager->SetViewSpaceBox(bbox);
 
         return true;