Changeset 639 for GTP/trunk

Timestamp:

02/14/06 17:13:42 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk

Files:

• App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp (copied) (copied from GTP-Internal/trunk/Lib/Vis/work/TestCullingTerrain/TerrainFrameListener.cpp)
• App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.h (copied) (copied from GTP-Internal/trunk/Lib/Vis/work/TestCullingTerrain/TerrainFrameListener.h)
• App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrain.vcproj (copied) (copied from GTP-Internal/trunk/Lib/Vis/work/TestCullingTerrain/TestCullingTerrain.vcproj)
• App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp (copied) (copied from GTP-Internal/trunk/Lib/Vis/work/TestCullingTerrain/TestCullingTerrainApplication.cpp)
• App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.dsp (copied) (copied from GTP-Internal/trunk/Lib/Vis/work/TestCullingTerrain/TestCullingTerrainApplication.dsp)
• App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.dsw (copied) (copied from GTP-Internal/trunk/Lib/Vis/work/TestCullingTerrain/TestCullingTerrainApplication.dsw)
• App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.h (copied) (copied from GTP-Internal/trunk/Lib/Vis/work/TestCullingTerrain/TestCullingTerrainApplication.h)
• Lib/Vis/Preprocessing/scripts/default.env (modified) (7 diffs)
• Lib/Vis/Preprocessing/src/Plane3.cpp (modified) (1 diff)
• Lib/Vis/Preprocessing/src/Plane3.h (modified) (2 diffs)
• Lib/Vis/Preprocessing/src/RayInfo.cpp (modified) (2 diffs)
• Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (10 diffs)
• Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (6 diffs)
• Lib/Vis/Preprocessing/src/VspBspTree.h (modified) (2 diffs)
• Lib/Vis/Preprocessing/src/VssPreprocessor.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -13 +13 @@
 #;../data/vienna/vienna-plane.x3d
 #       filename ../data/vienna/viewcells-25-sel.x3d
-        filename ../data/atlanta/atlanta2.x3d
+#       filename ../data/atlanta/atlanta2.x3d
 #       filename ../data/soda/soda.dat
-#       filename ../data/soda/soda5.dat
+        filename ../data/soda/soda5.dat
 }
 
@@ -25 +25 @@
         type vss
 #       type rss
-        detectEmptyViewSpace true
+        detectEmptyViewSpace false
 }
 
@@ -36 +36 @@
         loadInitialSamples  false
         storeInitialSamples false
-        useViewSpaceBox true
+        useViewSpaceBox false
 #       testBeamSampling true
 }
@@ -181 +181 @@
 
         #number of active view cells
-        active 2096
+        active 1024
         maxStaticMemory 40
 
@@ -288 +288 @@
 VspBspTree {
         Construction {
-                samples 300000
+                samples 500000
                 epsilon 0.005
                 randomize false
@@ -331 +331 @@
                 missTolerance           6
                 
-                maxViewCells            150000
+                maxViewCells            256
                 
                 # used for pvs criterium
@@ -344 +344 @@
         useCostHeuristics false
         splitUseOnlyDrivingAxis false
-        
+        usePolygonSplitIfAvailable false
+
         Visualization {
                 # x3d visualization of the split planes

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

@@ -31 +31 @@
   return true;
 }
+
+
+Vector3 Plane3::FindIntersection(const Vector3 &a,                                                 
+                                                                 const Vector3 &b,
+                                                                 float *t,
+                                                                 bool *coplanar) const 
+{
+    const Vector3 v = b - a; // line from A to B
+    float dv = DotProd(v, mNormal);
+    
+    if (signum(dv) == 0)
+        {
+                if (coplanar) 
+                        (*coplanar) = true;     
+
+                if (t) 
+                        (*t) = 0;
+
+                return a;
+        }
+        
+        if (coplanar) 
+                (*coplanar) = false;
+
+    float u = - Distance(a) / dv; // TODO: could be done more efficiently
+    
+        if (t) 
+                (*t) = u;
+        
+    return a + u * v;
+}
+
+
+int Plane3::Side(const Vector3 &v, const float threshold) const 
+{
+    return signum(Distance(v), threshold);
+}
+
+
+float Plane3::FindT(const Vector3 &a, const Vector3 &b) const 
+{         
+        const Vector3 v = b - a; // line from A to B
+        const float dv = DotProd(v, mNormal);
+    
+        // does not intersect or coincident
+
+        if (signum(dv) == 0)
+                return 0;
+        
+        return - Distance(a) / dv; // TODO: could be done more efficiently
+}

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

@@ -40 +40 @@
   }
 
-  int Side(const Vector3 &v, const float threshold = 1e-6) const {
-    return signum(Distance(v), threshold);
-  }
+  /** Returns 1 if v is on front side, -1 if on back side, 0 if on plane.
+  */
+  int Side(const Vector3 &v, const float threshold = 1e-6) const;
 
   /** Finds intersection of line segment between points a and b with plane.
@@ -53 +53 @@
                                                    const Vector3 &b,
                                                    float *t = NULL,
-                                                   bool *coplanar = NULL) const 
-  {
-    const Vector3 v = b - a; // line from A to B
-    float dv = DotProd(v, mNormal);
-    
-    if (signum(dv) == 0)
-        {
-                if (coplanar) (*coplanar) = true;       
-                if (t) (*t) = 0;
-                return a;
-        }
-        
-        if (coplanar) (*coplanar) = false;
-    float u = - Distance(a) / dv; // TODO: could be done more efficiently
-    
-        if (t) (*t) = u;
-        
-    return a + u * v;
-  }
+                                                   bool *coplanar = NULL) const;
   
   /** Finds value of intersection parameter t on line segment from a to b.
-      @returns -1 if coplanar, else parameter t
+      @returns 0 if coplanar, else parameter t
   */
-  float FindT(const Vector3 &a, const Vector3 &b) const 
-  {       
-          const Vector3 v = b - a; // line from A to B
-          const float dv = DotProd(v, mNormal);
-    
-          // does not intersect or coincident
-          if (signum(dv) == 0)
-                  return 0;
-        
-          return - Distance(a) / dv; // TODO: could be done more efficiently
-  }
+  float FindT(const Vector3 &a, const Vector3 &b) const;
 
   friend bool

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

@@ -106 +106 @@
                 mMaxT = t; 
         }
-        
 #endif 
+
 
 int RayInfo::ComputeRayIntersection(const int axis, const float position, float &t) const
@@ -133 +133 @@
 {       
         t = splitPlane.FindT(mRay->GetOrigin(), mRay->GetTermination());
-//      Debug << "t: " << t << " mint " << GetMinT() << " maxt " << GetMaxT() << 
-//      " orig: " << mRay->GetOrigin() << " term " << mRay->GetTermination() << endl;
+
+        if (0)
+                Debug << "t: " << t << " mint " << GetMinT() << " maxt " << GetMaxT() 
+                      << " orig: " << mRay->GetOrigin() << " term " << mRay->GetTermination() << endl;
 
         // NOTE: if plane equals end point of ray, the ray should be classified
         // non-intersecting, otherwise polygon-plane intersections of bsp tree
         // approaches are not eliminating any rays intersecting the polygon!
-#if 1
-        if (t >= GetMaxT() - 1e-20)
+        const float thresh = 1 ? 1e-6f : 0.0f;
+
+        // segment is not intersecting plane: fond out if on front or back side
+        if (t >= GetMaxT() - thresh)
+        {
                 return splitPlane.Side(ExtrapOrigin());
-        if (t <= GetMinT() + 1e-20)
+        }
+                
+        if (t <= GetMinT() + thresh)
+        {
                 return splitPlane.Side(ExtrapTermination());
-#else
-        if (t > GetMaxT())
-                return splitPlane.Side(ExtrapOrigin());
-        else if (t < GetMinT())
-                return splitPlane.Side(ExtrapTermination());
-#endif
+        }
+        
         return 0;
 }
+
 
 float RayInfo::SegmentLength() const

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

@@ -16 +16 @@
 #include "RssPreprocessor.h"
 
-#define SAMPLE_AFTER_SUBDIVISION 0
+#define SAMPLE_AFTER_SUBDIVISION 1
 
 
@@ -115 +115 @@
 
 /// helper function which destroys rays or copies them into the output ray container
-inline void addOutRays(VssRayContainer &rays, VssRayContainer *outRays)
+inline void disposeRays(VssRayContainer &rays, VssRayContainer *outRays)
 {
         cout << "disposing samples ... ";
@@ -132 +132 @@
         else
         {
-                CLEAR_CONTAINER(rays);
-        }
+                VssRayContainer::const_iterator it, it_end = rays.end();
+
+                for (it = rays.begin(); it != it_end; ++ it)
+                {
+                        //(*it)->Unref();
+                        if (!(*it)->IsActive())
+                                delete (*it);
+                }
+        }
+
         cout << "finished" << endl;
         Debug << "disposed " << n << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
@@ -162 +170 @@
 
         // rays can be passed or deleted
-        addOutRays(initialSamples, outRays);
+        disposeRays(initialSamples, outRays);
         
 
@@ -196 +204 @@
 
 
-                addOutRays(constructionSamples, outRays);
+                disposeRays(constructionSamples, outRays);
 
                 cout << "total samples: " << numSamples << endl;
@@ -236 +244 @@
         Visualize(preprocessor->mObjects, visualizationSamples);
 
-        addOutRays(visualizationSamples, outRays);
+        disposeRays(visualizationSamples, outRays);
 
         return numSamples;
@@ -3056 +3064 @@
                                                                                   const VssRayContainer &rays)
 {
-        const int leafOut = 10;
+        const int leafOut = 20;
 
         ViewCell::NewMail();
 
-        cout << "visualization using " << mVisualizationSamples << " samples" << endl;
+        cout << "visualization using " << (int)rays.size() << " samples" << endl;
+        Debug << "visualization using " << (int)rays.size() << " samples" << endl;
         Debug << "\nOutput view cells: " << endl;
 
@@ -3066 +3075 @@
         if (0)
                 stable_sort(mViewCells.begin(), mViewCells.end(), vc_gt);
-
+        
         int limit = min(leafOut, (int)mViewCells.size());
 
-        int raysOut;
+        int raysOut = 0;
 
         //-- some rays for output
-        if (1)
-                raysOut = min((int)rays.size(), mVisualizationSamples);
-
         for (int i = 0; i < limit; ++ i)
         {
                 cout << "creating output for view cell " << i << " ... ";
 
-                VssRayContainer vcRays;
-                Intersectable::NewMail();
+        
                 ViewCell *vc;
         
@@ -3086 +3091 @@
                         vc = mViewCells[i];
                 else
-                        vc = mViewCells[Random((int)mViewCells.size())];
-
-                vector<ViewCell *> leaves;
-                mViewCellsTree->CollectLeaves(vc, leaves);
-
-        if (1)
-                {
-                        // check whether we can add the current ray to the output rays
-                        for (int k = 0; k < raysOut; ++ k)
-                        {
-                                VssRay *ray = rays[k];
-                                for     (int j = 0; j < (int)ray->mViewCells.size(); ++ j)
-                                {
-                                        ViewCell *rayvc = ray->mViewCells[j];
-
-                                        if (leaves[0] == rayvc)
-                                                vcRays.push_back(ray);
-                                }
-                        }
-                }
+                        vc = mViewCells[(int)RandomValue(0, (float)mViewCells.size() - 1)];
 
                 //bspLeaves[j]->Mail();
                 char s[64]; sprintf(s, "bsp-pvs%04d.x3d", i);
                 Exporter *exporter = Exporter::GetExporter(s);
+                
+                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
+
+                if (1 || mExportRays)
+                {
+                        if (1)
+                        {
+                                VssRayContainer vcRays;
+                VssRayContainer collectRays;
+
+                                raysOut = min((int)rays.size(), 100);
+
+                                // collect intial view cells
+                                ViewCellContainer leaves;
+                                mViewCellsTree->CollectLeaves(vc, leaves);
+
+                                ViewCellContainer::const_iterator vit, vit_end = leaves.end();
+       
+                                for (vit = leaves.begin(); vit != vit_end; ++ vit)
+                                {
+                                        BspLeaf *vcLeaf = dynamic_cast<BspViewCell *>(*vit)->mLeaf;
+                                
+                                        VssRayContainer::const_iterator rit, rit_end = vcLeaf->mVssRays.end();
+
+                                        for (rit = vcLeaf->mVssRays.begin(); rit != rit_end; ++ rit)
+                                        {
+                                                collectRays.push_back(*rit);
+                                        }
+                                }
+
+                                VssRayContainer::const_iterator rit, rit_end = collectRays.end();
+
+                                for (rit = collectRays.begin(); rit != rit_end; ++ rit)
+                                {
+                                        float p = RandomValue(0.0f, (float)collectRays.size());
+                        
+                                        if (p < raysOut)
+                                                vcRays.push_back(*rit);
+                                }
+                                //-- export rays piercing this view cell
+                                exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
+                        }
+
+                        
+
+                        if (0)
+                        {
+                                VssRayContainer vcRays;
+                                raysOut = min((int)rays.size(), mVisualizationSamples);
+                                // check whether we can add the current ray to the output rays
+                                for (int k = 0; k < raysOut; ++ k)
+                                {
+                                        VssRay *ray = rays[k];
+                                        for     (int j = 0; j < (int)ray->mViewCells.size(); ++ j)
+                                        {
+                                                ViewCell *rayvc = ray->mViewCells[j];
+        
+                                                if (rayvc == vc)
+                                                        vcRays.push_back(ray);
+                                        }
+                                }       
+                                
+                                //-- export rays piercing this view cell
+                                exporter->ExportRays(vcRays, RgbColor(1, 1, 0));
+                        }
+
+                }
+                
+                
+
+
                 exporter->SetWireframe();
 
@@ -3117 +3174 @@
 
                 ExportViewCellGeometry(exporter, vc);
-
-
-                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc)
-                          << ", piercing rays=" << (int)vcRays.size() << endl;
-                        //  << ", leaves=" << (int)vc->mLeaves.size() << endl;
-
-                
-                //-- export rays piercing this view cell
+        
+
+                m.mDiffuseColor = RgbColor(1, 0, 0);
+            exporter->SetForcedMaterial(m);
+
+                exporter->SetFilled();
+
+
                 if (1)
                 {
-                        exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
+                        ObjectPvsMap::const_iterator oit,
+                                oit_end = vc->GetPvs().mEntries.end();
+
+
+                        exporter->SetFilled();
+
+                        Intersectable::NewMail();
+        
+                        // output PVS of view cell
+                        for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                        {               
+                                Intersectable *intersect = (*oit).first;
+
+                                if (!intersect->Mailed())
+                                {
+                                        //m = RandomMaterial();
+                                        //exporter->SetForcedMaterial(m);
+
+                                        exporter->ExportIntersectable(intersect);
+                                        intersect->Mail();
+                                }
+                        }
                 }
                 else
                 {
-
-                        ViewCellContainer leaves;
-                        mViewCellsTree->CollectLeaves(vc, leaves);
-
-                        ViewCellContainer::const_iterator lit, lit_end = leaves.end();
-
-                        for (lit = leaves.begin(); lit != lit_end; ++ lit)
-                        {
-                                BspLeaf *l = dynamic_cast<BspViewCell *>(*lit)->mLeaf;
-                                exporter->ExportRays(l->mVssRays);
-                        }
-                }
-
-        
-                m.mDiffuseColor = RgbColor(1, 0, 0);
-                exporter->SetForcedMaterial(m);
-
-                ObjectPvsMap::const_iterator it,
-                        it_end = vc->GetPvs().mEntries.end();
-
-                exporter->SetFilled();
-
-        
-                // output PVS of view cell
-                for (it = vc->GetPvs().mEntries.begin(); it != it_end; ++ it)
-                {
-                
-                        Intersectable *intersect = (*it).first;
-
-                        if (!intersect->Mailed())
-                        {
-                                Material m = RandomMaterial();
-                                exporter->SetForcedMaterial(m);
-
-                                exporter->ExportIntersectable(intersect);
-                                intersect->Mail();
-                        }
-                }
-
-                
+                        exporter->ExportGeometry(objects);
+                }
+
                 DEL_PTR(exporter);
                 cout << "finished" << endl;

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

@@ -18 +18 @@
 #include "Beam.h"
 
+#define USE_FIXEDPOINT_T 0
+
 
 //-- static members
@@ -66 +68 @@
 mViewCellsManager(NULL),
 mOutOfBoundsCell(NULL),
-mStoreRays(false),
+mStoreRays(true),
 mRenderCostWeight(0.5),
 mUseRandomAxis(false),
@@ -602 +604 @@
                         RayInfoContainer::const_iterator it, it_end = tData.mRays->end();
                         for (it = tData.mRays->begin(); it != it_end; ++ it)
+                        {
+                                (*it).mRay->Ref();                      
                                 leaf->mVssRays.push_back((*it).mRay);
+                        }
                 }
 
@@ -1886 +1891 @@
 
 
+void VspBspTree::CollectRays(VssRayContainer &rays)
+{
+        vector<BspLeaf *> leaves;
+
+        vector<BspLeaf *>::const_iterator lit, lit_end = leaves.end();
+
+        for (lit = leaves.begin(); lit != lit_end; ++ lit)
+        {
+                BspLeaf *leaf = *lit;
+                VssRayContainer::const_iterator rit, rit_end = leaf->mVssRays.end();
+
+                for (rit = leaf->mVssRays.begin(); rit != rit_end; ++ rit)
+                        rays.push_back(*rit);
+        }
+}
+
+
 void VspBspTree::ValidateTree()
 {
@@ -1988 +2010 @@
                                                   RayInfoContainer &rays,
                                                   RayInfoContainer &frontRays,
-                                                  RayInfoContainer &backRays)
+                                                  RayInfoContainer &backRays) const
 {
         int splits = 0;
@@ -2015 +2037 @@
                         {
                                 //-- split ray
-                                //-- test if start point behind or in front of plane
+                                //   test if start point behind or in front of plane
                                 const int side = plane.Side(bRay.ExtrapOrigin());
 

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

@@ -310 +310 @@
         void CollapseViewCells();
 
+        /** Collects rays stored in the leaves.
+        */
+        void CollectRays(VssRayContainer &rays);
+
+
         ViewCellsTree *mViewCellsTree;
+
+
 protected:
 
@@ -502 +509 @@
                                   RayInfoContainer &rays, 
                               RayInfoContainer &frontRays, 
-                                  RayInfoContainer &backRays);
+                                  RayInfoContainer &backRays) const;
 
 

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

@@ -531 +531 @@
   if (mUseViewSpaceBox)
   {
-          if (0)
+          if (1)
                   mViewSpaceBox = box;
           else