Changeset 801 for GTP/trunk/Lib

Timestamp:

04/24/06 08:21:10 (19 years ago)

Author:

mattausch

Message:

debug version for testing subdivision

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• RayInfo.cpp (modified) (1 diff)
• ViewCell.cpp (modified) (6 diffs)
• ViewCell.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (30 diffs)
• VspBspTree.cpp (modified) (9 diffs)
• VspBspTree.h (modified) (2 diffs)
• X3dParserXerces.h (modified) (1 diff)

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

@@ -2014 +2014 @@
                                         "100000");
 
+        RegisterOption("VspBspTree.Construction.minBand",
+                                        optFloat,
+                                        "vsp_bsp_construction_min_band=",
+                                        "0.4");
+
+        RegisterOption("VspBspTree.Construction.maxBand",
+                                        optFloat,
+                                        "vsp_bsp_construction_min_band=",
+                                        "0.6");
+
         RegisterOption("VspBspTree.Construction.epsilon",
                                         optFloat,

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

@@ -144 +144 @@
 
         // segment is not intersecting plane: fond out if on front or back side
-        if (t >= GetMaxT() - thresh)
+        if (t >= (GetMaxT() - thresh))
         {
                 return splitPlane.Side(ExtrapOrigin());
         }
                 
-        if (t <= GetMinT() + thresh)
+        if (t <= (GetMinT() + thresh))
         {
                 return splitPlane.Side(ExtrapTermination());

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

@@ -262 +262 @@
 float ViewCell::GetRenderCost() const
 {
-        return (float)mPvs.GetSize() * GetVolume();
+        //return (float)mPvs.GetSize() * GetVolume();
+        return (float)mPvsSize * GetVolume();
 }
 
@@ -575 +576 @@
 
         //const float maxAvgCost = 350;
-        while (!mMergeQueue.empty())//NumActiveViewCells > mMergeMinViewCells))
+        while (!mMergeQueue.empty())//nmNumActiveViewCells > mMergeMinViewCells))
         {
                 //-- reset merge queue if the ratio of current expected cost / real expected cost
@@ -661 +662 @@
                         realAvgRenderCost = (float)totalPvs / (float)realNumActiveViewCells;
         
-                        // set merge cost to this node
-                        mergedVc->SetMergeCost(totalRenderCost);
+                        // set merge cost to this node for priority traversal
+                        //mergedVc->SetMergeCost(totalRenderCost);
+// HACK
+mergedVc->SetMergeCost(1.0f / (float)realNumActiveViewCells);
 
                         //if (mViewCellsManager->EqualToSpatialNode(mergedVc))
@@ -736 +739 @@
                 mMergeQueue.pop();
         }
-
+//hack!!
+//mRoot->GetPvs().Clear();
         // TODO delete because makes no sense here
         mergeStats.expectedRenderCost = realExpectedCost;
@@ -1608 +1612 @@
 void ViewCellsTree::GetPvs(ViewCell *vc, ObjectPvs &pvs) const
 {
+        // pvs is stored in each cell
+        if (mViewCellsStorage == PVS_IN_INTERIORS)
+        {
+                pvs = vc->GetPvs();
+                return;
+        }
+
         Intersectable::NewMail();
 
-        if (mViewCellsStorage == PVS_IN_INTERIORS)
-                pvs = vc->GetPvs();
 
         int pvsSize = 0;
@@ -1631 +1640 @@
                 tstack.pop();
 
+                // add new pvs
                 pvs.AddPvs(vc->GetPvs());
 

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

@@ -190 +190 @@
  {
          return a->GetRenderCost() < b->GetRenderCost();
+ }
+
+ static bool LargerRenderCost(const ViewCell *a, const ViewCell *b) 
+ {
+         return a->GetRenderCost() > b->GetRenderCost();
  }
 

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

@@ -173 +173 @@
         Debug << "export to file: " << mExportViewCells << endl;
         
-        Debug << "active: " << mNumActiveViewCells << endl;
+        Debug << "active view cells: " << mNumActiveViewCells << endl;
         Debug << "post process compress: " << mCompressViewCells << endl;
         Debug << "visualization use clipPlane: " << mUseClipPlaneForViz << endl; 
@@ -179 +179 @@
         Debug << "evaluate view cells: " << mEvaluateViewCells << endl;
         Debug << "sampling type: " << mSamplingType << endl;
-        Debug << "render cost evaluation type" << mRenderCostEvaluationType << endl;
+        Debug << "render cost evaluation type: " << mRenderCostEvaluationType << endl;
         Debug << "evaluation sampling type: " << mEvaluationSamplingType << endl;
         Debug << "show visualization: " << mShowVisualization << endl;
@@ -479 +479 @@
         if (TEST_EMPTY_VIEW_CELLS)
                 CollectEmptyViewCells();
-
-
+        
+        // evaluation of the paritition, i.e., a number of new samples are cast
+        if (mEvaluateViewCells)
+        {
+                EvalViewCellPartition(preprocessor);
+        }
+        
         //-- visualization
         if (mShowVisualization)
@@ -500 +505 @@
         }
 
-        // evaluation of the paritition, i.e., a number of new samples are cast
-        if (mEvaluateViewCells)
-        {
-                EvalViewCellPartition(preprocessor);
-        }
-        
         return numSamples;
 }
@@ -696 +695 @@
         bool dirSamples = (mEvaluationSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION);
 
-        cout << "collect leaf view cells and reseting pvs ... ";
-
-        ViewCellContainer leaves;
-        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
-        cout << " ... ";
+
+/*ViewCellContainer leaves;
+mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
+*/      
+        cout << "reseting pvs ... ";
+                
+
         bool startFromZero = true;
 
@@ -744 +745 @@
                 cout << "compute new statistics ... ";
 
-                // propagate pvs or pvs size information
+/*Debug << "*******+" << endl;
+float overall = 0;
+stable_sort(leaves.begin(), leaves.end(), ViewCell::SmallerPvs);
+        for (int i = 0; i < leaves.size(); ++ i)
+        {
+                overall += leaves[i]->GetPvs().GetSize();
+                Debug << "i " << i << " !size: " << leaves[i]->GetPvs().GetSize() << " vol: " << leaves[i]->GetVolume() << " overall " << overall << endl;
+                
+        }
+*/
+
+                //-- propagate pvs or pvs size information
                 ObjectPvs pvs;
                 UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), pvs);
 
 
-                // output stats
+                //-- output stats
                 sprintf(s, "-%09d-eval.log", castSamples);
                 string fileName = string(statsPrefix) + string(s);
@@ -1793 +1805 @@
                 if (!mOnlyValidViewCells || (*it)->GetValid())
                 {
-                        ExportColor(exporter, *it);             
+                        ExportColor(exporter, *it);     
+
                         ExportViewCellGeometry(exporter, *it, 
                                 mUseClipPlaneForViz ? &mClipPlane : NULL);
@@ -2145 +2158 @@
 
                         //exporter->SetWireframe();
-                        exporter->SetFilled();
+                        //exporter->SetFilled();
+                        bool b = mUseClipPlaneForViz;
+                        mUseClipPlaneForViz = false;
                         ExportViewCellsForViz(exporter);
-
+                        mUseClipPlaneForViz = b;
                         delete exporter;
                 }
@@ -2168 +2183 @@
         // export single view cells
         ExportBspPvs(objects);
-}
-
-
-inline bool vc_gt(ViewCell *a, ViewCell *b)
-{
-        return a->GetPvs().GetSize() > b->GetPvs().GetSize();
 }
 
@@ -2219 +2228 @@
         // sort view cells to get largest view cells
         if (0)
-                stable_sort(mViewCells.begin(), mViewCells.end(), vc_gt);
+                stable_sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
 
         int limit = min(leafOut, (int)mViewCells.size());
@@ -3329 +3338 @@
         case 1: // pvs
                 {
-                        importance = (float)vc->GetPvs().GetSize() /
+                        importance = (float)mViewCellsTree->GetPvsSize(vc) /
                                 (float)mCurrentViewCellsStats.maxPvs;
                 }
@@ -3541 +3550 @@
                 // compute tree by merging the nodes based on cost heuristics
                 mViewCellsTree->ConstructMergeTree(rays, objects);
+
+        //cout << "here344" << endl;
+                //ObjectPvs pvs;
+                //UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), pvs);
         }
         else
@@ -3881 +3894 @@
                 pvs = root->GetPvs();
 
-                root->mPvsSize = pvs.GetSize();
+                root->mPvsSize = root->GetPvs().GetSize();
                 root->mPvsSizeValid = true;
 
@@ -3887 +3900 @@
         }
         
+        //-- interior node => propagate pvs up
         ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(root);
+        interior->GetPvs().Clear();
+        pvs.Clear();
+        vector<ObjectPvs> pvsList;
+
         ViewCellContainer::const_iterator vit, vit_end = interior->mChildren.end();
 
-        vector<ObjectPvs> pvsList;
-        
-        
         for (vit = interior->mChildren.begin(); vit != vit_end; ++ vit)
         {
@@ -3905 +3920 @@
 
 #if 1
+
         Intersectable::NewMail();
 
@@ -3933 +3949 @@
         {
                 interior->mPvs = pvs;
+                //cout << "here233" << endl;
         }
         
@@ -3940 +3957 @@
 
 #else
+
         // really merge cells: slow put sumpdf is correct
-        ViewCellInterior *viewCellInterior = new ViewCellInterior();
-
         viewCellInterior->GetPvs().Merge(backVc->GetPvs());
         viewCellInterior->GetPvs().Merge(frontVc->GetPvs());
@@ -3995 +4011 @@
         {       // hack pvs
                 int savedColorCode = mColorCode;
-                mColorCode = 0;
+                mColorCode = 1;
+        
                 Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
                 
@@ -4020 +4037 @@
                         }
 
+                        //exporter->SetFilled();
+                        bool b = mUseClipPlaneForViz;
+                        mUseClipPlaneForViz = false;
                         ExportViewCellsForViz(exporter);
+                        mUseClipPlaneForViz = b;
+                
                         delete exporter;
                         cout << "finished" << endl;
@@ -4148 +4170 @@
 
         const bool sortViewCells = true;
+        
 
         // sort view cells to visualize the largest view cells
         if (sortViewCells)
-                stable_sort(mViewCells.begin(), mViewCells.end(), vc_gt);
-        
+        {
+                //stable_sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
+                stable_sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
+        }
+
         int limit = min(leafOut, (int)mViewCells.size());
 
@@ -4168 +4194 @@
                 else
                         vc = mViewCells[(int)RandomValue(0, (float)mViewCells.size() - 1)];
+
+                ObjectPvs pvs;
+                mViewCellsTree->GetPvs(vc, pvs);
 
                 //bspLeaves[j]->Mail();
@@ -4175 +4204 @@
                 Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
 
+                //-- export the sample rays
                 if (1 || mExportRays)
                 {
@@ -4212 +4242 @@
                                                 vcRays.push_back(*rit);
                                 }
+
                                 //-- export rays piercing this view cell
                                 exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
@@ -4221 +4252 @@
                                 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)
@@ -4251 +4283 @@
                 exporter->SetFilled();
 
-
+                //-- export pvs
                 if (1)
                 {
                         ObjectPvsMap::const_iterator oit,
-                                oit_end = vc->GetPvs().mEntries.end();
-
-
-                        exporter->SetFilled();
+                                oit_end = pvs.mEntries.end();
 
                         Intersectable::NewMail();
-        
+
                         // output PVS of view cell
-                        for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                        for (oit = pvs.mEntries.begin(); oit != oit_end; ++ oit)
                         {               
                                 Intersectable *intersect = (*oit).first;
@@ -4277 +4306 @@
                         }
                 }
-                else
-                {
+                
+                if (0)
+                {   // export scene geometry
                         m.mDiffuseColor = RgbColor(1, 0, 0);
                         exporter->SetForcedMaterial(m);
@@ -4338 +4368 @@
         case 1: // pvs
                 {
-                        importance = (float)vc->GetPvs().GetSize() /
+                        importance = (float)mViewCellsTree->GetPvsSize(vc) /
 #if 1 // hack for result                        
                                 (float)mCurrentViewCellsStats.maxPvs;
@@ -4377 +4407 @@
                                                                                                         const Plane3 *clipPlane) const
 {
-        if (vc->GetMesh())
-        {
-                exporter->ExportMesh(vc->GetMesh());
-        
-                return;
-        }
-
-        
         if (clipPlane)
         {
@@ -4418 +4440 @@
                                 //Debug << "geo size: " << geom.Size() << endl;
                                 //Debug << "size b: " << back.Size() << " f: " << front.Size() << endl;
+
                                 if (back.Valid())
                                 {
@@ -4427 +4450 @@
         else
         {
-                BspNodeGeometry geom;
-                mVspBspTree->ConstructGeometry(vc, geom);
-                        
-                exporter->ExportPolygons(geom.GetPolys());
+                // export mesh if available
+        /*      if (vc->GetMesh())
+                {
+                        exporter->ExportMesh(vc->GetMesh());
+                }
+                else
+                {*/
+                        BspNodeGeometry geom;
+                        mVspBspTree->ConstructGeometry(vc, geom);
+                        exporter->ExportPolygons(geom.GetPolys());
+                //}
         }
 }

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

@@ -118 +118 @@
         environment->GetBoolValue("VspBspTree.useCostHeuristics", mUseCostHeuristics);
         environment->GetBoolValue("VspBspTree.useSplitCostQueue", mUseSplitCostQueue);
-        environment->GetBoolValue("VspBspTree.simulateOctree", mSimulateOctree);
+        environment->GetBoolValue("VspBspTree.simulateOctree", mCirculatingAxis);
         environment->GetBoolValue("VspBspTree.useRandomAxis", mUseRandomAxis);
         environment->GetIntValue("VspBspTree.nodePriorityQueueType", mNodePriorityQueueType);
@@ -127 +127 @@
         environment->GetStringValue("VspBspTree.subdivisionStats", subdivisionStatsLog);
         mSubdivisionStats.open(subdivisionStatsLog);
+
+        environment->GetFloatValue("VspBspTree.Construction.minBand", mMinBand);
+        environment->GetFloatValue("VspBspTree.Construction.maxBand", mMaxBand);
 
         //-- debug output
@@ -156 +159 @@
         Debug << "priority queue type: " << mNodePriorityQueueType << endl;
         Debug << "empty view cells merge: " << mEmptyViewCellsMergeAllowed << endl;
-        Debug << "octree: " << mSimulateOctree << endl;
+        Debug << "octree: " << mCirculatingAxis << endl;
+        Debug << "minband: " << mMinBand << endl;
+        Debug << "maxband: " << mMaxBand << endl;
+        
 
         Debug << "Split plane strategy: ";
@@ -1215 +1221 @@
         const float sizeBox = maxBox - minBox;
 
-        const float minBand = minBox + 0.1f * sizeBox;
-        const float maxBand = minBox + 0.9f * sizeBox;
+        const float minBand = minBox + mMinBand * sizeBox;
+        const float maxBand = minBox + mMaxBand * sizeBox;
 
         SortSplitCandidates(rays, axis, minBand, maxBand);
@@ -1407 +1413 @@
 
         int sAxis = 0;
-
-        bool useSpecialAxis = mOnlyDrivingAxis || mUseRandomAxis || mSimulateOctree;
+        bool maxDepthForDrivingAxis = 0;
+
+        const bool useSpecialAxis = mOnlyDrivingAxis || mUseRandomAxis || 
+                mCirculatingAxis || (tData.mDepth < maxDepthForDrivingAxis);
+
 
         // use some kind of specialised fixed axis
-        if (mOnlyDrivingAxis)
+        if (mUseRandomAxis)
+                sAxis = Random(3);
+        else if (mCirculatingAxis)
+                sAxis = (tData.mAxis + 1) % 3;
+        else if (mOnlyDrivingAxis || (tData.mDepth < maxDepthForDrivingAxis))
                 sAxis = box.Size().DrivingAxis();
-        else if (mUseRandomAxis)
-                sAxis = Random(3);
-        else if (mSimulateOctree)
-                sAxis = (tData.mAxis + 1) % 3;
+
                 
         //Debug << "use special axis: " << useSpecialAxis << endl;
@@ -1519 +1529 @@
                                                          int &splitAxis)
 {
+        // hack
+        if (data.mDepth < 0)    
+        {
+                cout << "d: " << data.mDepth << endl;
+                // return axis aligned split
+                AxisAlignedBox3 box;
+                box.Initialize();
+        
+                // create bounding box of region
+                data.mGeometry->GetBoundingBox(box);
+        
+                const int axis = box.Size().DrivingAxis();
+                const Vector3 position = (box.Min()[axis] + box.Max()[axis]) * 0.5f;
+
+                Vector3 norm(0,0,0); norm[axis] = 1.0f;
+                bestPlane = Plane3(norm, position);
+                splitAxis = axis;
+                return true;
+        }
+
         // simplest strategy: just take next polygon
         if (mSplitPlaneStrategy & RANDOM_POLYGON)
@@ -1623 +1653 @@
         }
     
-
-//      if (lowestCost > 10)
-//              Debug << "warning!! lowest cost: " << lowestCost << endl;
-        
 #ifdef _DEBUG
         Debug << "plane lowest cost: " << lowestCost << endl;
 #endif
 
+        // exeeded relative max cost ratio
         if (lowestCost > mTermMaxCostRatio)
         {
@@ -2052 +2079 @@
 
         //-- compute heurstics
-        //   we take simplified computation for mid split
+        //-- we take simplified computation for mid split
                 
         pOverall = data.mProbability;
@@ -2776 +2803 @@
         BspNodeGeometry nodeGeom;
         ConstructGeometry(n, nodeGeom);
+//      const float eps = 0.5f;
         const float eps = 0.01f;
-
         // split planes from the root to this node
         // needed to verify that we found neighbor leaf

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

@@ -795 +795 @@
         int mTotalPvsSize;
 
+        float mMinBand;
+        float mMaxBand;
+
         //int mSplits;
         /// subdivision stats output file
@@ -807 +810 @@
         int mCreatedViewCells;
         /// if vsp bsp tree should simulate octree
-        bool mSimulateOctree;
+        bool mCirculatingAxis;
 
         /// if we should use breath first priority for the splits

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

@@ -92 +92 @@
   MeshDefinitions mMeshDefinitions;
 
+  // TODO: for storing meshes
+  MeshContainer *mMeshes;
   bool mIsMeshDefinition;
   // Handlers for X3D