Changeset 837 for GTP/trunk/Lib

Timestamp:

04/27/06 09:29:52 (19 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (2 diffs)
• Intersectable.h (modified) (3 diffs)
• KdTree.cpp (modified) (1 diff)
• Preprocessor.cpp (modified) (2 diffs)
• ViewCell.cpp (modified) (7 diffs)
• ViewCell.h (modified) (5 diffs)
• ViewCellsManager.cpp (modified) (7 diffs)
• ViewCellsManager.h (modified) (2 diffs)
• VspBspTree.cpp (modified) (5 diffs)

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

@@ -1305 +1305 @@
 
         RegisterOption("ViewCells.Evaluation.samplingType",
-                        optString,
-                        "view_cells_evaluation_sampling_type=",
-                        "box");
+                                        optString,
+                                        "view_cells_evaluation_sampling_type=",
+                                        "box");
 
         RegisterOption("ViewCells.Evaluation.samplesPerPass",
@@ -1318 +1318 @@
                                         "view_cells_export_to_file=",
                                         "false");
+
+        RegisterOption("ViewCells.pvsExportMode",
+                                        optInt,
+                                        "view_cells_export_bounding_boxes=",
+                                        "2");
 
         RegisterOption("ViewCells.PostProcess.emptyViewCellsMerge",

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

@@ -24 +24 @@
   KdPvs mKdPvs;
   
-  enum { MESH_INSTANCE, TRANSFORMED_MESH_INSTANCE, SPHERE, VIEW_CELL };
+  enum { MESH_INSTANCE, TRANSFORMED_MESH_INSTANCE, SPHERE, VIEW_CELL, OGRE_MESH_INSTANCE };
   
   Intersectable():mMailbox(0) {}
@@ -38 +38 @@
         
         void Mail() { mMailbox = sMailId; }
-  bool Mailed() const { return mMailbox == sMailId; }
+        bool Mailed() const { return mMailbox == sMailId; }
 
         void Mail(const int mailbox) { mMailbox = sMailId + mailbox; }
@@ -65 +65 @@
                                                            Vector3 &normal,
                                                            const Vector3 &viewpoint,
-                                                                                                                         const int maxTries
+                                                           const int maxTries
                                                            ) = 0;
   

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

@@ -1018 +1018 @@
   }
 
-  return beam.mKdNodes.size();
-}
+  return (int)beam.mKdNodes.size();
+}

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

@@ -26 +26 @@
 
         if (0){
-        // form figure
+        // form grrid of meshes
         for (int i = 0; i < n; ++ i)
         {
@@ -554 +554 @@
 {
   Vector3 origin, direction; 
-  int startSize = rays.size();
-  for (int i=0; rays.size() - startSize  < number; i++) {
+  int startSize = (int)rays.size();
+  for (int i=0; (int)rays.size() - startSize  < number; i ++) {
         // now get the direction
         switch (sampleType) {

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

@@ -663 +663 @@
         
                         // set merge cost to this node for priority traversal
-                        //mergedVc->SetMergeCost(totalRenderCost);
-// HACK
-mergedVc->SetMergeCost(1.0f / (float)realNumActiveViewCells);
-
-                        //if (mViewCellsManager->EqualToSpatialNode(mergedVc))
-                        //      ++ mergeStats.siblings;
+                        mergedVc->SetMergeCost(totalRenderCost);
+                        
+                        // HACK
+                        //mergedVc->SetMergeCost(1.0f / (float)realNumActiveViewCells);
+
+                        // check if "siblings (back and front node of the same parent)
+                        if (0 && mViewCellsManager->EqualToSpatialNode(mergedVc))
+                                ++ mergeStats.siblings;
+                        // set the coŽst for rendering a view cell
                         mergedVc->SetCost(realExpectedCost);
 
@@ -727 +730 @@
                 Debug << "setting root of the merge history" << endl;
                 mRoot = activeViewCells[0];
-                Debug << "volume of the root view cell: " << mRoot->GetVolume() << " " << mViewCellsManager->GetViewSpaceBox().GetVolume() << endl;
         }
         else
@@ -739 +741 @@
                 mMergeQueue.pop();
         }
-//hack!!
-//mRoot->GetPvs().Clear();
-        // TODO delete because makes no sense here
+
+        // test if voluje is equal
+        Debug << "volume of the root view cell: " << mRoot->GetVolume() << " " << mViewCellsManager->GetViewSpaceBox().GetVolume() << endl;
+
+        //hack!!
+        //mRoot->GetPvs().Clear();
+        
+        // TODO: delete because makes no sense here
         mergeStats.expectedRenderCost = realExpectedCost;
         mergeStats.deviation = mDeviation;
@@ -1952 +1959 @@
 
 
-bool ViewCellsTree::Export(ofstream &stream)
-{
-        ExportViewCell(mRoot, stream);
+bool ViewCellsTree::Export(ofstream &stream, const int pvsType)
+{
+        // export recurvivly all view cells from the root
+        ExportViewCell(mRoot, stream, pvsType);
 
         return true;
@@ -1988 +1996 @@
 
 
-void ViewCellsTree::ExportViewCell(ViewCell *viewCell, ofstream &stream)
+void ViewCellsTree::ExportPvs(ViewCell *viewCell, ofstream &stream, const int pvsType)
 {
         ObjectPvsMap::iterator it, it_end = viewCell->GetPvs().mEntries.end();
 
+        for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
+        {
+                switch (pvsType)
+                {
+                case EXPORT_IDS:
+            {
+                                stream << (*it).first->GetId() << " ";
+                        }
+                        break;
+                case EXPORT_BBOXES:
+                        {
+                                Debug << "here24 " << pvsType << endl;
+                                MeshInstance *mi = dynamic_cast<MeshInstance *>((*it).first);
+                                AxisAlignedBox3 box = mi->GetBox();
+                                stream << "<BoundingBox" 
+                                           << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                           << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+                        }
+                        break;
+                case EXPORT_EMPTY_PVS:
+                default:
+                        break;
+                }
+        }
+}
+
+
+void ViewCellsTree::ExportViewCell(ViewCell *viewCell, ofstream &stream, const int pvsType)
+{
         if (viewCell->IsLeaf())
         {
@@ -1999 +2036 @@
                 stream << "mergecost=\"" << viewCell->GetMergeCost() << "\" ";
                 stream << "pvs=\"";
-                if (0)// test with empty pvs
-                        for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
-                        {
-                                stream << (*it).first->GetId() << " ";
-                        }
-
+                
+                //-- export pvs
+                Debug << "here66 " << pvsType << endl;
+                ExportPvs(viewCell, stream, pvsType);
         
                 stream << "\" />" << endl;
@@ -2017 +2052 @@
                 stream << "active=\"" << viewCell->IsActive() << "\" ";
                 stream << "mergecost=\"" << viewCell->GetMergeCost() << "\" ";
-                stream << "pvs=\"";
-
-                if (0)// test with empty pvs
-                        for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
-                        {
-                                stream << (*it).first->GetId() << " ";
-                        }
+                
+                //-- NOTE: do not export pvss for interior view cells because
+                // they can be compeletely reconstructed from the leaf pvss
+                if (0)
+                {
+                        stream << "pvs=\"";
+                        ExportPvs(viewCell, stream, pvsType);
+                }
 
                 stream << "\" >" << endl;
 
+                //-- recursivly export child view cells
                 ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
 
                 for (it = interior->mChildren.begin(); it != it_end; ++ it)
                 {
-                        ExportViewCell(*it, stream);
+                        ExportViewCell(*it, stream, pvsType);
                 }
 

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

@@ -384 +384 @@
         void SetViewCellsStorage(int type);
 
-        /** pvs storage methods */
+        /** pvs storage methods 
+        */
         enum {PVS_IN_INTERIORS, COMPRESSED, PVS_IN_LEAVES};
 
+        enum {EXPORT_EMPTY_PVS, EXPORT_IDS, EXPORT_BBOXES};
+
         /** If view cells in this tree have compressed pvs.
         */
@@ -403 +406 @@
         void PropagatePvs(ViewCell *vc);
 
-        bool Export(ofstream &stream);
+        /** Exports view cells to file.
+        */
+    bool Export(ofstream &stream, const int pvsType = EXPORT_EMPTY_PVS);
 
         /** Export statistics of this view cell tree.
@@ -503 +508 @@
         */
         float GetMemUsage() const;
-        
-        /**
-                Exports single view cell.
+
+        /**     Exports single view cell.
                 NOTE: should be in exporter!!
         */
-        void ExportViewCell(ViewCell *viewCell, ofstream &stream);
+        void ExportViewCell(ViewCell *viewCell, ofstream &stream, const int pvsType);
+
+        /** Exports pvs of a view cell.
+        */
+        void ExportPvs(ViewCell *viewCell, ofstream &stream, const int pvsType);
 
 
@@ -522 +530 @@
 
         
-        /** intermediate container of merged view cells.
-*/
+        /// intermediate container of merged view cells.
         ViewCellContainer mMergedViewCells;
         
 
+        /// if merged view cells are refined.
         bool mRefineViewCells;
 
@@ -537 +545 @@
     float mDeviation;
         float mAvgRenderCost;
-
+        /// the area is used for pvs heuristics
         int mUseAreaForPvs;
 

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

@@ -92 +92 @@
         environment->GetFloatValue("ViewCells.Filter.width", mFilterWidth);
         environment->GetIntValue("ViewCells.renderCostEvaluationType", mRenderCostEvaluationType);
+
+        environment->GetIntValue("ViewCells.pvsExportMode", mPvsExportMode);
 
         char buf[100];
@@ -1149 +1151 @@
 {
   if (!ViewCellsConstructed())
-        return mViewSpaceBox.IsInside(viewPoint);
-  else {
-        if (!mViewSpaceBox.IsInside(viewPoint))
-          return false;
-        ViewCell *viewcell = GetViewCell(viewPoint);
-        if (!viewcell || !viewcell->GetValid())
-          return false;
+          return mViewSpaceBox.IsInside(viewPoint);
+  else 
+  {
+          if (!mViewSpaceBox.IsInside(viewPoint))
+                  return false;
+          
+          ViewCell *viewcell = GetViewCell(viewPoint);
+          
+          if (!viewcell || !viewcell->GetValid())
+                  return false;
   }
+
   return true;
 }
@@ -2576 +2582 @@
         stream << "<ViewCells>" << endl;
 
-#if 0
-        
-        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
-                
-        for (it = mViewCells.begin(); it != it_end; ++ it)
-                ExportViewCell(*it, stream);
-#else
-        mViewCellsTree->Export(stream);
-#endif
+        mViewCellsTree->Export(stream, mPvsExportMode);
 
         stream << "</ViewCells>" << endl;
@@ -3725 +3723 @@
 int VspBspViewCellsManager::PostProcess(const ObjectContainer &objects,
                                                                                 const VssRayContainer &rays)
-{
+{Debug << "here8773" << endl;
         if (!ViewCellsConstructed())
         {
@@ -3824 +3822 @@
 
 
+        Debug << "here3" << endl;
         // write view cells to disc
         if (mExportViewCells)
         {
+        Debug << "here4" << endl;
                 char buff[100];
                 environment->GetStringValue("ViewCells.filename", buff);
@@ -3950 +3950 @@
         {
                 interior->mPvs = pvs;
-                //cout << "here233" << endl;
         }
         
@@ -4571 +4570 @@
         stream << "<Hierarchy name=\"vspBspTree\" />" << endl;
 
-        //-- load the view cells itself, i.e., the ids and the pvs
+        //-- export the view cells itself, i.e., the ids and the pvs
         stream << "<ViewCells>" << endl;
-        
-#if 0
-        
-        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
-                
-        for (it = mViewCells.begin(); it != it_end; ++ it)
-                ExportViewCell(*it, stream);
-#else
-        mViewCellsTree->Export(stream);
-#endif
+        Debug << "**************************** mode: " << mPvsExportMode << endl;
+        mViewCellsTree->Export(stream, mPvsExportMode);
 
         stream << "</ViewCells>" << endl;
 
-        //-- load the hierarchy
+        //-- export the hierarchy
         stream << "<Hierarchy>" << endl;
         mVspBspTree->Export(stream);

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

@@ -499 +499 @@
 
 
+        int mPvsExportMode;
 
         Plane3 mClipPlane;
+
         bool mUseClipPlaneForViz;
 
@@ -843 +845 @@
         void CreateMesh(ViewCell *vc);
 
-        //bool LoadViewCellsGeometry(const string filename, ObjectContainer *objects);
         bool ExportViewCells(const string filename);
 

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

@@ -1247 +1247 @@
         
         // the relative cost ratio
-        float ratio = /*Limits::Infinity;*/99999999.0;
+        float ratio = /*Limits::Infinity;*/99999999.0f;
         bool splitPlaneFound = false;
 
@@ -1430 +1430 @@
         int bestAxis;
 
+        // if max cost ratio is exceeded, take split along longest axis instead
+        const float maxCostRatioForArbitraryAxis = 0.9f;
+
         if (mUseDrivingAxisForMaxCost)
                 bestAxis = box.Size().DrivingAxis();
@@ -1437 +1440 @@
         // mximum cost ratio for axis to be valid:
         // if exceeded, spatial mid split is used instead
-        const float maxCostRatio = 0.9f;
-
-        // hack : subdivide along driving axis up to certain depth
-        int maxDepthForDrivingAxis = 0;
-        const maxCostRatioForHeur = 0.99;
-
-    const bool useSpecialAxis = mOnlyDrivingAxis || mUseRandomAxis || 
-                mCirculatingAxis;
+        //const maxCostRatioForHeur = 0.99f;
+
+
+    const bool useSpecialAxis = 
+                mOnlyDrivingAxis || mUseRandomAxis || mCirculatingAxis;
 
 
@@ -1476 +1476 @@
                         
                         //-- split plane position is spatial median
-                        //-- use median split if cost ratio very low as
-                        //-- there are not enough visibility cues
-
-                        else //if (!mUseCostHeuristics || (nCostRatio[axis] > maxCostRatioForHeur))
+
+
+                        // also use median split if cost ratio very low as
+                        // there are not enough visibility cues
+                        //if (!mUseCostHeuristics || (nCostRatio[axis] > maxCostRatioForHeur))
+                        else 
                         {
 
@@ -1541 +1543 @@
                         {
                                  // NOTE: takes longest axis split if cost ratio exceeds threshold
-                                if (nCostRatio[axis] < min(maxCostRatio, nCostRatio[bestAxis]))
+                                if (nCostRatio[axis] < min(maxCostRatioForArbitraryAxis, nCostRatio[bestAxis]))
                                 {
                                         bestAxis = axis;
                                 }
-                                //else if (nCostRatio[axis] < nCostRatio[bestAxis])
-                                //      Debug << "warning!! different path taken: " << axis << " " << bestAxis << endl;
+                                else if (nCostRatio[axis] < nCostRatio[bestAxis])
+                                        Debug << "taking split along longest axis (" << bestAxis << ") instead of  (" << axis << ")" << endl;
                                 
                         }