Changeset 516

Timestamp:

01/11/06 15:50:37 (18 years ago)

Author:

bittner

Message:

per object rss tree support - changes in glrenderer.cpp so tha it compiles; unix2dos on glrenderer.*

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Environment.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (5 diffs)
• Makefile (modified) (1 diff)
• RssPreprocessor.cpp (modified) (2 diffs)
• RssTree.cpp (modified) (21 diffs)
• RssTree.h (modified) (11 diffs)
• default.env (modified) (4 diffs)
• preprocessor.pro (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1649 +1649 @@
         RegisterOption("RssTree.maxRays", optInt, "rss_max_rays=", "2000000");
 
+        RegisterOption("RssTree.perObjectTree", optBool, "rss_per_object_tree", "false");
+
         RegisterOption("RssPreprocessor.Export.pvs", optBool, "rss_export_pvs", "false");
         RegisterOption("RssPreprocessor.Export.rssTree", optBool, "rss_export_rss_tree", "false");

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -406 +406 @@
 {
   static int glList = -1;
-  if (glList != -1) {
-        glCallList(glList);
-  } else {
+  if (glList == -1) {
         glList = glGenLists(1);
-        glNewList(glList, GL_COMPILE_AND_EXECUTE);
+        glNewList(glList, GL_COMPILE);
         ObjectContainer::const_iterator oi = mObjects.begin();
         for (; oi != mObjects.end(); oi++)
@@ -416 +414 @@
         glEndList();
   }
+  glCallList(glList);
   return true;
 }
@@ -571 +570 @@
                                                                                            Beam &beam,
                                                                                            const int desiredSamples,
-                                                                                           BeamSampleStatistics &stat)
+                                                                                           GlRendererBuffer::BeamSampleStatistics &stat)
 {
         // TODO: should not be done every time here
@@ -607 +606 @@
                 
                 SampleViewpointContributions(sourceObject,
+                                                                         viewPoint,
                                                                          beam,
                                                                          directionalSamples,
@@ -624 +624 @@
 
 void GlRendererBuffer::SampleViewpointContributions(Intersectable *sourceObject,
+                                                                                                        const Vector3 viewPoint,
                                                                                                         Beam &beam,
                                                                                                         const int desiredSamples,

trunk/VUT/GtpVisibilityPreprocessor/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.0) on: so 7. I 10:49:27 2006
+# Generated by qmake (2.00a) (Qt 4.1.0) on: st 11. I 15:48:57 2006
 # Project:  preprocessor.pro
 # Template: app

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -15 +15 @@
 static bool useViewSpaceBox = true;
 static bool use2dSampling = false;
+
+
+// not supported anymore!
 static bool fromBoxVisibility = false;
 
@@ -644 +647 @@
   if (mUseImportanceSampling) {
         
-        if (fromBoxVisibility)
-          rssTree->Construct(mVssRays, mViewSpaceBox);
-        else
-          rssTree->Construct(mVssRays, NULL);
+        //      if (fromBoxVisibility)
+        //        rssTree->Construct(mObjects, mVssRays, mViewSpaceBox);
+        //      else
+        rssTree->Construct(mObjects, mVssRays);
 
         rssTree->stat.Print(mStats);

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

@@ -163 +163 @@
   environment->GetIntValue("RssTree.maxRays", mMaxRays);
 
-  root = NULL;
+  environment->GetBoolValue("RssTree.perObjectTree", mPerObjectTree);
+  
+  //  mRoots;
   
   splitCandidates = new vector<SortableEntry>;
@@ -171 +173 @@
 RssTree::~RssTree()
 {
-  if (root)
-    delete root;
+  for (int i=0; i < mRoots.size(); i++)
+        if (mRoots[i])
+          delete mRoots[i];
 }
 
@@ -301 +304 @@
 void
 RssTree::Construct(
-                                   VssRayContainer &rays,
+                                   ObjectContainer &objects,
+                                   VssRayContainer &rays
                                    // forced bounding box is only used when computing from-box
                                    // visibility
-                                   AxisAlignedBox3 *forcedBoundingBox
+                                   //                              AxisAlignedBox3 *forcedBoundingBox
                                    )
 {
+  cout<<"Constructing rss tree"<<endl<<flush;
   stat.Start();
   
   maxMemory = maxStaticMemory;
 
-  if (root)
-    delete root;
-
-  
-  root = new RssTreeLeaf(NULL, rays.size());
-  // first construct a leaf that will get subdivide
-  RssTreeLeaf *leaf = (RssTreeLeaf *) root;
-
-  stat.nodes = 1;
-  
-  bbox.Initialize();
-  dirBBox.Initialize();
-
-
-  mForcedBoundingBox = forcedBoundingBox;
+  //  if (root)
+  //    delete root;
+
+  if (mPerObjectTree) {
+        // get max id from the rays
+        int i;
+        mRoots.resize(objects.size());
+        for (i = 0; i < objects.size(); i++) {
+          RssTreeLeaf *leaf = new RssTreeLeaf(NULL, 0);
+          //      leaf->bbox.Initialize();
+          leaf->dirBBox.Initialize();
+          leaf->dirBBox.SetMin(2, 0.0f);
+          leaf->dirBBox.SetMax(2, 1.0f);
+          
+          mRoots[i] = leaf;
+        }
+        // init spatial bounding boxes
+        for (i = 0; i < objects.size(); i++) {
+          GetRoot(objects[i])->bbox = objects[i]->GetBox();
+        }
+
+        stat.nodes = i;
+  } else {
+        mRoots.resize(1);
+        RssTreeLeaf *leaf = new RssTreeLeaf(NULL, rays.size());
+        leaf->bbox.Initialize();
+        leaf->dirBBox.Initialize();
+        leaf->dirBBox.SetMin(2, 0.0f);
+        leaf->dirBBox.SetMax(2, 1.0f);
+        mRoots[0] = leaf;
+        stat.nodes = 1;
+  }
+
   for(VssRayContainer::const_iterator ri = rays.begin();
-      ri != rays.end();
-      ri++) {
-                
-        RssTreeNode::RayInfo info(*ri);
-        if (forcedBoundingBox)
-          if (!ClipRay(info, *forcedBoundingBox))
-                continue;
-
-        leaf->AddRay(info);
-                
-    bbox.Include((*ri)->GetOrigin());
-    bbox.Include((*ri)->GetTermination());
-    
-                
-        dirBBox.Include(Vector3(
-                                                        (*ri)->GetDirParametrization(0),
-                                                        (*ri)->GetDirParametrization(1),
-                                                        0
-                                                        )
-                                        );
-  }
-  
+          ri != rays.end();
+          ri++) {
+        
+          RssTreeNode::RayInfo info(*ri);
+          
+          // first construct a leaf that will get subdivide
+          RssTreeLeaf *leaf = (RssTreeLeaf *) GetRoot(info.GetObject());
+
+          leaf->AddRay(info);
+          
+          // leaf bbox contains bbox of origins only
+          leaf->bbox.Include((*ri)->GetOrigin());
+          
+          // include both origin and terminatin in the global bbox
+          bbox.Include((*ri)->GetOrigin());
+          bbox.Include((*ri)->GetTermination());
+          
+          Vector3 dVec = Vector3(
+                                                         (*ri)->GetDirParametrization(0),
+                                                         (*ri)->GetDirParametrization(1),
+                                                         0
+                                                         );
+
+          leaf->dirBBox.Include(dVec);
+          dirBBox.Include(dVec);
+  }
+
   // make the z axis (unused) a unit size
   // important for volume computation
-  dirBBox.SetMin(2, 0.0f);
-  dirBBox.SetMax(2, 1.0f);
-  
-  if ( forcedBoundingBox ) 
-        bbox = *forcedBoundingBox;
-        
+
+  
+  //  if ( forcedBoundingBox ) 
+  //    bbox = *forcedBoundingBox;
+  
   cout<<"Bbox = "<<bbox<<endl;
   cout<<"Dirr Bbox = "<<dirBBox<<endl;
-
-  stat.rays = leaf->rays.size();
-  UpdatePvsSize(leaf);
-
-  stat.initialPvsSize = leaf->GetPvsSize();
-  // Subdivide();
-  root = Subdivide(TraversalData(leaf, bbox, 0));
-
+  
+  stat.rays = rays.size();
+  stat.initialPvsSize = 0;
+  for (int i=0; i < mRoots.size(); i++) {
+        RssTreeLeaf *leaf = (RssTreeLeaf *)mRoots[i];
+        stat.initialPvsSize += leaf->GetPvsSize();
+        UpdatePvsSize(leaf);
+        mRoots[i] = Subdivide(TraversalData(leaf, GetBBox(leaf), 0));
+  }
+  
   if (splitCandidates) {
     // force realease of this vector
@@ -386 +415 @@
   //  stack<TraversalData> tStack;
   
-  tStack.push(TraversalData(root, bbox, 0));
-        
+  //  tStack.push(TraversalData(root, bbox, 0));
+  PushRoots(tStack);
+                        
   AxisAlignedBox3 backBox;
   AxisAlignedBox3 frontBox;
@@ -1071 +1101 @@
   node->axis = axis;
   node->position = info.position;
-  node->bbox = box;
-  node->dirBBox = GetDirBBox(leaf);
-  
-  backBBox = box;
-  frontBBox = box;
+  //  node->bbox = box;
+  //  node->dirBBox = GetDirBBox(leaf);
+  
   
   RssTreeLeaf *back = new RssTreeLeaf(node, info.raysBack);
   RssTreeLeaf *front = new RssTreeLeaf(node, info.raysFront);
 
+  
   // update halton generator
   back->halton.index = leaf->halton.index;
@@ -1089 +1118 @@
   // and setup child links
   node->SetupChildLinks(back, front);
-        
+
+  back->bbox = leaf->bbox;
+  front->bbox = leaf->bbox;
+  back->dirBBox = leaf->dirBBox;
+  front->dirBBox = leaf->dirBBox;
+  
   if (axis <= RssTreeNode::SPLIT_Z) {
-        backBBox.SetMax(axis, info.position);
-    frontBBox.SetMin(axis, info.position);
-  }
-
+        back->bbox.SetMax(axis, info.position);
+    front->bbox.SetMin(axis, info.position);
+  } else {
+        back->dirBBox.SetMax(axis-3, info.position);
+    front->dirBBox.SetMin(axis-3, info.position);
+  }
+  
   for(RssTreeNode::RayInfoContainer::iterator ri = leaf->rays.begin();
           ri != leaf->rays.end();
@@ -1117 +1154 @@
   // distribute the total number of rays according to the distribution
   // of rays which remained
-  
-  
   //  front->mTotalRays = front->rays.size()*leaf->mTotalRays/leaf->rays.size();
   //  back->mTotalRays = back->rays.size()*leaf->mTotalRays/leaf->rays.size();
@@ -1157 +1192 @@
   int released;
 
-  tstack.push(root);
+  PushRoots(tstack);
 
   while (!tstack.empty()) {
@@ -1267 +1302 @@
       ri++) {
         RssTreeNode::RayInfo info(*ri);
-        if (mForcedBoundingBox==NULL || ClipRay(info, bbox))
-          AddRay(info);
+        //      if (mForcedBoundingBox==NULL || ClipRay(info, bbox))
+        AddRay(info);
   }
 
@@ -1294 +1329 @@
   stack<RayTraversalData> tstack;
 
-  tstack.push(RayTraversalData(root, RssTreeNode::RayInfo(ray)));
+  PushRoots(tstack, RssTreeLeaf::RayInfo(ray));
   
   RayTraversalData data;
@@ -1374 +1409 @@
 
   stack<RayTraversalData> tstack;
-  
+
+  RssTreeNode *root = GetRoot(info.GetObject());
   tstack.push(RayTraversalData(root, info));
   
@@ -1534 +1570 @@
 {
   stack<RssTreeNode *> tstack;
-  tstack.push(root);
+  PushRoots(tstack);
 
   Intersectable::NewMail();
@@ -1581 +1617 @@
 {
   stack<RssTreeNode *> tstack;
-  tstack.push(root);
+  PushRoots(tstack);
   
   Intersectable::NewMail();
@@ -1625 +1661 @@
 {
   stack<RssTreeNode *> tstack;
-  tstack.push(root);
+  PushRoots(tstack);
         
   float sumPvsSize = 0.0f;
@@ -1695 +1731 @@
 {
   stack<RssTreeNode *> tstack;
-  tstack.push(root);
+  PushRoots(tstack);
         
   while (!tstack.empty()) {
@@ -1730 +1766 @@
 {
   stack<RssTreeNode *> tstack;
-  tstack.push(root);
+  PushRoots(tstack);
         
   while (!tstack.empty()) {
@@ -2310 +2346 @@
         float contributionThreshold = allRays[desired]->mWeightedPvsContribution;
         
-        tstack.push(root);
+        PushRoots(tstack);
         
         while (!tstack.empty()) {
@@ -2328 +2364 @@
   } else {
         // prune random rays from each leaf so that the ratio's remain the same
-        tstack.push(root);
+        PushRoots(tstack);
         float ratio = desired/(float)stat.rayRefs;
         
@@ -2413 +2449 @@
 {
   stack<RssTreeNode *> tstack;
-  tstack.push(root);
+  PushRoots(tstack);
 
   int sumPvs = 0;
@@ -2705 +2741 @@
 
   stack<RssTreeNode *> tstack;
-  tstack.push(root);
+  PushRoots(tstack);
   
   while (!tstack.empty()) {
@@ -2731 +2767 @@
 }
 
+
+RssTreeNode *
+RssTree::GetRoot(Intersectable *object) const
+{
+  if (mPerObjectTree && object) {
+        int id = object->GetId();
+        if (id >= mRoots.size())
+          id = mRoots.size()-1; // $$ last tree is used by all unsigned objects
+        return mRoots[id];
+  } else
+        return mRoots[0];
+}
+
+void
+RssTree::PushRoots(priority_queue<TraversalData> &st) const
+{
+  for (int i=0; i < mRoots.size(); i++)
+        st.push(TraversalData(mRoots[i], GetBBox(mRoots[i]), 0));
+}
+
+void
+RssTree::PushRoots(stack<RssTreeNode *> &st)  const
+{
+  for (int i=0; i < mRoots.size(); i++)
+        st.push(mRoots[i]);
+}
+
+void
+RssTree::PushRoots(stack<RayTraversalData> &st, RssTreeNode::RayInfo &info)  const
+{
+  for (int i=0; i < mRoots.size(); i++)
+        st.push(RayTraversalData(mRoots[i], info));
+}

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.h

@@ -300 +300 @@
   //
   /////////////////////////////////
+
+
+  // the bbox of the node
+  AxisAlignedBox3 bbox;
+  
+  // the bbox of the node
+  AxisAlignedBox3 dirBBox;
+
   
   inline RssTreeNode(RssTreeInterior *p);
@@ -333 +341 @@
   RssTreeNode *back, *front;
 
-  // the bbox of the node
-  AxisAlignedBox3 bbox;
-  
-  // the bbox of the node
-  AxisAlignedBox3 dirBBox;
 
   // data for caching
@@ -611 +614 @@
   /////////////////////////////
   // The core pointer
-  RssTreeNode *root;
+  vector<RssTreeNode *> mRoots;
+  
+  
   
   /////////////////////////////
@@ -618 +623 @@
   // total number of nodes of the tree
   int nodes;
+
   // axis aligned bounding box of the scene
   AxisAlignedBox3 bbox;
@@ -625 +631 @@
 
   // forced bounding box for from viewcell visibility
-  AxisAlignedBox3 *mForcedBoundingBox;
+  //  AxisAlignedBox3 *mForcedBoundingBox;
 
   /////////////////////////////
@@ -652 +658 @@
   float termMaxRayContribution;
 
-        
   // randomized construction
   bool randomize;
+
+  // use a root per object in the tree
+  bool mPerObjectTree;
   
   // type of the splitting to use fo rthe tree construction
@@ -711 +719 @@
   virtual void
   Construct(
-                        VssRayContainer &rays,
-                        AxisAlignedBox3 *forcedBoundingBox = NULL
+                        ObjectContainer &objects,
+                        VssRayContainer &rays
+                        //                      AxisAlignedBox3 *forcedBoundingBox = NULL
                         );
         
@@ -849 +858 @@
   
   AxisAlignedBox3 GetBBox(const RssTreeNode *node) const {
-    if (node->parent == NULL)
-      return bbox;
-
-    if (!node->IsLeaf())
-      return ((RssTreeInterior *)node)->bbox;
-
-    if (node->parent->axis >= 3)
-      return node->parent->bbox;
+        return node->bbox;
+
+//     if (node->parent == NULL)
+//       return bbox;
+
+//     if (!node->IsLeaf())
+//       return ((RssTreeInterior *)node)->bbox;
+
+//     if (node->parent->axis >= 3)
+//       return node->parent->bbox;
       
-    AxisAlignedBox3 box(node->parent->bbox);
-    if (node->parent->front == node)
-      box.SetMin(node->parent->axis, node->parent->position);
-    else
-      box.SetMax(node->parent->axis, node->parent->position);
-    return box;
+//     AxisAlignedBox3 box(node->parent->bbox);
+//     if (node->parent->front == node)
+//       box.SetMin(node->parent->axis, node->parent->position);
+//     else
+//       box.SetMax(node->parent->axis, node->parent->position);
+//     return box;
   }
 
@@ -869 +880 @@
 
   AxisAlignedBox3 GetDirBBox(const RssTreeNode *node) const {
-
-    if (node->parent == NULL)
-      return dirBBox;
+        return node->dirBBox;
+//     if (node->parent == NULL)
+//       return dirBBox;
     
-    if (!node->IsLeaf() )
-      return ((RssTreeInterior *)node)->dirBBox;
-
-    if (node->parent->axis < 3)
-      return node->parent->dirBBox;
+//     if (!node->IsLeaf() )
+//       return ((RssTreeInterior *)node)->dirBBox;
+
+//     if (node->parent->axis < 3)
+//       return node->parent->dirBBox;
     
-    AxisAlignedBox3 dBBox(node->parent->dirBBox);
-
-    if (node->parent->front == node)
-      dBBox.SetMin(node->parent->axis - 3, node->parent->position);
-    else
-      dBBox.SetMax(node->parent->axis - 3, node->parent->position);
-    return dBBox;
+//     AxisAlignedBox3 dBBox(node->parent->dirBBox);
+
+//     if (node->parent->front == node)
+//       dBBox.SetMin(node->parent->axis - 3, node->parent->position);
+//     else
+//       dBBox.SetMax(node->parent->axis - 3, node->parent->position);
+//     return dBBox;
   }
   
@@ -978 +989 @@
                   );
 
-  RssTreeNode *GetRoot() const { return root; }
+  RssTreeNode *GetRoot(Intersectable *object = NULL) const;
 
   bool
@@ -1053 +1064 @@
                                          vector<RssTreeLeaf::SilhouetteRays> &rays
                                          );
-  
+
+  void
+  PushRoots(priority_queue<TraversalData> &stack) const;
+
+  void
+  PushRoots(stack<RssTreeNode *> &st) const;
+
+  void
+  PushRoots(stack<RayTraversalData> &st, RssTreeNode::RayInfo &info) const;
+
+
 };
 

trunk/VUT/GtpVisibilityPreprocessor/src/default.env

@@ -69 +69 @@
 RssPreprocessor {
         samplesPerPass  100000
-        initialSamples 1000000
+        initialSamples 500000
         vssSamples 10000000
         vssSamplesPerPass 500000
@@ -94 +94 @@
 
         epsilon         1e-6
+        perObjectTree true
 
         maxDepth        40
@@ -105 +106 @@
         maxStaticMemory 100
 
-#       splitType regular
+        splitType regular
 #       splitType heuristic
-        splitType hybrid
+#       splitType hybrid
         splitUseOnlyDrivingAxis true
         importanceBasedCost false
@@ -169 +170 @@
         #type kdTree
         #type vspKdTree
-        # type bspTree
-        type vspBspTree
+        type bspTree
+        #type vspBspTree
         
         #type sceneDependent

trunk/VUT/GtpVisibilityPreprocessor/src/preprocessor.pro

@@ -4 +4 @@
 
 #win32:INCLUDEPATH += c:/STLport-4.6.2/stlport
+win32:INCLUDEPATH += "d:/Programs/NVIDIA Corporation/Cg/include"
 
 unix:INCLUDEPATH += ../support/src/xerces-c-src_2_7_0/include
@@ -10 +11 @@
 
 
-win32:LIBPATH += ../support/xerces/lib ../support/devil/lib
+win32:LIBPATH += ../support/xerces/lib ../support/devil/lib "d:/Programs/NVIDIA Corporation/Cg/lib"
 unix:LIBPATH += ../support/src/xerces-c-src_2_7_0/lib ../support/devil/lib /usr/lib/qt3/lib64
 
@@ -25 +26 @@
 QT += opengl
 
-win32:LIBS += xerces-c_2.lib devil.lib ilu.lib ilut.lib
+win32:LIBS += xerces-c_2.lib devil.lib ilu.lib ilut.lib cg.lib cgGL.lib
 unix:LIBS += -lxerces-c -lIL -lILU -lILUT
 
@@ -43 +44 @@
 RenderSimulator.cpp VspKdTree.cpp RayInfo.cpp RssTree.cpp RssPreprocessor.cpp \
 ViewCellsManager.cpp VspBspTree.cpp GlRenderer.cpp \
-PreprocessorThread.cpp Renderer.cpp Beam.cpp
+PreprocessorThread.cpp Renderer.cpp Beam.cpp ViewCellsParser.cpp