Changeset 374 for trunk/VUT

Timestamp:

11/03/05 16:43:51 (19 years ago)

Author:

bittner

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Camera.cpp (modified) (2 diffs)
• Environment.cpp (modified) (2 diffs)
• ExactPreprocessor.h (modified) (1 diff)
• KdTree.cpp (modified) (6 diffs)
• Ray.h (modified) (5 diffs)
• SamplingPreprocessor.cpp (modified) (1 diff)
• Statistics.h (added)
• VssPreprocessor.cpp (modified) (6 diffs)
• VssPreprocessor.h (modified) (2 diffs)
• X3dParser.cpp (modified) (3 diffs)
• default.env (modified) (2 diffs)
• main.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Camera.cpp

@@ -109 +109 @@
           exporter->ExportBox(tree->GetBox(ray->kdLeaves[i]));
         if (0)
-        for (i= 0; i < ray->meshes.size(); i++)
-          exporter->ExportIntersectable(ray->meshes[i]);
+                for (i= 0; i < ray->testedObjects.size(); i++)
+                        exporter->ExportIntersectable(ray->testedObjects[i]);
 
       }
@@ -131 +131 @@
   ray.intersections.clear();
   ray.kdLeaves.clear();
-  ray.meshes.clear();
+  ray.testedObjects.clear();
   ray.bspIntersections.clear();
 

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1241 +1241 @@
 
   RegisterOption("BspTree.splitPlaneStrategy",
-                optString,
-                "-bsp_split_method=",
-                "leastSplits");
+                                                                 optString,
+                                                                 "-bsp_split_method=",
+                                                                 "leastSplits");
 
   RegisterOption("BspTree.maxCandidates",
@@ -1259 +1259 @@
           "-bsp_exportSplits",
           "false");
+
+  RegisterOption("Preprocessor.type",
+                                                                 optString,
+                                                                 "-preprocessor=",
+                                                                 "sampling");
+        
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ExactPreprocessor.h

@@ -9 +9 @@
   public:
     virtual bool ComputeVisibility();
+
+                virtual bool BuildBspTree() { return false; }
+
   };
   

trunk/VUT/GtpVisibilityPreprocessor/src/KdTree.cpp

@@ -476 +476 @@
       float sum;
       if (mSahUseFaces)
-        sum = intersectionsLeft*lbox.SurfaceArea() + intersectionsRight*rbox.SurfaceArea();
+                                sum = intersectionsLeft*lbox.SurfaceArea() + intersectionsRight*rbox.SurfaceArea();
       else
-        sum = objectsLeft*lbox.SurfaceArea() + objectsRight*rbox.SurfaceArea();
+                                sum = objectsLeft*lbox.SurfaceArea() + objectsRight*rbox.SurfaceArea();
       
       //      cout<<"pos="<<(*ci).value<<"\t q=("<<ql<<","<<qr<<")\t r=("<<rl<<","<<rr<<")"<<endl;
@@ -484 +484 @@
       
       if (sum < minSum) {
-        minSum = sum;
-        position = (*ci).value;
-        
-        objectsBack = objectsLeft;
-        objectsFront = objectsRight;
+                                minSum = sum;
+                                position = (*ci).value;
+                                
+                                objectsBack = objectsLeft;
+                                objectsFront = objectsRight;
       }
     }
@@ -507 +507 @@
 int
 KdTree::CastRay(
-                Ray &ray
-                )
+                                                                Ray &ray
+                                                                )
 {
   int hits = 0;
@@ -570 +570 @@
       maxt = tdist;
         } else {
-      // compute intersection with all objects in this leaf
-      KdLeaf *leaf = (KdLeaf *) node;
-      ray.kdLeaves.push_back(leaf);
-      
-      ObjectContainer::const_iterator mi;
-      for ( mi = leaf->mObjects.begin();
-            mi != leaf->mObjects.end();
-            mi++) {
-        Intersectable *object = *mi;
-        if (!object->Mailed() ) {
-          object->Mail();
-          //ray.meshes.push_back(mesh);
-          hits += object->CastRay(ray);
+                // compute intersection with all objects in this leaf
+                KdLeaf *leaf = (KdLeaf *) node;
+                if (ray.mFlags & Ray::STORE_KDLEAVES)
+                        ray.kdLeaves.push_back(leaf);
+                
+                ObjectContainer::const_iterator mi;
+                for ( mi = leaf->mObjects.begin();
+                                        mi != leaf->mObjects.end();
+                                        mi++) {
+                        Intersectable *object = *mi;
+                        if (!object->Mailed() ) {
+                                object->Mail();
+                                if (ray.mFlags & Ray::STORE_TESTED_OBJECTS)
+                                        ray.testedObjects.push_back(object);
+                                hits += object->CastRay(ray);
+                        }
+                }
+                
+                if (hits && ray.GetType() == Ray::LOCAL_RAY)
+                        if (ray.intersections[0].mT <= maxt)
+                                break;
+                
+                // get the next node from the stack
+                if (tStack.empty())
+                        break;
+                
+                entp = extp;
+                mint = maxt;
+                if (ray.GetType() == Ray::LINE_SEGMENT && mint > 1.0f)
+                        break;
+                
+                RayTraversalData &s  = tStack.top();
+                node = s.mNode;
+                extp = s.mExitPoint;
+                maxt = s.mMaxT;
+                tStack.pop();
         }
-      }
-
-      if (hits && ray.GetType() == Ray::LOCAL_RAY)
-        if (ray.intersections[0].mT <= maxt)
-          break;
-      
-      // get the next node from the stack
-      if (tStack.empty())
-        break;
-      
-      entp = extp;
-      mint = maxt;
-      if (ray.GetType() == Ray::LINE_SEGMENT && mint > 1.0f)
-        break;
-      
-      RayTraversalData &s  = tStack.top();
-      node = s.mNode;
-      extp = s.mExitPoint;
-      maxt = s.mMaxT;
-      tStack.pop();
-    }
   }
   
@@ -624 +626 @@
       KdLeaf *leaf = (KdLeaf *)node;
       for (int j=0; j < leaf->mObjects.size(); j++) {
-        Intersectable *object = leaf->mObjects[j];
-        if (!object->Mailed()) {
-          object->Mail();
-          objects.push_back(object);
-        }
+                                Intersectable *object = leaf->mObjects[j];
+                                if (!object->Mailed()) {
+                                        object->Mail();
+                                        objects.push_back(object);
+                                }
       }
     } else {
@@ -699 +701 @@
       KdInterior *interior = (KdInterior *)node;
       if (interior->mPosition > box.Max(interior->mAxis))
-        nodeStack.push(interior->mBack);
+                                nodeStack.push(interior->mBack);
       else
-        if (interior->mPosition < box.Min(interior->mAxis))
-          nodeStack.push(interior->mFront);
-        else {
-          // random decision
-            nodeStack.push(interior->mBack);
-            nodeStack.push(interior->mFront);
-        }
+                                if (interior->mPosition < box.Min(interior->mAxis))
+                                        nodeStack.push(interior->mFront);
+                                else {
+                                        // random decision
+                                        nodeStack.push(interior->mBack);
+                                        nodeStack.push(interior->mFront);
+                                }
     }
   }

trunk/VUT/GtpVisibilityPreprocessor/src/Ray.h

@@ -29 +29 @@
   /// front (back) to the back (front)
   enum {FRONT, BACK, BACK_FRONT, FRONT_BACK, COINCIDENT};
-
+        
   struct Intersection {
     // the point of intersection
@@ -63 +63 @@
 
     BspIntersection(const float t, BspLeaf *l):
-        mT(t), mLeaf(l) {}
-
+                        mT(t), mLeaf(l) {}
+                
     BspIntersection() {}
-
+                
     bool operator<(const BspIntersection &b) const {
       return mT <b.mT; }
@@ -79 +79 @@
   vector<BspIntersection> bspIntersections;
   vector<KdLeaf *> kdLeaves;
-  vector<MeshInstance *> meshes;
-  
+  vector<Intersectable *> testedObjects;
+
+        // various flags
+        enum {STORE_KDLEAVES=1, STORE_BSP_INTERSECTIONS=2, STORE_TESTED_OBJECTS=4};
+        int mFlags;
+
+        
   // constructors
   Ray(const Vector3 &wherefrom,
       const Vector3 &whichdir,
-      const int _type) {
+      const int _type):mFlags(0) {
     loc = wherefrom;
     if (_type == LINE_SEGMENT)
@@ -92 +97 @@
     mType = _type;
     depth = 0;
-    Init();
+                Init();
   }
   // dummy constructor
   Ray() {}
-
+        
   Intersectable *GetIntersectionObject(const int i) const {
     return intersections[i].mObject;
@@ -236 +241 @@
   // to the number of bounces of the ray, also called the depth of the
   // ray (primary ray has its depth zero)
-  int      depth;
-  
-  
+  int depth;
+
+        
+        
   void Init();
 

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -33 +33 @@
   ray.intersections.clear();
   ray.kdLeaves.clear();
-  ray.meshes.clear();
+  ray.testedObjects.clear();
   ray.bspIntersections.clear();
-
+        ray.mFlags |= Ray::STORE_KDLEAVES | Ray::STORE_BSP_INTERSECTIONS;
   //  cout<<point<<" "<<direction<<endl;
   ray.Init(point, direction, type);

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -28 +28 @@
 VssPreprocessor::SetupRay(Ray &ray, 
                                                                                                         const Vector3 &point, 
-                                                                                                        const Vector3 &direction,
-                                                                                                        const int type)
+                                                                                                        const Vector3 &direction
+                                                                                                        )
 {
   ray.intersections.clear();
-  ray.kdLeaves.clear();
-  ray.meshes.clear();
-
+        // do not store anything else then intersections at the ray
+        ray.kdLeaves.clear();
+        ray.mFlags = Ray::STORE_KDLEAVES;
+        
   //  cout<<point<<" "<<direction<<endl;
-  ray.Init(point, direction, type);
+  ray.Init(point, direction, Ray::LOCAL_RAY);
 }
 
@@ -51 +52 @@
 int
 VssPreprocessor::AddNodeSamples(const Ray &ray,
-                                                                                                                                                 Intersectable *sObject,
-                                                                                                                                                 Intersectable *tObject
-                                                                                                                                                 )
+                                                                                                                                Intersectable *sObject,
+                                                                                                                                Intersectable *tObject
+                                                                                                                                )
 {
   int contributingSamples = 0;
@@ -62 +63 @@
         if (tObject)
                 objects++;
-
+        
         if (objects) {
                 for (j=0; j < ray.kdLeaves.size(); j++) {
@@ -123 +124 @@
         KdNode *nodeToSample = NULL;
         
-        bool samplePvsBoundary = false;
-        if (pvsSize && samplePvsBoundary) {
-                // this samples the nodes from the boundary of the current PVS
-                // mail all nodes from the pvs
-                Intersectable::NewMail();
-                KdPvsMap::iterator i = object->mKdPvs.mEntries.begin();
-                
-                for (; i != object->mKdPvs.mEntries.end(); i++) {
-                        KdNode *node = (*i).first;
-                        node->Mail();
-                }
-                
-                int maxTries = 2*pvsSize;
-                Debug << "Finding random neighbour" << endl;    
-                for (int tries = 0; tries < 10; tries++) {
-                        int index = RandomValue(0, pvsSize - 1);
-                        KdPvsData data;
-                        KdNode *node;
-                        object->mKdPvs.GetData(index, node, data);
-                        nodeToSample = mKdTree->FindRandomNeighbor(node, true);
-                        if (nodeToSample)
-                                break;
-                }
-        } else {
-                // just pickup a random node
-                //              nodeToSample = mKdTree->GetRandomLeaf(Plane3(normal, point));
-                nodeToSample = mKdTree->GetRandomLeaf();
-        }
+        // just pickup a random node
+        nodeToSample = mKdTree->GetRandomLeaf();
         return nodeToSample;
 }
@@ -229 +204 @@
                                         
                                         // construct a ray
-                                        SetupRay(ray, point, direction, Ray::LOCAL_RAY);
+                                        SetupRay(ray, point, direction);
                                         
                                         sampleContributions = CastRay(reverseSample ? NULL : object, ray);
@@ -298 +273 @@
         }
         
-        if (ViewCell::sHierarchy == ViewCell::KD)       
-                cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
-  
-        
-  //  HoleSamplingPass();
+        cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
+  
+        
         if (0) {
                 Exporter *exporter = Exporter::GetExporter("ray-density.x3d"); 

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.h

@@ -29 +29 @@
   void
   SetupRay(Ray &ray, 
-                   const Vector3 &point, 
-                   const Vector3 &direction,
-                   const int type);
+                                         const Vector3 &point, 
+                                         const Vector3 &direction
+                                         );
 
   KdNode *
@@ -49 +49 @@
         GetNodeToSample(Intersectable *object);
 
+        virtual bool BuildBspTree() { return false; }
+
 };
 

trunk/VUT/GtpVisibilityPreprocessor/src/X3dParser.cpp

@@ -458 +458 @@
 void
 X3dViewCellsParseHandlers::StartCoordinate(
-                                  AttributeList&  attributes)
+                                                                                                                                                                         AttributeList&  attributes)
 {
         int len = attributes.getLength();
@@ -518 +518 @@
 #ifdef _DEBUG
                 Debug << "Viewcell: " 
-                          << mesh->mVertices[0] << " " << mesh->mVertices[1] << " " << mesh->mVertices[2] << " " 
-                          << mesh->mVertices[3] << " " << mesh->mVertices[4] << " " << mesh->mVertices[5] << "\n";
+                                        << mesh->mVertices[0] << " " << mesh->mVertices[1] << " " << mesh->mVertices[2] << " " 
+                                        << mesh->mVertices[3] << " " << mesh->mVertices[4] << " " << mesh->mVertices[5] << "\n";
 #endif
-        }
+                }
 }
 
@@ -527 +527 @@
 void
 X3dViewCellsParseHandlers::startElement(const XMLCh* const name,
-                               AttributeList&  attributes)
+                                                                                                                                                                AttributeList&  attributes)
 {
   StrX lname(name);

trunk/VUT/GtpVisibilityPreprocessor/src/default.env

@@ -12 +12 @@
 # filename ../data/vienna/viewcells-25-sel.x3d
 # filename ../data/atlanta/atlanta2.x3d
-#       filename ../data/soda/soda.dat
-filename ../data/soda/soda5.dat
+        filename ../data/soda/soda.dat
+# filename ../data/soda/soda5.dat
+}
+
+Preprocessor {
+#       type sampling
+        type vss
 }
 
@@ -61 +66 @@
 
 ViewCells {
-        #hierarchy kdTree
-        hierarchy bspTree
+        hierarchy kdTree
+        #hierarchy bspTree
         # hierarchy sceneDependent
         

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -1 +1 @@
 #include "SamplingPreprocessor.h"
+#include "VssPreprocessor.h"
 #include "ExactPreprocessor.h"
 #include "Parser.h"
@@ -24 +25 @@
   BspTree::ParseEnvironment();
 
-  Preprocessor *p =
-    new SamplingPreprocessor();
+        char buff[128];
 
-  char buff[128];
+        environment->GetStringValue("Preprocessor.type", buff);
+
+        string preprocessorType(buff);
+        
+  Preprocessor *p;
+
+        if (preprocessorType == "vss")
+                p = new VssPreprocessor();
+        else
+                if (preprocessorType == "exact")
+                        p = new ExactPreprocessor();
+                else
+                        if (preprocessorType == "sampling")
+                                p = new SamplingPreprocessor();
+                        else {
+                                cerr<<"Unknown preprocessor type"<<endl;
+                                Debug<<"Unknown preprocessor type"<<endl;
+                                exit(1);
+                        }
+        
+
   environment->GetStringValue("Scene.filename", buff);
   string filename(buff);