Changeset 433 for trunk/VUT

Timestamp:

11/25/05 14:29:09 (19 years ago)

Author:

mattausch

Message:

changed tabs

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (5 diffs)
• src/Ray.cpp (modified) (1 diff)
• src/SamplingPreprocessor.cpp (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (2 diffs)
• src/VspKdTree.cpp (modified) (1 diff)
• src/VssPreprocessor.cpp (modified) (4 diffs)
• src/VssTree.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -19 +19 @@
 
 Preprocessor {
-#       type sampling
+        #type sampling
         type vss
 }
 
 VssPreprocessor {
-        samplesPerPass  100000
-        initialSamples 2000000
-        vssSamples 1000000
-        vssSamplesPerPass 100000
+        samplesPerPass  10000
+        initialSamples 200000
+        vssSamples 100000
+        vssSamplesPerPass 10000
         useImportanceSampling true
 }
@@ -38 +38 @@
         minRays         100
         minSize         0.001
-  maxCostRatio  0.98
+        maxCostRatio    0.98
         maxRayContribution 0.05
         
@@ -164 +164 @@
         #splitPlaneStrategy 130
         
-        splitPlaneStrategy 12
+        splitPlaneStrategy 1
         
         maxPolyCandidates 70
@@ -186 +186 @@
                 minRays 200
                 minPolygons -1
-                maxDepth 40
-                minPvs 35
+                maxDepth 20
+                minPvs 100
                 minArea 0.01
                 maxRayContribution 0.005
@@ -255 +255 @@
         
         Termination {
-                maxDepth                10
-                minPvs                  500
+                maxDepth                30
+                minPvs                  50
                 minRays                 1
                 minSize                 0.1

trunk/VUT/GtpVisibilityPreprocessor/src/Ray.cpp

@@ -222 +222 @@
 Ray::Ray(const VssRay &vssRay):
 loc(vssRay.mOrigin),
-sourceObject(0, vssRay.mOriginObject, 0),
-dir(Normalize(vssRay.GetDir()))
-{
-        intersections.push_back(Intersection(vssRay.mT, vssRay.mTerminationObject, 0));
-}
+sourceObject(0, vssRay.mOriginObject, 0)
+{
+        const float dist = Distance(vssRay.mTermination, vssRay.mOrigin);
+
+        if (dist)
+                dir = vssRay.GetDir() / dist;
+
+        if (!vssRay.mTerminationObject)
+                Debug << "error!" << endl;
+
+        intersections.push_back(Intersection(dist, vssRay.mTerminationObject, 0));
+
+        Precompute();
+}

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -821 +821 @@
                 if ((int)mVspSampleRays.size() < mVspConstructionSamples)
                 {
-                        if (object || !ray.intersections.empty())
+                        if (!ray.intersections.empty())
                         {
                                 ray.sourceObject = Ray::Intersection(0.0, object, faceIndex);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -1452 +1452 @@
         float pFront = 0;
         float pBack = 0;
-
+Debug << "here" << endl;
         if (mSplitPlaneStrategy & PVS)
         {
@@ -1583 +1583 @@
                   << " backpvs: " << backPvs << " pBack: " << pBack << endl << endl;
 #endif
+        Debug << "here2" << endl;
         return val;
 }

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.cpp

@@ -1324 +1324 @@
                 int side = in->ComputeRayIntersection(data.mRayData, data.mRayData.mRay->mT);
     
-      if (side == 0) 
-          {
-                if (data.mRayData.mRay->HasPosDir(in->mAxis)) 
-                {
-                        tstack.push(RayTraversalData(in->GetBack(), 
-                                                RayInfo(data.mRayData.mRay, data.mRayData.mMinT, data.mRayData.mRay->mT)));
+                if (side == 0) 
+                {
+                        if (data.mRayData.mRay->HasPosDir(in->mAxis)) 
+                        {
+                                tstack.push(RayTraversalData(in->GetBack(), 
+                                                        RayInfo(data.mRayData.mRay, data.mRayData.mMinT, data.mRayData.mRay->mT)));
                                 
-                        tstack.push(RayTraversalData(in->GetFront(),
-                                                RayInfo(data.mRayData.mRay, data.mRayData.mRay->mT, data.mRayData.mMaxT)));
-        
-                } 
-                else 
-                {
-                        tstack.push(RayTraversalData(in->GetBack(),
-                                                                                 RayInfo(data.mRayData.mRay,
-                                                                                                 data.mRayData.mRay->mT,
-                                                                                                 data.mRayData.mMaxT)));
-                        tstack.push(RayTraversalData(in->GetFront(),
-                                                                                 RayInfo(data.mRayData.mRay,
-                                                                                                 data.mRayData.mMinT,
-                                                                                                 data.mRayData.mRay->mT)));
-                }
-          } 
-          else
-          if (side == 1)
-                          tstack.push(RayTraversalData(in->GetFront(), data.mRayData));
-                  else
-                          tstack.push(RayTraversalData(in->GetBack(), data.mRayData));
+                                tstack.push(RayTraversalData(in->GetFront(),
+                                                        RayInfo(data.mRayData.mRay, data.mRayData.mRay->mT, data.mRayData.mMaxT)));
+        
+                        } 
+                        else 
+                        {
+                                tstack.push(RayTraversalData(in->GetBack(),
+                                                        RayInfo(data.mRayData.mRay,
+                                                        data.mRayData.mRay->mT,
+                                                        data.mRayData.mMaxT)));
+                                tstack.push(RayTraversalData(in->GetFront(),
+                                                        RayInfo(data.mRayData.mRay,
+                                                        data.mRayData.mMinT,
+                                                        data.mRayData.mRay->mT)));
+                        }
+                }
+                else
+                        if (side == 1)
+                                tstack.push(RayTraversalData(in->GetFront(), data.mRayData));
+                        else
+                                tstack.push(RayTraversalData(in->GetBack(), data.mRayData));
         } 
         else 

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -11 +11 @@
 
 
-bool useViewSpaceBox = true;
+bool useViewSpaceBox = false;//true;
 bool use2dSampling = false;
-bool useViewspacePlane = false;
+bool useViewspacePlane = false;//true;
 
 VssPreprocessor::VssPreprocessor():
@@ -413 +413 @@
 
         
-        //      int numExportRays = 10000;
-
-        int numExportRays = 0;
+        int numExportRays = 10000;
+        //int numExportRays = 0;
 
         if (numExportRays) {
@@ -498 +497 @@
                         for (int i = 0; i < (int)vssRays.size(); ++ i)
                         {
-                                CastRay(*mBspTree, *mVssRays[i]);
+                                CastRay(*mBspTree, *vssRays[i]);
                         }
                 }
@@ -539 +538 @@
         Ray ray(vssRay);
 
-        /*Debug << ray << endl;
+        Debug << ray << endl;
         if (ray.intersections.empty())
                 Debug << "empty ray" << endl;
         else 
                 Debug << "intersection: " << ray.intersections[0].mT << " " << ray.intersections[0].mObject << endl;
-*/
+
         mBspTree->CastRay(ray);
                                 
-        if (ray.sourceObject.mObject)
+        //if (0 && ray.sourceObject.mObject)
                 //sampleContributions += 
-                AddObjectSamples(ray.sourceObject.mObject, ray);
+                //AddObjectSamples(ray.sourceObject.mObject, ray);
                         
                 if (!ray.intersections.empty()) // second intersection found

trunk/VUT/GtpVisibilityPreprocessor/src/VssTree.cpp

@@ -538 +538 @@
         Intersectable::NewMail(3);
 
-        Debug << "evaluating cost ratio: " << leaf->rays.size() << endl;
         if (axis <= VssTreeNode::SPLIT_Z) {
     // this is the main ray classification loop!
@@ -545 +544 @@
                                 ri++)
       if ((*ri).mRay->IsActive()) {
-                                //Debug << "new t: " <<   (*ri).mRay->mT << endl;
+                                
                                 // determine the side of this ray with respect to the plane
                                 int side = (*ri).ComputeRayIntersection(axis, position, (*ri).mRay->mT);