Changeset 1278

Timestamp:

08/24/06 18:05:30 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• SamplingStrategy.cpp (modified) (4 diffs)
• ViewCellBsp.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (26 diffs)
• ViewCellsManager.h (modified) (2 diffs)
• ViewCellsParser.cpp (modified) (13 diffs)
• ViewCellsParserXerces.h (modified) (3 diffs)
• VspTree.cpp (modified) (1 diff)

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

@@ -48 +48 @@
 
 bool ObjectDirectionBasedDistribution::GenerateSample(SimpleRay &ray) const
-{
+{       
         Vector3 origin, direction; 
 
@@ -66 +66 @@
         if (c <= Limits::Small) 
                 return false;
-
+        
         // $$ jb the pdf is yet not correct for all sampling methods!
         const float pdf = 1.0f;
@@ -78 +78 @@
 
 bool DirectionBasedDistribution::GenerateSample(SimpleRay &ray) const
-{
+{       
         Vector3 origin, direction; 
         mPreprocessor.mViewCellsManager->GetViewPoint(origin);
@@ -125 +125 @@
 {
         Vector3 origin, direction; 
+
         mPreprocessor.mViewCellsManager->GetViewPoint(origin);
-        
         direction = mPreprocessor.mKdTree->GetBox().GetRandomPoint() - origin;
         

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

@@ -13 +13 @@
 
 class ViewCellLeaf;
-//class BspViewCell;
 class Plane3;
 class BspTree;  
 class BspInterior;
-//class Polygon3;
 class AxisAlignedBox3;
 class Ray;

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

@@ -23 +23 @@
 #include "BvHierarchy.h"
 
+
 // should not count origin object for sampling because it disturbs heuristics
 #define SAMPLE_ORIGIN_OBJECTS 0
@@ -355 +356 @@
         // shoot simple ray and add it to importance samples
         mPreprocessor->CastRays(simpleRays, passSamples);
-        
+
         Debug << "cast " <<  mInitialSamples << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
@@ -409 +410 @@
 
         //-- construction rays => we use uniform samples for this
+
         CastPassSamples(mInitialSamples, mSamplingType, initialSamples);
         
         cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
-
 
         // construct view cells
@@ -428 +429 @@
         Debug << "time needed for initial construction: "
                   << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
-
 
         // take post processing time
@@ -436 +436 @@
         ResetViewCells();
         Debug << "\nView cells after initial sampling:\n" << mCurrentViewCellsStats << endl;
-
 
         if (0) // export initial view cells
@@ -940 +939 @@
 
                 //-- construction rays => we use uniform samples for this
+
                 cout << "casting " << samplesPerPass << " samples ... ";
                 Debug << "casting " << samplesPerPass << " samples ... ";
@@ -4803 +4803 @@
 
 
-VspOspViewCellsManager::VspOspViewCellsManager(ViewCellsTree *vcTree, VspTree *vspTree, OspTree *ospTree):
-ViewCellsManager(vcTree), mVspTree(vspTree), mOspTree(ospTree)
-{
-        mHierarchyManager = new HierarchyManager(*vspTree, *ospTree);
+VspOspViewCellsManager::VspOspViewCellsManager(ViewCellsTree *vcTree, HierarchyManager *hm)
+: ViewCellsManager(vcTree), mHierarchyManager(hm)
+{
         Environment::GetSingleton()->GetIntValue("VspTree.Construction.samples", mInitialSamples);
 
-        mVspTree->SetViewCellsManager(this);
-        mOspTree->SetViewCellsManager(this);
-
-        mVspTree->SetViewCellsTree(mViewCellsTree);
+        mHierarchyManager->SetViewCellsManager(this);
+        mHierarchyManager->SetViewCellsTree(mViewCellsTree);
 }
 
@@ -4818 +4815 @@
 VspOspViewCellsManager::~VspOspViewCellsManager()
 {
-        DEL_PTR(mHierarchyManager);
 }
 
@@ -4833 +4829 @@
         if (!ViewCellsTreeConstructed())
         {
-                mVspTree->CollectViewCells(mViewCells, false);
+                mHierarchyManager->GetVspTree()->CollectViewCells(mViewCells, false);
         }
         else 
@@ -4844 +4840 @@
 bool VspOspViewCellsManager::ViewCellsConstructed() const
 {
-        return mVspTree->GetRoot() != NULL;
+        return mHierarchyManager->GetVspTree()->GetRoot() != NULL;
 }
 
@@ -4893 +4889 @@
 
         // print subdivision statistics
-        Debug << mVspTree->GetStatistics() << endl;
-        Debug << mOspTree->GetStatistics() << endl;
-
-        OUT_STREAM stream("osptree.xml.zip");
-        mOspTree->Export(stream);
+        Debug << mHierarchyManager->GetVspTree()->GetStatistics() << endl;
+        mHierarchyManager->PrintObjectSpaceHierarchyStatistics(Debug);
+
+        if (0)
+        {
+                OUT_STREAM stream("osptree.xml.zip");
+                mHierarchyManager->ExportObjectSpaceHierarchy(stream);
+        }       
 
         // print view cell statistics
@@ -4985 +4984 @@
                 
         // compute tree by merging the nodes of the spatial hierarchy
-        ViewCell *root = ConstructSpatialMergeTree(mVspTree->GetRoot());
+        ViewCell *root = ConstructSpatialMergeTree(mHierarchyManager->GetVspTree()->GetRoot());
         mViewCellsTree->SetRoot(root);
 
@@ -5094 +5093 @@
                 viewPoint = mViewSpaceBox.GetRandomPoint();
 
-                if (mVspTree->ViewPointValid(viewPoint))
+                if (mHierarchyManager->GetVspTree()->ViewPointValid(viewPoint))
                 {
                         return true;
@@ -5124 +5123 @@
                 VspLeaf *l = vspVc->mLeaf;
 
-                const AxisAlignedBox3 box = mVspTree->GetBoundingBox(vspVc->mLeaf);
+                const AxisAlignedBox3 box = mHierarchyManager->GetVspTree()->GetBoundingBox(vspVc->mLeaf);
                 
                 if (clipPlane)
@@ -5218 +5217 @@
         }
 
-        if (1 && mOspTree->GetRoot()) 
-        {       
-                //-- export final object partition
-                Exporter *exporter = Exporter::GetExporter("final_object_partition.wrl");
-                
-                if (exporter)
-                {
-                        cout << "exporting object space partition ... ";
-
-                        if (0 && mExportGeometry)
-                        {
-                                exporter->ExportGeometry(objects);
-                        }
-
-                        // export rays
-                        if (0 && mExportRays)
-                        {
-                                exporter->ExportRays(visRays, RgbColor(0, 1, 0));
-                        }
-
-                        exporter->SetWireframe();
-        
-                        const int savedColorCode = mColorCode;
-                        mColorCode = 0;
-                        const int maxPvs = 200;//mOspTree.GetStatistics().maxPvs;
-
-                        exporter->ExportOspTree(*mOspTree, mColorCode == 0 ? 0 : maxPvs);
-
-                        mColorCode = savedColorCode;
-
-                        delete exporter;
-
-                        cout << "finished" << endl;
-                }
-        }
-
+        mHierarchyManager->ExportObjectSpaceHierarchyForViz(objects);
+        
         //-- export single view cells
         ExportPvs(objects, visRays);
@@ -5386 +5351 @@
                 exporter->SetFilled();
 
-                if (1)
+#if 0   
+                //-- export pvs
+
+                Intersectable::NewMail();
+                KdLeaf::NewMail();
+
+                vector<KdLeaf *> kdLeaves;
+
+                ObjectPvsMap::const_iterator oit, oit_end = pvs.mEntries.end();
+
+                for (oit = pvs.mEntries.begin(); oit != oit_end; ++ oit)
                 {       
-                        //-- export pvs
-                        
-                        Intersectable::NewMail();
-                        KdLeaf::NewMail();
-
-                        vector<KdLeaf *> kdLeaves;
-
-                        ObjectPvsMap::const_iterator oit, oit_end = pvs.mEntries.end();
-
-                        for (oit = pvs.mEntries.begin(); oit != oit_end; ++ oit)
-                        {       
-                                Intersectable *obj = (*oit).first;
-
-                                if (obj->Type() == Intersectable::KD_INTERSECTABLE)
-                                {
-                                        m.mDiffuseColor = RgbColor(1, 1, 1);
-                                        exporter->SetForcedMaterial(m);
-
-                                        // export bounding box of node
-                                        KdIntersectable *kdObj  = dynamic_cast<KdIntersectable *>(obj);
-                                        AxisAlignedBox3 box = mOspTree->GetBoundingBox(kdObj->GetItem());
-                                        
-                                        exporter->SetWireframe();
-                                        exporter->ExportBox(box);
-                                        exporter->SetFilled();
-                                }
-
-                                m.mDiffuseColor = RgbColor(1, 0, 0);
+                        Intersectable *obj = (*oit).first;
+
+                        if (obj->Type() == Intersectable::KD_INTERSECTABLE)
+                        {
+                                m.mDiffuseColor = RgbColor(1, 1, 1);
                                 exporter->SetForcedMaterial(m);
 
-                                // export pvs entry
-                                if (!obj->Mailed())
-                                {
-                                        exporter->ExportIntersectable(obj);
-                                        obj->Mail();
-                                }
-                        }               
-                }
+                                // export bounding box of node
+                                KdIntersectable *kdObj  = dynamic_cast<KdIntersectable *>(obj);
+                                AxisAlignedBox3 box = mOspTree->GetBoundingBox(kdObj->GetItem());
+
+                                exporter->SetWireframe();
+                                exporter->ExportBox(box);
+                                exporter->SetFilled();
+                        }
+
+                        m.mDiffuseColor = RgbColor(1, 0, 0);
+                        exporter->SetForcedMaterial(m);
+
+                        // export pvs entry
+                        if (!obj->Mailed())
+                        {
+                                exporter->ExportIntersectable(obj);
+                                obj->Mail();
+                        }
+                }               
+#endif
         
                 DEL_PTR(exporter);
@@ -5438 +5402 @@
                                                                                                         ViewCellContainer &viewCells) const
 {
-        return mVspTree->ComputeBoxIntersections(box, viewCells);
+        return mHierarchyManager->GetVspTree()->ComputeBoxIntersections(box, viewCells);
 }
 
@@ -5446 +5410 @@
                                                                                         ViewCellContainer &viewcells)
 {
-        return mVspTree->CastLineSegment(origin, termination, viewcells);
+        return mHierarchyManager->GetVspTree()->CastLineSegment(origin, termination, viewcells);
 }
 
@@ -5503 +5467 @@
                    << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
 
-        mVspTree->Export(stream);
+        mHierarchyManager->GetVspTree()->Export(stream);
         stream << endl << "</ViewSpaceHierarchy>" << endl;
 
@@ -5509 +5473 @@
         //-- export the object space partition
         
-        // the type of the view cells hierarchy
-        if (mHierarchyManager->GetObjectSpaceSubdivisonType() == 
-                HierarchyManager::KD_BASED_OBJ_SUBDIV)
-        {
-                stream << "<ObjectSpaceHierarchy type=\"osp\">" << endl;
-                mOspTree->Export(stream);
-                stream << endl << "</ObjectSpaceHierarchy>" << endl;
-        }
-        else if (mHierarchyManager->GetObjectSpaceSubdivisonType() == 
-                 HierarchyManager::BV_BASED_OBJ_SUBDIV)
-        {
-                stream << "<ObjectSpaceHierarchy type=\"bvh\">" << endl;
-                mBvHierarchy->Export(stream);
-                stream << endl << "</ObjectSpaceHierarchy>" << endl;
-        }
-
+        mHierarchyManager->ExportObjectSpaceHierarchy(stream);
+        
         stream << "</VisibilitySolution>" << endl;
         stream.close();
@@ -5544 +5494 @@
           return NULL;
 
-        return mVspTree->GetViewCell(point, active);
+        return mHierarchyManager->GetVspTree()->GetViewCell(point, active);
 }
 
@@ -5561 +5511 @@
         {
                 VspLeaf *leaf = dynamic_cast<VspViewCell *>(*it)->mLeaf;
-                const AxisAlignedBox3 box = mVspTree->GetBoundingBox(leaf);
+                const AxisAlignedBox3 box = mHierarchyManager->GetVspTree()->GetBoundingBox(leaf);
 
         IncludeBoxInMesh(box, *mesh);
@@ -5592 +5542 @@
                 VspLeaf *leaf = dynamic_cast<VspViewCell *>(*it)->mLeaf;
                 
-                const AxisAlignedBox3 box = mVspTree->GetBoundingBox(leaf);
+                const AxisAlignedBox3 box = mHierarchyManager->GetVspTree()->GetBoundingBox(leaf);
 
                 const float lVol = box.GetVolume();
@@ -5720 +5670 @@
                                                                                         float &contribution) const
 {
-        if (!obj) return false;
-
-        switch (mHierarchyManager->GetObjectSpaceSubdivisonType())
-    {
-        case HierarchyManager::NO_OBJ_SUBDIV:
-                        // potentially visible objects
-                        return vc->AddPvsSample(obj, pdf, contribution);
-
-        case HierarchyManager::KD_BASED_OBJ_SUBDIV:
-                {
-                        // potentially visible kd cells
-                        KdLeaf *leaf = mOspTree->GetLeaf(hitPoint/*ray->mOriginNode*/);
-                        return mOspTree->AddLeafToPvs(leaf, vc, pdf, contribution);
-                }
-        case HierarchyManager::BV_BASED_OBJ_SUBDIV:
-                {
-                        BvhLeaf *leaf = mBvHierarchy->GetLeaf(obj);
-                        return mBvHierarchy->AddLeafToPvs(leaf, vc, pdf, contribution);
-                }
-        default:
-                return false;
-        }
+        return mHierarchyManager->AddSampleToPvs(obj, hitPoint, vc, pdf, contribution);
 }
 
@@ -5759 +5688 @@
         ViewCellsManager *vm = 
                 ViewCellsManager::LoadViewCells(filename, objects, finalizeViewCells, bconverter);
-
+#if 0
+        // insert scene objects in tree
         mOspTree->InsertObjects(mOspTree->GetRoot(), *objects);
-
+#endif
         return vm;
 }
@@ -5841 +5771 @@
         }
 
-        Debug << "\nhere295 " << rc / mVspTree->GetBoundingBox().GetVolume() << endl;
+        Debug << "\nhere295 " << rc / mHierarchyManager->GetVspTree()->GetBoundingBox().GetVolume() << endl;
         mViewCellsTree->ExportStats(fileName);
         cout << "finished" << endl;

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

@@ -974 +974 @@
 public:
 
-        VspOspViewCellsManager(ViewCellsTree *viewCellsTree, VspTree *tree, OspTree *ospTree);
+        VspOspViewCellsManager(ViewCellsTree *vcTree, HierarchyManager *hm);
+        
         ~VspOspViewCellsManager();
 
@@ -1068 +1069 @@
 
         /// the view space / object partition hierarchies
-        VspTree *mVspTree;
-        OspTree *mOspTree;
-        BvHierarchy *mBvHierarchy;
+        //VspTree *mVspTree;
+        //OspTree *mOspTree;
+        //BvHierarchy *mBvHierarchy;
 
         HierarchyManager *mHierarchyManager;

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

@@ -34 +34 @@
 #include "KdTree.h"
 #include "BvHierarchy.h"
+#include "HierarchyManager.h"
 
 
@@ -91 +92 @@
   , mObjects(objects)
   , mBoundingBoxConverter(bconverter)
+  , mHierarchyManager(NULL)
 {
         std::stable_sort(mObjects->begin(), mObjects->end(), ilt);
@@ -354 +356 @@
         if (element == "ViewCells")
         {
-                cout << "parsing view cells" << endl;
+                cout << "\nparsing view cells" << endl;
                 
                 mCurrentState = PARSE_VIEWCELLS;
@@ -372 +374 @@
         if (element == "ViewSpaceHierarchy")
         {               
-                cout << "parsing view space hierarchy" << endl;
+                cout << "\nparsing view space hierarchy" << endl;
                 mCurrentState = PARSE_VIEWSPACE_HIERARCHY;
                 StartViewSpaceHierarchy(attributes);
@@ -380 +382 @@
         if (element == "ObjectSpaceHierarchy")
         {
-                cout << "parsing object space hierarchy" << endl;
+                cout << "\nparsing object space hierarchy" << endl;
                 mCurrentState = PARSE_OBJECTSPACE_HIERARCHY;
                 StartObjectSpaceHierarchy(attributes);
@@ -565 +567 @@
                 if (attrName == "type")
                 {
-                        if (strcmp(ptr, "bsp") == 0)
+                        if (strcmp(ptr, "osp") == 0)
                         {
-                                Debug << "view space hierarchy: Bsp" << endl;
-                                mViewSpaceHierarchyType = BSP;
+                                Debug << "object space hierarchy: Osp" << endl;
+                                mHierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::KD_BASED_OBJ_SUBDIV);
                         }
-                        else if (strcmp(ptr, "vsp") == 0)
+                        else if (strcmp(ptr, "bvh") == 0)
                         {
-                                Debug << "view space hierarchy: Vsp" << endl;
-                                mViewSpaceHierarchyType = VSP;
+                                Debug << "object space hierarchy: Bvh" << endl;
+                                mHierarchyManager = new HierarchyManager(mVspTree, HierarchyManager::BV_BASED_OBJ_SUBDIV);
                         }
                 }
@@ -778 +780 @@
 
                 mVspTree = new VspTree();
+
                 // set view space box
                 mVspTree->mBoundingBox = mViewSpaceBox;
+
+                // object space hierarchy already constructed
+                if (mHierarchyManager)
+                {
+                        mHierarchyManager->mVspTree = mVspTree;
+                        mVspTree->mHierarchyManager = mHierarchyManager;
+                }
         }
         
         cout << "\nview space box: " << mViewSpaceBox << endl;
-}
-
-
-void ViewCellsParseHandlers::CreateObjectSpaceHierarchy()
-{
-        if (mViewSpaceHierarchyType == OSP)
-        {
-                Debug << "object hierarchy type: Osp" << endl;
-
-                mOspTree = new OspTree();
-        }
-        else if (mViewSpaceHierarchyType == VSP) 
-        {
-                Debug << "object hierarchy type: Vsp" << endl;
-
-                mVspTree = new VspTree();
-        }
 }
 
@@ -814 +807 @@
         else if (mViewSpaceHierarchyType == VSP) 
         {
-                Debug << "vcreating view cells manager: VsOspp" << endl;
+                Debug << "creating view cells manager: VspOsp" << endl;
 
                 // hack
-                mViewCellsManager = new VspOspViewCellsManager(mViewCellsTree, mVspTree, mOspTree);
+                mViewCellsManager = new VspOspViewCellsManager(mViewCellsTree, mHierarchyManager);
         }
 
@@ -978 +971 @@
         else
         {
-                mOspTree->mRoot = interior;
+                mHierarchyManager->mOspTree->mRoot = interior;
         }
 
@@ -996 +989 @@
         else
         {
-                mOspTree->mRoot = leaf;
+                mHierarchyManager->mOspTree->mRoot = leaf;
         }
 }
@@ -1002 +995 @@
 
 void ViewCellsParseHandlers::StartBvhLeaf(AttributeList& attributes)
-{
+{/*
         KdLeaf * leaf = 
                 new KdLeaf(dynamic_cast<KdInterior *>(mCurrentKdNode), NULL);
@@ -1012 +1005 @@
         else
         {
-                mOspTree->mRoot = leaf;
-        }
+                mHierarchyManager->mBvHierarchy->mRoot = leaf;
+        }*/
 }
 
 
 void ViewCellsParseHandlers::StartBvhInterior(AttributeList& attributes)
-{
+{/*
         AxisAlignedPlane plane;
         int len = attributes.getLength();
@@ -1051 +1044 @@
         }
 
-        mCurrentKdNode = interior;
+        mCurrentKdNode = interior;*/
 }
 

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

@@ -25 +25 @@
 class VspNode;
 class BvHierarchy;
+class HierarchyManager;
+
 
 class ViewCellsParseHandlers: public HandlerBase
@@ -73 +75 @@
 
   VspBspTree *mVspBspTree;
-  VspTree *mVspTree;
-  OspTree *mOspTree;
+  HierarchyManager *mHierarchyManager;
   BvHierarchy *mBvHierarchy;
 
   BspTree *mBspTree;
   ViewCellsTree *mViewCellsTree;
+  VspTree *mVspTree;
 
   BspNode *mCurrentBspNode;
@@ -142 +144 @@
   void StartOspInterior(AttributeList& attributes);
 
-  void CreateObjectSpaceHierarchy();
   void CreateViewSpaceHierarchy();
 

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

@@ -2879 +2879 @@
 
 SubdivisionCandidate *VspTree::PrepareConstruction(const VssRayContainer &sampleRays,
-                                                                        AxisAlignedBox3 *forcedViewSpace,
-                                                                        RayInfoContainer &rays)
-{
+                                                                                                   AxisAlignedBox3 *forcedViewSpace,
+                                                                                                   RayInfoContainer &rays)
+{       
         // store pointer to this tree
         VspSubdivisionCandidate::sVspTree = this;