Changeset 1999 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

Timestamp:

01/20/07 00:14:25 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp (modified) (22 diffs)

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

@@ -16 +16 @@
 {
   
-#define GVS_DEBUG 0
+#define GVS_DEBUG 1
 
 struct VizStruct
@@ -31 +31 @@
 GvsPreprocessor::GvsPreprocessor(): 
 Preprocessor(), 
-mSamplingType(SamplingStrategy::VIEWCELL_BASED_DISTRIBUTION),
-//mSamplingType(SamplingStrategy::DIRECTION_BASED_DISTRIBUTION),
+//mSamplingType(SamplingStrategy::VIEWCELL_BASED_DISTRIBUTION),
+mSamplingType(SamplingStrategy::DIRECTION_BASED_DISTRIBUTION),
 mProcessedViewCells(0),
 mCurrentViewCell(NULL)
@@ -144 +144 @@
                         delete newRay;
                 }
-                else if (0 && GVS_DEBUG && (mVssRays.size() < 9))
+                
+
+                return 1;
+        }
+
+        return 0;
+}
+
+// #id: 1270
+bool GvsPreprocessor::HasContribution(VssRay &ray)
+{
+        if (!ray.mTerminationObject)
+                return false;
+
+        bool result;
+
+        if (!mPerViewCell)
+        {
+                // store the rays + the intersected view cells
+                const bool storeViewCells = false; //GVS_DEBUG;
+
+                mViewCellsManager->ComputeSampleContribution(ray, 
+                                                                                                         true, 
+                                                                                                         storeViewCells,
+                                                                                                         true);
+
+                result = ray.mPvsContribution > 0;
+        }
+        else
+        {
+                Intersectable *obj = ray.mTerminationObject;
+
+                if (!obj->mCounter)
                 {
-                        mVssRays.push_back(new VssRay(oldRay));
-                        mVssRays.push_back(new VssRay(currentRay));
-                        mVssRays.push_back(new VssRay(*newRay));
-                }
-
-                return 1;
-        }
-
-        return 0;
-}
-
-
-bool GvsPreprocessor::HandleRay(VssRay *vssRay)
-{
-        // store the rays + the intersected view cells
-        const bool storeRaysForViz = false; //GVS_DEBUG;
-
-        if (!mPerViewCell)
-        {
-                mViewCellsManager->ComputeSampleContribution(*vssRay, 
-                                                                                                         true, 
-                                                                                                         storeRaysForViz,
-                                                                                                         true);
-        }
-        else
-        {
-                mViewCellsManager->ComputeSampleContribution(*vssRay, 
+                        obj->mCounter = 1;
+                        mTrianglePvs.push_back(obj);
+
+                        /*mViewCellsManager->ComputeSampleContribution(ray, 
                                                                                                          true, 
                                                                                                          mCurrentViewCell,
-                                                                                                         true);
-        }
-
-        // some pvs contribution for this ray?
-        if (!vssRay->mPvsContribution)
+                                                                                                         true);*/
+                        
+                        result = true;
+                }
+                else
+                {
+                        result = false;
+                }
+        }
+
+        return result;
+}
+
+
+bool GvsPreprocessor::HandleRay(VssRay *vssRay)
+{
+        if (!HasContribution(*vssRay))
                 return false;
 
-        if (GVS_DEBUG)
+        if (0 && GVS_DEBUG)
                 mVssRays.push_back(new VssRay(*vssRay));
 
         // add new ray to ray queue
         mRayQueue.push(vssRay);
-
-        if (storeRaysForViz)
-        {
-                VssRay *nray = new VssRay(*vssRay);
-                nray->mFlags = vssRay->mFlags;
-
-                // store ray in contributing view cell
-                ViewCellContainer::const_iterator vit, vit_end = vssRay->mViewCells.end();
-                for (vit = vssRay->mViewCells.begin(); vit != vit_end; ++ vit)
-                {                       
-                        (*vit)->GetOrCreateRays()->push_back(nray);                             
-                }
-        }
 
         ++ mGvsStats.mTotalContribution;
@@ -399 +407 @@
         }
 
+        int castRays = (int)simpleRays.size();
+
+        VssRayContainer invalidSamples;
+
         // handle rays
-        EnqueueRays(vssRays);
-        
-        int castRays = simpleRays.size();
-        
+        EnqueueRays(vssRays, invalidSamples);
+
     // recursivly subdivide each edge
         for (int i = 0; i < numBorderSamples; ++ i)
@@ -414 +424 @@
                                                                   currentRay);
         }
-
+        
         mGvsStats.mBorderSamples += castRays;
+
+        CLEAR_CONTAINER(invalidSamples);
 
         return castRays;
@@ -442 +454 @@
         if (!intersects)
         {
-                cerr << "big error!! no intersection " << pt1 << " " << pt2 << endl;
+                //cerr << "big error!! no intersection " << pt1 << " " << pt2 << endl;
                 return false;
         }
@@ -562 +574 @@
         CastRays(simpleRays, samples, castDoubleRays, pruneInvalidRays);
         
+        VssRayContainer invalidSamples;
+
         // add to ray queue
-        EnqueueRays(samples);
-
+        EnqueueRays(samples, invalidSamples);
+
+        CLEAR_CONTAINER(invalidSamples);
         //Debug << "generated " <<  numSamples << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
         return (int)simpleRays.size();
@@ -570 +585 @@
 
 
-void GvsPreprocessor::EnqueueRays(VssRayContainer &samples)
+void GvsPreprocessor::EnqueueRays(VssRayContainer &samples, VssRayContainer &invalidSamples)
 {
         // add samples to ray queue
@@ -576 +591 @@
         for (vit = samples.begin(); vit != vit_end; ++ vit)
         {
-                HandleRay(*vit);
+                VssRay *ray = *vit;
+
+                if (!HandleRay(ray))
+                        invalidSamples.push_back(ray);
         }
 }
@@ -597 +615 @@
                 castSamples += newSamples;
 
-                //cout << newSamples << " ";    
+                //cout << "new samples: " << newSamples << " " << "queue: "  << (int)mRayQueue.size() << endl;
                 delete ray;
         }
@@ -639 +657 @@
 
 
-void GvsPreprocessor::VisualizeViewCell(ViewCell *vc)
+//void GvsPreprocessor::VisualizeViewCell(ViewCell *vc)
+void GvsPreprocessor::VisualizeViewCell(const ObjectContainer &objects)
 {
     Intersectable::NewMail();
@@ -651 +670 @@
                 return;
 
-        ObjectPvsIterator pit = vc->GetPvs().GetIterator();
+        /*ObjectPvsIterator pit = vc->GetPvs().GetIterator();
 
         // output PVS of view cell
@@ -669 +688 @@
 
                 exporter->ExportIntersectable(intersect);
+        }*/
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                Intersectable *intersect = *oit;
+                
+                m = RandomMaterial();
+                exporter->SetForcedMaterial(m);
+                exporter->ExportIntersectable(intersect);
         }
 
@@ -682 +711 @@
         exporter->SetForcedMaterial(m);
 
-        mViewCellsManager->ExportViewCellGeometry(exporter, vc, NULL, NULL);
+        //mViewCellsManager->ExportViewCellGeometry(exporter, vc, NULL, NULL);
+        //mViewCellsManager->ExportViewCellGeometry(exporter, mCurrentViewCell, NULL, NULL);
+
+        AxisAlignedBox3 bbox = mCurrentViewCell->GetMesh()->mBox;
+        exporter->ExportBox(bbox);
         //exporter->SetFilled();
 
@@ -720 +753 @@
 void GvsPreprocessor::ProcessViewCell()
 {
+        //Intersectable::NewMail();
+        // compute direct intersections with view cell
+        IntersectWithViewCell();
+
         mGvsStats.mPerViewCellSamples = 0;
         int oldContribution = mGvsStats.mTotalContribution;
@@ -736 +773 @@
                 passSamples += newSamples;
                 mGvsStats.mPerViewCellSamples += newSamples;
-                //cout << "here4 " << passSamples % (mSamplesPerPass + 1) << endl;
+                //cout << "here2 " << passSamples % (mSamplesPerPass + 1) << endl;
 
                 if (passSamples >= mSamplesPerPass)
@@ -774 +811 @@
                 {
                         mViewCells.push_back(mViewCellsManager->GetViewCell((int)mViewCells.size()));
+                        continue;
                 }
-                else
+                
+                // HACK
+                const int tries = 10000;
+                int i = 0;
+
+                for (i = 0; i < tries; ++ i)
                 {
-                        // HACK
-                        const int tries = 10000;
-                        int i = 0;
-
-                        for (i = 0; i < tries; ++ i)
+                        const int idx = (int)RandomValue(0.0f, (float)mViewCellsManager->GetNumViewCells() - 0.5f);
+        
+                        ViewCell *viewCell = mViewCellsManager->GetViewCell(idx);
+
+                        if (!viewCell->Mailed())
                         {
-                                const int idx = (int)RandomValue(0.0f, (float)mViewCellsManager->GetNumViewCells() - 0.5f);
-        
-                                ViewCell *viewCell = mViewCellsManager->GetViewCell(idx);
-
-                                if (!viewCell->Mailed())
+                                viewCell->Mail();
+                                break;
+                        }
+
+                        mViewCells.push_back(viewCell);
+                }
+
+                if (i == tries)
+                {
+                        cerr << "big error! no view cell found" << endl;
+                        return;
+                }
+        }
+}
+
+
+void GvsPreprocessor::IntersectWithViewCell()
+{
+        mCurrentViewCell->GetMesh()->ComputeBoundingBox();
+        AxisAlignedBox3 box = mCurrentViewCell->GetMesh()->mBox;
+        //cout << "box: " << box << endl;
+        vector<KdLeaf *> leaves;
+
+        mKdTree->GetBoxIntersections(box, leaves);
+
+        vector<KdLeaf *>::const_iterator lit, lit_end = leaves.end();
+
+        for (lit = leaves.begin(); lit != leaves.end(); ++ lit)
+        {
+                KdLeaf *leaf = *lit;
+                ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
+
+                for (oit = leaf->mObjects.begin(); oit != oit_end; ++ oit)
+                {
+                        TriangleIntersectable *triObj = dynamic_cast<TriangleIntersectable *>(*oit);
+
+                        if (box.Intersects(triObj->GetItem()))
+                        {
+                                if (!triObj->mCounter)
                                 {
-                                        viewCell->Mail();
-                                        break;
+                                        triObj->mCounter = 1;
+                                        mTrianglePvs.push_back(triObj);
                                 }
-
-                                mViewCells.push_back(viewCell);
-                        }
-
-                        if (i == tries)
-                        {
-                                cerr << "big error! no view cell found" << endl;
-                                return;
                         }
                 }
@@ -808 +877 @@
 void GvsPreprocessor::PerViewCellComputation()
 {
+        // hack: reset counter
+        ObjectContainer::const_iterator oit, oit_end = mObjects.end();
+
+        for (oit = mObjects.begin(); oit != oit_end; ++ oit)
+        {
+                (*oit)->mCounter = 0;
+        }
+
         while (NextViewCell())
         {
-                cout << "\n***********************\nprocessing view cell " << mProcessedViewCells << endl;
+                cout << "\n***********************\n" 
+                         << "processing view cell " << mProcessedViewCells 
+                         << " (id: " << mCurrentViewCell->GetId() << ")" << endl;
 
                 // compute the pvs of the current view cell
                 ProcessViewCell();
 
-                mGvsStats.mTrianglePvs = mCurrentViewCell->GetPvs().GetSize();
+                //mGvsStats.mTrianglePvs = mCurrentViewCell->GetPvs().GetSize();
+                mGvsStats.mTrianglePvs = (int)mTrianglePvs.size();
+
+                ObjectContainer objectPvs;
 
                 // exchange triangle pvs with objects
-                UpdatePvs(mCurrentViewCell);
-
-                if (GVS_DEBUG)
-                {
-                        VisualizeViewCell(mCurrentViewCell);
-                        CLEAR_CONTAINER(mVssRays);
-                }
+                //UpdatePvs(mCurrentViewCell);
+                GetObjectPvs(objectPvs);
+
+                cout << "triangle pvs of " << (int)mTrianglePvs.size() << " was converted to object pvs of " << (int)objectPvs.size() << endl;
 
                 ////////
@@ -830 +909 @@
                 
                 mGvsStats.mViewCells = mProcessedViewCells;//mPass;
-                mGvsStats.mPerViewCellPvs = mCurrentViewCell->GetPvs().GetSize();
-                mGvsStats.mTotalPvs += mCurrentViewCell->GetPvs().GetSize();
+                //mGvsStats.mPerViewCellPvs = mCurrentViewCell->GetPvs().GetSize();
+                mGvsStats.mPerViewCellPvs = (int)mTrianglePvs.size();
+
+                mGvsStats.mTotalPvs += mGvsStats.mPerViewCellPvs;
                 mGvsStats.mTotalSamples += mGvsStats.mPerViewCellSamples;
 
                 mGvsStats.Stop();
                 mGvsStats.Print(mGvsStatsStream);
+
+                mTrianglePvs.clear();
+
+                if (GVS_DEBUG)
+                {
+                        //VisualizeViewCell(mCurrentViewCell);
+                        VisualizeViewCell(objectPvs);
+                        CLEAR_CONTAINER(mVssRays);
+                }
 
                 // is this really necessary?
@@ -871 +961 @@
 
         currentViewCell->SetPvs(newPvs);
+}
+
+ 
+void GvsPreprocessor::GetObjectPvs(ObjectContainer &objectPvs) const
+{
+        BvhLeaf::NewMail();
+
+        ObjectContainer::const_iterator oit, oit_end = mTrianglePvs.end();
+
+        for (oit = mTrianglePvs.begin(); oit != oit_end; ++ oit)
+        {
+                Intersectable *intersect = *oit;
+        
+                BvhLeaf *bv = intersect->mBvhLeaf;
+
+                if (!bv || bv->Mailed())
+                        continue;
+                
+                bv->Mail();
+
+                objectPvs.push_back(bv);
+                // hack: reset counter
+                (*oit)->mCounter = 0;
+        }
 }
 
@@ -978 +1092 @@
         
         vector<VizStruct>::const_iterator vit, vit_end = vizContainer.end();
+        
         for (vit = vizContainer.begin(); vit != vit_end; ++ vit)
         {
@@ -989 +1104 @@
 
         VssRayContainer::const_iterator rit, rit_end = mVssRays.end();
+
         for (rit = mVssRays.begin(); rit != rit_end; ++ rit)
         {