Changeset 392 for trunk/VUT

Timestamp:

11/09/05 01:54:05 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (5 diffs)
• src/Preprocessor.h (modified) (1 diff)
• src/Ray.h (modified) (2 diffs)
• src/SamplingPreprocessor.cpp (modified) (4 diffs)
• src/SamplingPreprocessor.h (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (9 diffs)
• src/ViewCellBsp.h (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -56 +56 @@
 
 Sampling {
-        totalSamples    300000
+        totalSamples    250000
         samplesPerPass  3
 }
@@ -73 +73 @@
                 minPvs 10
                 maxPvs 300
-                samples 100
+                samples 0
         }
 
@@ -88 +88 @@
         #       input fromViewCells
         #       input fromSceneGeometry
-                samples 200000
+                samples 50000
                 sideTolerance 0.005
         }
@@ -133 +133 @@
         Termination {
                 # autopartition
-                maxRays 300
+                maxRays 100
                 maxPolygons 0
                 maxDepth 50
@@ -152 +152 @@
         
         
-        Visualization
-        {
-                # if split polys are stored for visualization
-                storeSplitPolys false
+        Visualization {
                 # x3d visualization of the split planes
                 exportSplits true
                 # how much samples should be used in visualization
-        
-                samples 2000
+                samples 300000
         }
 }

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.h

@@ -114 +114 @@
 
   /// the view cell corresponding to unbounded space
-  ViewCell mUnbounded;
+  BspViewCell mUnbounded;
 };
 

trunk/VUT/GtpVisibilityPreprocessor/src/Ray.h

@@ -41 +41 @@
 
     Intersection(const float t,
-                                                                 Intersectable *object,
-                                                                 const int face):mT(t), mObject(object), mFace(face) {}
+                                 Intersectable *object,
+                                 const int face):mT(t), mObject(object), mFace(face) {}
                 
     Intersection() {}
@@ -112 +112 @@
   // Inititalize the ray again when already constructed
   void Init(const Vector3 &wherefrom,
-                                                const Vector3 &whichdir,
-                                                const int _type, 
-                                                bool dirNormalized = false) {
+                        const Vector3 &whichdir,
+                        const int _type, 
+                        bool dirNormalized = false) {
     loc = wherefrom;
     dir = (dirNormalized || _type == LINE_SEGMENT) ? whichdir: Normalize(whichdir) ;

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -569 +569 @@
                 }
 
-                cout << "starting post processing using " << (int)mSampleRays.size() << " samples ... ";
+                cout << "starting post processing using " << mPostProcessSamples << " samples ... ";
                 
                 long startTime = GetTime();
@@ -690 +690 @@
 }
 
-void SamplingPreprocessor::ProcessBspViewCells(Ray &ray,
-                                                                                           Intersectable *object,
-                                                                                           int faceIndex,
+void SamplingPreprocessor::ProcessBspViewCells(const Ray &ray,
+                                               Intersectable *object,
+                                                                                           const int faceIndex,
                                                                                            int &contributingSamples,
                                                                                            int &sampleContributions)
@@ -702 +702 @@
                         ((int)mSampleRays.size() < mBspConstructionSamples))
                 {
-                        // also add origin to sample in order to extract it as input polygons
                         MeshInstance *mi = dynamic_cast<MeshInstance *>(object);
-                        ray.sourceObject = Ray::Intersection(0.0, mi, faceIndex);
-                                                        
-                        mSampleRays.push_back(new Ray(ray));
+                        
+                        Ray *sRay = new Ray(ray);
+                        mSampleRays.push_back(sRay);
+                
+                        // also add origin to sample
+                        sRay->sourceObject = Ray::Intersection(0.0, object, faceIndex);
                 }
                 else
                 {
-                        // construct BSP tree using the samples
+                        // construct BSP tree using the collected samples
                         cout << "building bsp tree from " << (int)mSampleRays.size() << " samples " << endl;
                         BuildBspTree();
@@ -910 +912 @@
                         exporter->SetForcedMaterial(m);
 
-                        exporter->SetWireframe();
+                        //exporter->SetWireframe();
 
                         // output PVS of view cell

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.h

@@ -75 +75 @@
                 @param sampleContributions contribution of the samples
         */
-        void ProcessBspViewCells(Ray &ray,
+        void ProcessBspViewCells(const Ray &ray,
                                                          Intersectable *object,
-                                                         int faceIndex,
+                                                         const int faceIndex,
                                                          int &contributingSamples,
                                                          int &sampleContributions);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -253 +253 @@
 }
 
-void BspLeaf::GenerateViewCell(const BoundedRayContainer &rays, 
-                                                           int &sampleContributions,
-                                                           int &contributingSamples)
+void BspLeaf::AddToPvs(const BoundedRayContainer &rays, 
+                                           int &sampleContributions,
+                                           int &contributingSamples)
 {
         sampleContributions = 0;
         contributingSamples = 0;
-
-        mViewCell = dynamic_cast<BspViewCell *>(ViewCell::Generate());
-        mViewCell->mBspLeaves.push_back(this);
 
     BoundedRayContainer::const_iterator it, it_end = rays.end();
@@ -273 +270 @@
                 if (!ray->intersections.empty())
                 {       
-            contribution += mViewCell->GetPvs().AddSample(ray->intersections[0].mObject);
-                }
-
-                contribution += mViewCell->GetPvs().AddSample(ray->sourceObject.mObject);
+            //contribution += mViewCell->GetPvs().AddSample(ray->intersections[0].mObject);
+                }
+
+                //contribution += mViewCell->GetPvs().AddSample(ray->sourceObject.mObject);
 
                 if (contribution > 0)
@@ -294 +291 @@
 /****************************************************************/
 
-BspTree::BspTree(ViewCell *viewCell): 
+BspTree::BspTree(BspViewCell *viewCell): 
 mRootCell(viewCell), mRoot(NULL), mGenerateViewCells(false),
 mStorePiercingRays(true)
@@ -707 +704 @@
                 BspLeaf *leaf = dynamic_cast<BspLeaf *>(tData.mNode);
         
+                BspViewCell *viewCell;
+
                 // generate new view cell for each leaf
                 if (mGenerateViewCells)
                 {
-                        int conSamp, sampCon;
-                        leaf->GenerateViewCell(*tData.mRays, conSamp, sampCon);
+                        viewCell = dynamic_cast<BspViewCell *>(ViewCell::Generate());
+                }
+                else
+                {
+                        // add view cell to leaf
+                        viewCell = dynamic_cast<BspViewCell *>(tData.mViewCell);
+                }
+
+                leaf->SetViewCell(viewCell);
+                viewCell->mBspLeaves.push_back(leaf);
+
+                //-- add pvs
+                if (viewCell != mRootCell)
+                {
+                        int conSamp = 0, sampCon = 0;
+                        leaf->AddToPvs(*tData.mRays, conSamp, sampCon);
                         
                         mStat.contributingSamples += conSamp;
                         mStat.sampleContributions += sampCon;
-                }
-                else
-                {
-                        // add view cell to leaf
-                        leaf->SetViewCell(dynamic_cast<BspViewCell *>(tData.mViewCell));
-                        leaf->mViewCell->mBspLeaves.push_back(leaf);
                 }
 
@@ -1334 +1341 @@
 
                 if (1) // use front and back cell areas to approximate volume
-                {
-                        //-- compute area
-                
+                {       
                         // construct child geometry with regard to the candidate split plane
                         frontData.mCell = cell.ConstructChild(*this, candidatePlane, true);
                         backData.mCell = cell.ConstructChild(*this, candidatePlane, false);
 
-                        frontData.mArea = frontData.mCell->GetArea();
-                        backData.mArea = backData.mCell->GetArea();
-
-                        pFront = frontData.mArea;
-                        pBack = backData.mArea;
+                        pFront = frontData.mArea = frontData.mCell->GetArea();
+                        pBack = backData.mArea = backData.mCell->GetArea();
 
                         pOverall = area;
@@ -1409 +1411 @@
 
         if ((sSplitPlaneStrategy & PVS) && area && pvs)
-                val += sPvsFactor * (frontData.mPvs * pFront + (backData.mPvs * pBack)) /       (pOverall * (float)pvs * 2);
-
-        Debug << "pvs: " << pvs << " totalArea: " << area 
+                val += sPvsFactor * (frontData.mPvs * pFront + (backData.mPvs * pBack)) /
+                           (pOverall * (float)pvs * 2);
+
+        Debug << "totalpvs: " << pvs << " ptotal: " << pOverall
                   << " frontpvs: " << frontData.mPvs << " pFront: " << pFront 
                   << " backpvs: " << backData.mPvs << " pBack: " << pBack 
@@ -2486 +2489 @@
         if (!planePoly)
         {
-                Debug << "returning 'same' geometry " << mPolys.size();
                 //geometry is not changed at all, hence just copy polygons
                 PolygonContainer::const_iterator it, it_end = mPolys.end();
+
                 for (it = mPolys.begin(); it != it_end; ++ it)
                         childCell->mPolys.push_back(new Polygon3((*it)->mVertices));
@@ -2513 +2516 @@
                                                 
                                         poly->Split(splitPlane, *frontPoly, *backPoly, splitPts);
+
                                         DEL_PTR(poly);
 
@@ -2554 +2558 @@
         childCell->mSides.push_back(side);
 
-        Debug << "returning new geometry " << mPolys.size();
-
+        Debug << "returning new geometry " << mPolys.size() << " CHILD: " << childCell->mPolys.size() << endl;
+
+        Debug << "old area " << this->GetArea() << " new: " << childCell->GetArea() << endl;
         return childCell;
 }

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -315 +315 @@
         void SetViewCell(BspViewCell *viewCell);
 
-        /** Generates new view cell and adds rays to the PVS.
+        /** Adds rays to the PVS.
                 @param sampleContributions the number contributions of the sampels
                 @param contributingSampels the number of contributing rays
                 
         */
-        void GenerateViewCell(const BoundedRayContainer &rays, 
-                                              int &sampleContributions,
-                                                  int &contributingSamples);
+        void AddToPvs(const BoundedRayContainer &rays, int &sampleContributions,
+                                  int &contributingSamples);
 
 protected:
@@ -392 +391 @@
                 @param viewCell view cell corresponding to unbounded space
         */ 
-        BspTree(ViewCell *viewCell);
+        BspTree(BspViewCell *viewCell);
 
         ~BspTree();
@@ -771 +770 @@
 
         /// view cell corresponding to unbounded space
-        ViewCell *mRootCell;
+        BspViewCell *mRootCell;
 
         /// should view cells be stored or generated in the leaves?