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

Timestamp:

06/21/06 18:26:17 (18 years ago)

Author:

mattausch

Message:

fixed vsp part of vsp osp tree

File:

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

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

@@ -1747 +1747 @@
         Environment::GetSingleton()->GetIntValue("ViewCells.Visualization.clipPlaneAxis", axis);
 
-        Vector3 normal(0,0,0);
-        normal[axis] = 1;
-
-        mClipPlane = Plane3(normal, point);
+        mClipPlane = AxisAlignedPlane(axis, point[axis]);
 }
 
@@ -2428 +2425 @@
 }
 
+
+
 /**********************************************************************/
 /*                 BspViewCellsManager implementation                 */
@@ -2927 +2926 @@
 void BspViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
                                                                                                  ViewCell *vc,
-                                                                                                 const Plane3 *clipPlane) const
+                                                                                                 const AxisAlignedPlane *clipPlane) const
 {
         // export mesh if available
@@ -2938 +2937 @@
         if (clipPlane)
         {
+                const Plane3 plane = clipPlane->GetPlane();
+
                 ViewCellContainer leaves;
                 mViewCellsTree->CollectLeaves(vc, leaves);
@@ -2953 +2954 @@
 
                         const float eps = 0.00000001f;
-                        const int cf = geom.Side(*clipPlane, eps);
+                        const int cf = geom.Side(plane, eps);
 
                         if (cf == -1)
@@ -2963 +2964 @@
                                 geom.SplitGeometry(front,
                                                                    back,
-                                                                   *clipPlane,
+                                                                   plane,
                                                                    mViewSpaceBox, 
                                                                    eps);
@@ -3067 +3068 @@
 
 
-bool BspViewCellsManager::ExportViewCells(const string filename, const bool exportPvs, const ObjectContainer &objects)
+bool BspViewCellsManager::ExportViewCells(const string filename, 
+                                                                                  const bool exportPvs, 
+                                                                                  const ObjectContainer &objects)
 {
 #if STILL_HAS_TODO
@@ -3472 +3475 @@
 void KdViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
                                                                                                 ViewCell *vc,
-                                                                                                const Plane3 *clipPlane) const
+                                                                                                const AxisAlignedPlane *clipPlane) const
 {
         ViewCellContainer leaves;
@@ -4154 +4157 @@
         //-- export view cells
         if (1) 
-        {       // hack pvs
+        {       
+                // hack pvs
                 const int savedColorCode = mColorCode;
                 mColorCode = 1;
@@ -4178 +4182 @@
 
                         // export rays
-                        if (1 && mExportRays)
+                        if (0 && mExportRays)
                         {
                                 exporter->ExportRays(visRays, RgbColor(0, 1, 0));
@@ -4359 +4363 @@
                 {
                         // output rays stored with the view cells during subdivision
-                        if (0)
+                        if (1)
                         {
                                 VssRayContainer vcRays;
@@ -4394 +4398 @@
                                 }
 
+                                Debug << "here233 " << (int)vcRays.size() << endl;
+
                                 //-- export rays piercing this view cell
                                 exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
@@ -4399 +4405 @@
                 
                         // associate new rays with output view cell
-                        if (1)
+                        if (0)
                         {
                                 VssRayContainer vcRays;
@@ -4580 +4586 @@
 void VspBspViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
                                                     ViewCell *vc,
-                                                                                                        const Plane3 *clipPlane) const
+                                                                                                        const AxisAlignedPlane *clipPlane) const
 {
         if (clipPlane)
         {
+                const Plane3 plane = clipPlane->GetPlane();
+
                 ViewCellContainer leaves;
                 mViewCellsTree->CollectLeaves(vc, leaves);
@@ -4599 +4607 @@
 
                         const float eps = 0.00000001f;
-                        const int cf = geom.Side(*clipPlane, eps);
+                        const int cf = geom.Side(plane, eps);
 
                         if (cf == -1)
@@ -4609 +4617 @@
                                 geom.SplitGeometry(front,
                                                                    back,
-                                                                   *clipPlane,
+                                                                   plane,
                                                                    mViewSpaceBox, 
                                                                    eps);
@@ -4780 +4788 @@
 
 /**************************************************************************/
-/*                   VspBspViewCellsManager implementation                */
+/*                   VspOspViewCellsManager implementation                */
 /**************************************************************************/
 
@@ -5136 +5144 @@
         {
                 viewPoint = mViewSpaceBox.GetRandomPoint();
+
                 if (mVspTree->ViewPointValid(viewPoint))
                 {
@@ -5149 +5158 @@
 void VspOspViewCellsManager::ExportViewCellGeometry(Exporter *exporter,
                                                                                                         ViewCell *vc,
-                                                                                                        const Plane3 *clipPlane) const
+                                                                                                        const AxisAlignedPlane *clipPlane) const
 {
         ViewCellContainer leaves;
@@ -5156 +5165 @@
         ViewCellContainer::const_iterator it, it_end = leaves.end();
 
+        Plane3 plane;
+        
+        if (clipPlane)
+                plane = clipPlane->GetPlane();
+
         for (it = leaves.begin(); it != it_end; ++ it)
         {
@@ -5162 +5176 @@
 
                 const AxisAlignedBox3 box = mVspTree->GetBBox(vspVc->mLeaf);
-
-                if (!clipPlane || !box.Side(*clipPlane))
+                
+                if (clipPlane)
+                {
+                        if (box.Side(plane) == -1)
+                                exporter->ExportBox(box);
+                        else if (box.Side(plane) == 0)
+                        {
+                                AxisAlignedBox3 fbox, bbox;
+
+                                box.Split(clipPlane->mAxis, clipPlane->mPosition, fbox, bbox);
+
+                                exporter->ExportBox(bbox);
+                        }
+                }
+                else
+                {
                         exporter->ExportBox(box);
+                }
         }
 }
@@ -5191 +5220 @@
         //-- export view cells
         if (1) 
-        {       // hack pvs
+        {       
+                // hack pvs
                 const int savedColorCode = mColorCode;
-                mColorCode = 1;
+                mColorCode = 0;
         
                 Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
@@ -5215 +5245 @@
 
                         // export rays
-                        if (1 && mExportRays)
+                        if (0 && mExportRays)
                         {
                                 exporter->ExportRays(visRays, RgbColor(0, 1, 0));
@@ -5292 +5322 @@
                 {
                         // output rays stored with the view cells during subdivision
-                        if (0)
+                        if (1)
                         {
                                 VssRayContainer vcRays;
@@ -5298 +5328 @@
 
                                 raysOut = min((int)rays.size(), 100);
+
+                                Debug  << "here12 " << raysOut << endl;
 
                                 // collect intial view cells
@@ -5307 +5339 @@
                                 for (vit = leaves.begin(); vit != vit_end; ++ vit)
                                 {
-                                        BspLeaf *vcLeaf = dynamic_cast<BspViewCell *>(*vit)->mLeaf;
+                                        VspLeaf *vcLeaf = dynamic_cast<VspViewCell *>(*vit)->mLeaf;
                                 
                                         VssRayContainer::const_iterator rit, rit_end = vcLeaf->mVssRays.end();
@@ -5332 +5364 @@
                 
                         // associate new rays with output view cell
-                        if (1)
+                        if (0)
                         {
                                 VssRayContainer vcRays;