Changeset 431 for trunk

Timestamp:

11/25/05 07:59:50 (19 years ago)

Author:

mattausch

Message:

started fixing ray bug

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (3 diffs)
• src/VssRay.h (modified) (3 diffs)
• src/VssTree.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -25 +25 @@
 VssPreprocessor {
         samplesPerPass  100000
-        initialSamples 200000
-        vssSamples 300000
+        initialSamples 2000000
+        vssSamples 1000000
         vssSamplesPerPass 100000
         useImportanceSampling true
@@ -234 +234 @@
         maxRayContribution 0.05
         
-        maxTotalMemory  400
+        maxTotalMemory  200
         maxStaticMemory 20
 
@@ -263 +263 @@
         }
         
-        maxTotalMemory  600
-        maxStaticMemory 600
+        maxTotalMemory  400
+        maxStaticMemory 200
 
         splitType       regular

trunk/VUT/GtpVisibilityPreprocessor/src/VssRay.h

@@ -56 +56 @@
                 mTerminationObject(terminationObject),
                 mRefCount(0),
-    mFlags(0)
+    mFlags(0),
+        mT(1.0f)
         {
     Precompute();
@@ -65 +66 @@
                 mFlags(0),
                 mMailbox(-1),
-                mOriginObject(ray.sourceObject.mObject)
+                mOriginObject(ray.sourceObject.mObject),
+                mT(1.0f)
         {
                 if (ray.sourceObject.mObject)
@@ -76 +78 @@
                 if (!ray.intersections.empty())
                 {
-                        mT = ray.intersections[0].mT;
-                        mTermination = ray.Extrap(mT);
+                        mTermination = ray.Extrap(ray.intersections[0].mT);
                         mTerminationObject = ray.intersections[0].mObject;
                 }
                 else
                 {
-                        mT = 1e6;//Limits::Infinity;
-                        mTermination = mOrigin + ray.GetDir() * mT;
+                        mTermination = ray.Extrap(1e6);//TODO: should be Limits::Infinity
                         mTerminationObject = NULL;
                 }

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!
@@ -544 +545 @@
                                 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);