Changeset 1144

Timestamp:

07/20/06 09:51:26 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Exporter.cpp (modified) (2 diffs)
• KdTree.cpp (modified) (1 diff)
• KdTree.h (modified) (2 diffs)
• Preprocessor.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (5 diffs)
• VspOspTree.cpp (modified) (17 diffs)
• VspOspTree.h (modified) (2 diffs)

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

@@ -50 +50 @@
                 SetWireframe();
                 SetForcedMaterial(white);
-                ExportBox(ospTree.GetBBox(leaf));
+                ExportBox(ospTree.GetBoundingBox(leaf));
 
                 SetFilled();
@@ -79 +79 @@
         Intersectable::NewMail();
 
+        // todo: traverse to leaves
         if (node->IsLeaf())
         {
+                // eyport leaf pvs
                 KdLeaf *leaf = dynamic_cast<KdLeaf *>(node);
-                
+
                 ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
 

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

@@ -315 +315 @@
         }
 
+    mStat.objectRefs -= (int)leaf->mObjects.size();
+    mStat.objectRefs += objectsBack + objectsFront;
+  }
+
         // store objects referenced in more than one leaf
         // for easy access
         ProcessMultipleRefs(back);
         ProcessMultipleRefs(front);
-
-    mStat.objectRefs -= (int)leaf->mObjects.size();
-    mStat.objectRefs += objectsBack + objectsFront;
-  }
 
   delete leaf;

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

@@ -195 +195 @@
   ObjectContainer mObjects;
 
-  /** Objects that are part of several leaves.
-  */
-  ObjectContainer mMultipleObjects;
-
-  /// universal counter
-  int mCounter;
-        
   /** Ray set description of the rays passing through this node */
   PassingRaySet mPassingRays;
@@ -209 +202 @@
 
   /// pvs of view cells seeing this node.
-  // ViewCellPvs mViewCellPvs;
   SplitCandidate *mSplitCandidate;
 
-  /** pointer to view cell.
-  */
+  /// pointer to view cell.
   KdViewCell *mViewCell;
+
+   /// Objects that are referenced in more than one leaf.
+  ObjectContainer mMultipleObjects;
+
+  /// universal counter
+  int mCounter;
 };
 

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

@@ -440 +440 @@
         {
                 mVspTree = new VspTree();
-                //mOspTree = new OspTree();
+                mOspTree = new OspTree();
                 // HACK
-                mOspTree = new OspTree(*mKdTree);
+                //mOspTree = new OspTree(*mKdTree);
 
                 mViewCellsManager = new VspOspViewCellsManager(mVspTree, mOspTree);

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

@@ -5216 +5216 @@
                 VspLeaf *l = vspVc->mLeaf;
 
-                const AxisAlignedBox3 box = mVspTree->GetBBox(vspVc->mLeaf);
+                const AxisAlignedBox3 box = mVspTree->GetBoundingBox(vspVc->mLeaf);
                 
                 if (clipPlane)
                 {
                         if (box.Side(plane) == -1)
+                        {
                                 exporter->ExportBox(box);
+                        }
                         else if (box.Side(plane) == 0)
                         {
                                 AxisAlignedBox3 fbox, bbox;
-
                                 box.Split(clipPlane->mAxis, clipPlane->mPosition, fbox, bbox);
 
@@ -5485 +5486 @@
                         KdLeaf::NewMail();
 
-                        m.mDiffuseColor = RgbColor(1, 0, 0);
-                        exporter->SetForcedMaterial(m);
-
                         // export pvs entries
                         for (oit = pvs.mEntries.begin(); oit != oit_end; ++ oit)
@@ -5493 +5491 @@
                                 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->GetNode());
+                                        
+                                        exporter->SetWireframe();
+                                        exporter->ExportBox(box);
+                                        exporter->SetFilled();
+                                }
+
+                                m.mDiffuseColor = RgbColor(1, 0, 0);
+                                exporter->SetForcedMaterial(m);
+
+                                // export pvs entry
                                 if (!obj->Mailed())
                                 {
@@ -5626 +5642 @@
         {
                 VspLeaf *leaf = dynamic_cast<VspViewCell *>(*it)->mLeaf;
-                const AxisAlignedBox3 box = mVspTree->GetBBox(leaf);
+                const AxisAlignedBox3 box = mVspTree->GetBoundingBox(leaf);
 
         IncludeBoxInMesh(box, *mesh);
@@ -5657 +5673 @@
                 VspLeaf *leaf = dynamic_cast<VspViewCell *>(*it)->mLeaf;
                 
-                const AxisAlignedBox3 box = mVspTree->GetBBox(leaf);
+                const AxisAlignedBox3 box = mVspTree->GetBoundingBox(leaf);
 
                 const float lVol = box.GetVolume();

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

@@ -947 +947 @@
                 if (obj) 
                 {
-                        // potentially visible kd cells
                         if (mStoreKdPvs)
                         {
+                                // potentially visible kd cells
                                 KdLeaf *leaf = mOspTree->GetLeaf(ray->mTermination, ray->mTerminationNode);
                                 AddKdLeafToPvs(leaf, vc, ray->mPdf, contribution);
@@ -1076 +1076 @@
                 // add objects without the objects which are in several kd leaves
                 pvsSize += (int)(leaf->mObjects.size() - leaf->mMultipleObjects.size());
+                //Debug << "here11 " << (int)leaf->mObjects.size() << " " << leaf->mMultipleObjects.size() << endl;
         }
         else
@@ -1116 +1117 @@
         RayInfoContainer::const_iterator ri, ri_end = rays.end();
 
-        //-- set all kd nodes as belonging to the front pvs
+        //-- set all kd nodes / objects as belonging to the front pvs
 
         for (ri = rays.begin(); ri != ri_end; ++ ri)
@@ -1214 +1215 @@
                 Intersectable *object = *oit;
 
-                // object not previously in left pvs
+                // object not previously in pvs
                 if (!object->Mailed())
                 {
@@ -1946 +1947 @@
         nodeStack.push(mRoot);
 
-        const AxisAlignedBox3 box = GetBBox(n);
+        const AxisAlignedBox3 box = GetBoundingBox(n);
 
         while (!nodeStack.empty())
@@ -2007 +2008 @@
                         VspNode *next;
                         
-                        if (GetBBox(interior->GetBack()).Side(plane) < 0)
+                        if (GetBoundingBox(interior->GetBack()).Side(plane) < 0)
                         {
                                 next = interior->GetFront();
@@ -2013 +2014 @@
             else
                         {
-                                if (GetBBox(interior->GetFront()).Side(plane) < 0)
+                                if (GetBoundingBox(interior->GetFront()).Side(plane) < 0)
                                 {
                                         next = interior->GetBack();
@@ -2549 +2550 @@
 
 
-AxisAlignedBox3 VspTree::GetBBox(VspNode *node) const
+AxisAlignedBox3 VspTree::GetBoundingBox(VspNode *node) const
 {
         if (!node->GetParent())
@@ -2584 +2585 @@
                 nodeStack.pop();
 
-                const AxisAlignedBox3 bbox = GetBBox(node);
+                const AxisAlignedBox3 bbox = GetBoundingBox(node);
 
                 if (bbox.Includes(box))
@@ -3693 +3694 @@
 
 
-AxisAlignedBox3 OspTree::GetBBox(KdNode *node) const
+AxisAlignedBox3 OspTree::GetBoundingBox(KdNode *node) const
 {
         if (!node->mParent)
@@ -3814 +3815 @@
 KdLeaf *OspTree::GetLeaf(const Vector3 &pt, KdNode *node) const
 {
+        // start from root of tree
         if (node == NULL)
         {
@@ -3835 +3837 @@
                 else    
                 {       
+                        // find point
                         KdInterior *interior = dynamic_cast<KdInterior *>(node);
         
-                        // random decision
-                        if (interior->mPosition < pt[interior->mAxis])
+                        if (interior->mPosition > pt[interior->mAxis])
                         {
                                 nodeStack.push(interior->mBack);
@@ -3942 +3944 @@
 {
         // search nodes
-        std::map<KdNode *, KdIntersectable *>::const_iterator it = mKdIntersectables.find(node);
+        std::map<KdNode *, KdIntersectable *>::
+                const_iterator it = mKdIntersectables.find(node);
 
         if (it != mKdIntersectables.end()) 
@@ -4054 +4057 @@
                                                                                           RayInfoContainer &rays)
 {
-        // get clipped rays
-        mOspTree.ProcessRays(sampleRays, rays);
-
         // store pointer to this tree
         OspTree::OspSplitCandidate::sOspTree = &mOspTree;
         mOspTree.mOspStats.nodes = 1;
         
+        // compute bounding box from objects
         mOspTree.ComputeBoundingBox(objects, forcedObjectSpace);
 
@@ -4066 +4067 @@
         mGlobalCostMisses = 0;
 
+        // get clipped rays
+        mOspTree.ProcessRays(sampleRays, rays);
 
         // add first candidate for view space partition
@@ -4086 +4089 @@
 
                 
-        //mOspTree.ProcessMultipleRefs(NULL, kdleaf, NULL);
-
         // compute first split candidate
         OspTree::OspSplitCandidate *oSplitCandidate = 
                 new OspTree::OspSplitCandidate(oData);
+
     mOspTree.EvalSplitCandidate(*oSplitCandidate);
 
@@ -4252 +4254 @@
         /////////////////////////////////////////////////////////////
 
-
+        Debug << "**************** osp construction **************" << endl;
         cout << "starting osp contruction ... " << endl;
+
         startTime = GetTime();
 

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

@@ -628 +628 @@
         /** Returns bounding box of the specified node.
         */
-        AxisAlignedBox3 GetBBox(VspNode *node) const;
+        AxisAlignedBox3 GetBoundingBox(VspNode *node) const;
 
         /** Returns list of BSP leaves with pvs smaller than
@@ -1276 +1276 @@
         /** Returns bounding box of the specified node.
         */
-        AxisAlignedBox3 GetBBox(KdNode *node) const;
+        AxisAlignedBox3 GetBoundingBox(KdNode *node) const;
 
         /** Returns list of leaves with pvs smaller than