Changeset 682 for GTP/trunk

Timestamp:

03/08/06 18:35:34 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (2 diffs)
• ViewCellBsp.cpp (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (1 diff)
• VspBspTree.cpp (modified) (3 diffs)

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

@@ -1573 +1573 @@
                                         "rays.out");
 
-        RegisterOption("Preprocessor.useGlRenderer",
-                                        optBool,
-                                        "useGlRenderer",
-                                        "false");
-
         RegisterOption("Preprocessor.loadPolygonsAsMeshes",
                                         optBool,
@@ -1588 +1583 @@
                                    "10000");
 
+        
+        RegisterOption("Preprocessor.useGlRenderer",
+                                        optBool,
+                                        "preprocessor_use_gl_renderer=",
+                                        "false");
+
         RegisterOption("Preprocessor.useGlDebugger",
                                         optBool,
-                                        "useGlDebugger",
+                                        "preprocessor_use_gl_debugger=",
                                         "false");
 
         RegisterOption("Preprocessor.detectEmptyViewSpace",
                                    optBool,
-                                   "detectEmptyViewSpace",
+                                   "preprocessor_detect_empty_viewspace=",
                                    "false");
         
         RegisterOption("Preprocessor.quitOnFinish",
                                    optBool,
-                                   "quitOnFinish",
+                                   "preprocessor_quit_on_finish=",
                                    "true");
+
+
 
         /**************************************************************************************/

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

@@ -3023 +3023 @@
         // get cross section of new polygon
         Polygon3 *planePoly = box.CrossSection(splitPlane);
-
+        //Vector3 ndummy = planePoly->GetSupportingPlane().mNormal;
         // split polygon with all other polygons
         planePoly = SplitPolygon(planePoly, epsilon);
 
-        bool splitsGeom = (planePoly != NULL)
-
+        bool splitsGeom = (planePoly != NULL);
 
         //-- new polygon splits all other polygons
@@ -3099 +3098 @@
         if (planePoly)
         {
+                // add polygon with reverse orientation to front cell
+                Plane3 reversePlane(splitPlane);
+                reversePlane.ReverseOrientation();
+
+                //Debug << "poly normal : " << ndummy << " split plane normal " << splitPlane.mNormal << endl;
                 // add polygon with normal pointing into positive half space to back cell
                 back.Add(planePoly, splitPlane);
                 //back.mPolys.push_back(planePoly);
-
-                // add polygon with reverse orientation to front cell
-                Plane3 reversePlane(splitPlane);
-                reversePlane.ReverseOrientation();
-                front.Add(planePoly->CreateReversePolygon(), reversePlane);
+                Polygon3 *reversePoly = planePoly->CreateReversePolygon();
+                front.Add(reversePoly, reversePlane);
+                Debug << "poly normal : " << reversePoly->GetSupportingPlane().mNormal << " split plane normal " << reversePlane.mNormal << endl;
         }
 

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

@@ -3483 +3483 @@
                         BspNodeGeometry back;
 
-        
                         BspLeaf *leaf = dynamic_cast<BspViewCell *>(*it)->mLeaf;
-
                         mVspBspTree->ConstructGeometry(leaf, geom);
-                        
-                        geom.SplitGeometry(front,
-                                                           back,
-                                                           *clipPlane,
-                                                           mViewSpaceBox, 
-                                                           0.0001f);
-
-                        if (back.Size() >= 3)
-                                exporter->ExportPolygons(back.GetPolys());
+
+                        const int cf = Polygon3::ClassifyPlane(geom.GetPolys(), *clipPlane, 0.0005);
+
+                        if (cf == Polygon3::BACK_SIDE)
+                        {
+                                exporter->ExportPolygons(geom.GetPolys());
+                        }
+                        else if (cf == Polygon3::SPLIT)
+                        {
+                                geom.SplitGeometry(front,
+                                                                   back,
+                                                                   *clipPlane,
+                                                                   mViewSpaceBox, 
+                                                                   0.0001f);
+        
+                                if (back.Size() >= 3)
+                                        exporter->ExportPolygons(back.GetPolys());
+                        }
                 }
         }

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

@@ -154 +154 @@
         Debug << "use random axis: " << mUseRandomAxis << endl;
         Debug << "breath first splits: " << mBreathFirstSplits << endl;
-        
+        Debug << "empty view cells merge: " << mEmptyViewCellsMergeAllowed << endl;
+
         Debug << "octree: " << mSimulateOctree << endl;
 
@@ -1825 +1826 @@
                 
                 // clamp because of possible precision issues
-                if (1)
-                {
-                        if (!splitSuccessFull || (pFront <= 0) || (pBack <= 0) || 
-                                !geomFront.Valid() || !geomBack.Valid())
-                        {
-                                Debug << "error f: " << pFront << " b: " << pBack << endl;
-                                return 999;
-                        }
+                if (0 && 
+                        (!splitSuccessFull || (pFront <= 0) || (pBack <= 0) || 
+                        !geomFront.Valid() || !geomBack.Valid()))
+                {
+                        Debug << "error f: " << pFront << " b: " << pBack << endl;
+                        return 999;
                 }
         }
@@ -3388 +3387 @@
                                 // in the tree?
                                 if (mEmptyViewCellsMergeAllowed ||
-                                        (!leaf->GetViewCell()->GetPvs().Empty() && ! (*nit)->GetViewCell()->GetPvs().Empty()) ||
+                                        !leaf->GetViewCell()->GetPvs().Empty() || !(*nit)->GetViewCell()->GetPvs().Empty() ||
                     leaf->IsSibling(*nit))
                                 {