Changeset 380 for trunk/VUT

Timestamp:

11/05/05 13:18:14 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• SamplingPreprocessor.cpp (modified) (4 diffs)
• SamplingPreprocessor.h (modified) (1 diff)
• ViewCellBsp.cpp (modified) (3 diffs)
• X3dExporter.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -557 +557 @@
                         if (exporter)
                         {
-                                //exporter->ExportBspViewCellPartition(*mBspTree, stat.maxPvs);
-                                exporter->ExportBspViewCellPartition(*mBspTree, 0);
+                                exporter->ExportBspViewCellPartition(*mBspTree, stat.maxPvs);
+                                //exporter->ExportBspViewCellPartition(*mBspTree, 0);
                                 delete exporter;
                         }
@@ -592 +592 @@
                         if (exporter)
                         {
-                                //exporter->ExportBspViewCellPartition(*mBspTree, stat.maxPvs);
-                                exporter->ExportBspViewCellPartition(*mBspTree, 0);
+                                exporter->ExportBspViewCellPartition(*mBspTree, stat.maxPvs);
+                                //exporter->ExportBspViewCellPartition(*mBspTree, 0);
                                 delete exporter;
                         }
@@ -686 +686 @@
 }
 
-bool SamplingPreprocessor::ProcessBspViewCells(Ray &ray,
+void SamplingPreprocessor::ProcessBspViewCells(Ray &ray,
                                                                                            Intersectable *object,
                                                                                            int faceIndex,
@@ -693 +693 @@
 {
         // save rays for bsp tree construction
-        if ((BspTree::sConstructionMethod == BspTree::FROM_RAYS) &&
-                (mSampleRays.size() < mBspConstructionSamples))
+        if (!mBspTree)
         {
-                // 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);
+                if ((BspTree::sConstructionMethod == BspTree::FROM_RAYS) &&
+                        ((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));
-                
-                return false;
-        }
-        
-        if (!mBspTree) // construct BSP tree using the samples
+                        mSampleRays.push_back(new Ray(ray));
+                        Debug << "abba " << mSampleRays.size() << endl;
+                }
+                else
+                {
+                        // construct BSP tree using the samples
+                        cout << "building bsp tree from " << mSampleRays.size() << " samples " << endl;
+                        BuildBspTree();
+                
+                        // add contributions of saved samples to PVS
+                        contributingSamples += mBspTree->GetStat().contributingSamples;
+                        sampleContributions += mBspTree->GetStat().sampleContributions;
+
+                        BspTreeStatistics(Debug);       
+
+                        if (0) Export("vc_bsptree.x3d", false, false, true);
+
+                        // throw away samples because BSP leaves not stored in order 
+                        // Need ordered rays for post processing => collect new rays
+                        CLEAR_CONTAINER(mSampleRays);
+                }
+        }
+        // save rays for post processing
+        else if ((int)mSampleRays.size() < mPostProcessSamples)
         {
-        cout << "building bsp tree from " << mSampleRays.size() << " samples " << endl;
-                BuildBspTree();
-                
-                // add contributions of saved samples to PVS
-                contributingSamples += mBspTree->GetStat().contributingSamples;
-                sampleContributions += mBspTree->GetStat().sampleContributions;
-
-                BspTreeStatistics(Debug);       
-
-                if (0) Export("vc_bsptree.x3d", false, false, true);
-
-                // throw away samples because BSP leaves not stored in order 
-                // Need ordered rays for post processing => collect new rays
-                CLEAR_CONTAINER(mSampleRays);
-        }
-        
-        if ((int)mSampleRays.size() < mPostProcessSamples)
-        {
+                Debug << "police " << mSampleRays.size() << endl;
                 mSampleRays.push_back(new Ray(ray));
         }
-
-        return true;
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.h

@@ -74 +74 @@
                 @param contributingSamples samples contributing to pvs
                 @param sampleContributions contribution of the samples
-
-                @returns true if BSP tree has been constructed, false if not yet
-
         */
-        bool ProcessBspViewCells(Ray &ray,
+        void ProcessBspViewCells(Ray &ray,
                                                          Intersectable *object,
                                                          int faceIndex,

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -692 +692 @@
 
         Debug << "**** Finished polygon extraction ****" << endl;
-        Debug << (int)polys->size() << " polys extracted from " << (int)rays->size() << " rays" << endl;
+        Debug << (int)polys->size() << " polys extracted from " << (int)sampleRays.size() << " rays" << endl;
         Debug << "extraction time: " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
 
@@ -786 +786 @@
         ViewCell *backViewCell = mRootCell;
 
+        
 #ifdef _DEBUG   
         if (frontPolys->empty() && backPolys->empty() && (coincident.size() > 2))
@@ -1650 +1651 @@
         mStat.accumDepth += data.mDepth;
         
-#ifdef _DEBUG
+//#ifdef _DEBUG
         Debug << "BSP stats: "
                   << "Depth: " << data.mDepth << " (max: " << sTermMaxDepth << "), "
                   << "#polygons: " << (int)data.mPolygons->size() << " (max: " << sTermMaxPolygons << "), "
                   << "#rays: " << (int)data.mRays->size() << " (max: " << sTermMaxRays << ")" << endl;
-#endif
+//#endif
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -187 +187 @@
 
 
-        if (maxPvs == 0)
+        if (maxPvs > 0)
                 mUseForcedMaterial = true;
 
         for (it = viewCells.begin(); it != it_end; ++ it)
         {
-                mForcedMaterial.mDiffuseColor.b = 1.0f;
-  
-                float importance = 0;
-
                 if (maxPvs > 0)
-                        importance = (float)(*it)->GetPvs().GetSize() / (float)maxPvs;
-
-                mForcedMaterial.mDiffuseColor.r = importance;
-                mForcedMaterial.mDiffuseColor.g = 1.0f - mForcedMaterial.mDiffuseColor.r;
-                
+                {
+                        mForcedMaterial.mDiffuseColor.b = 1.0f;
+                        float importance = (float)(*it)->GetPvs().GetSize() / (float)maxPvs;
+
+                        mForcedMaterial.mDiffuseColor.r = importance;
+                        mForcedMaterial.mDiffuseColor.g = 1.0f - mForcedMaterial.mDiffuseColor.r;
+                }
+
                 if ((*it)->GetMesh())
                         ExportViewCell(*it);