Changeset 1314 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

09/03/06 03:13:29 (18 years ago)

Author:

mattausch

Message:

started osp mesh construction for obj files. Introduced new primitive faceintersectable

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (6 diffs)

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

@@ -973 +973 @@
         mLocalSubdivisionCandidates->clear();
 
-        int requestedSize = 2 * (int)(rays.size());
+        const int requestedSize = 2 * (int)(rays.size());
 
         // creates a sorted split candidates array
@@ -992 +992 @@
         {
                 const bool positive = (*rit).mRay->HasPosDir(axis);
-                                
+                const bool delayMinEvent = false;
+
+                // origin point
                 pos = (*rit).ExtrapOrigin(axis);
-                
-                mLocalSubdivisionCandidates->push_back(SortableEntry(positive ? SortableEntry::ERayMin : SortableEntry::ERayMax, 
-                                                                        pos, (*rit).mRay));
-
+                const int oType = positive ? SortableEntry::ERayMin : SortableEntry::ERayMax;
+
+                if (delayMinEvent && oType == SortableEntry::ERayMin)
+                        pos += mEpsilon; // for walls
+
+                mLocalSubdivisionCandidates->push_back(SortableEntry(oType, pos, (*rit).mRay));
+
+                // termination point
                 pos = (*rit).ExtrapTermination(axis);
-
-                mLocalSubdivisionCandidates->push_back(SortableEntry(positive ? SortableEntry::ERayMax : SortableEntry::ERayMin, 
-                                                                        pos, (*rit).mRay));
+                const int tType = positive ? SortableEntry::ERayMax : SortableEntry::ERayMin;
+
+                if (delayMinEvent && tType == SortableEntry::ERayMin)
+                        pos += mEpsilon; // for walls
+
+                mLocalSubdivisionCandidates->push_back(SortableEntry(tType, pos, (*rit).mRay));
         }
 
@@ -1206 +1215 @@
         vector<SortableEntry>::const_iterator ci, ci_end = mLocalSubdivisionCandidates->end();
 
+#ifdef _DEBUG
+        const float volRatio = tData.mBoundingBox.GetVolume() / (sizeBox * mBoundingBox.GetVolume());
+        const int leaves = mVspStats.Leaves();
+        const bool printStats = ((axis == 0) && (leaves > 0) && (leaves < 90));
+        
+        ofstream sumStats;
+        ofstream pvslStats;
+        ofstream pvsrStats;
+
+        if (printStats)
+        {
+                char str[64]; 
+                
+                sprintf(str, "tmp/vsp_heur_sum-%04d.log", leaves);
+                sumStats.open(str);
+                sprintf(str, "tmp/vsp_heur_pvsl-%04d.log", leaves);
+                pvslStats.open(str);
+                sprintf(str, "tmp/vsp_heur_pvsr-%04d.log", leaves);
+                pvsrStats.open(str);
+        }
+
+#endif
         for (ci = mLocalSubdivisionCandidates->begin(); ci != ci_end; ++ ci)
         {
@@ -1224 +1255 @@
                         sum = pvsl * ((*ci).value - minBox) + pvsr * (maxBox - (*ci).value);
                         
+#ifdef _DEBUG
+                        if (printStats)
+                        {
+                                sumStats
+                                        << "#Position\n" << currentPos << endl
+                                        << "#Sum\n" << sum * volRatio << endl
+                                        << "#Pvs\n" << pvsl + pvsr << endl;
+
+                                pvslStats
+                                        << "#Position\n" << currentPos << endl
+                                        << "#Pvsl\n" << pvsl << endl;
+
+                                pvsrStats
+                                        << "#Position\n" << currentPos << endl
+                                        << "#Pvsr\n" << pvsr << endl;
+                        }
+#endif
 
                         if (sum < minSum)
@@ -1260 +1308 @@
         }
         
-        const float volRatio = tData.mBoundingBox.GetVolume() / (sizeBox * mBoundingBox.GetVolume());
-
+#ifdef _DEBUG
         Debug << "\n§§§§ eval local cost §§§§" << endl
                   << "back pvs: " << penaltyBack << " front pvs: " << penaltyFront << " total pvs: " << penaltyOld << endl 
@@ -1267 +1314 @@
                   << "old rc: " << oldRenderCost * volRatio << " new rc: " << newRenderCost * volRatio << endl
                   << "render cost decrease: " << oldRenderCost * volRatio - newRenderCost * volRatio << endl;
-
+#endif
         return ratio;
 }