Changeset 2071 for GTP

Timestamp:

02/01/07 14:42:05 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/generate_viewcells.env (modified) (3 diffs)
• scripts/vienna-visibility.xml.zip (modified) (previous)
• src/InternalRayCaster.cpp (modified) (2 diffs)
• src/Mutation.cpp (modified) (1 diff)
• src/Pvs.h (modified) (1 diff)
• src/SamplingStrategy.cpp (modified) (2 diffs)
• src/ViewCell.cpp (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (4 diffs)
• src/ViewCellsParser.cpp (modified) (1 diff)
• src/VspBspTree.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env

@@ -12 +12 @@
 
 Preprocessor {
-samplesPerPass 3000000
+        samplesPerPass 3000000
         useGlRenderer false
         type vss
@@ -19 +19 @@
         loadMeshes false
         # internal raycaster
-        rayCastMethod 0
+#       rayCastMethod 0
         # intel raycaster
-#       rayCastMethod 1
+        rayCastMethod 1
         exportVisibility false
         loadKdTree false
@@ -190 +190 @@
 VspBspTree {
         Construction {
-                samples 200000
+                samples 2000000
                 epsilon 0.0000001
                 randomize false

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

@@ -201 +201 @@
 #endif
 
+        AxisAlignedBox3 ebox = sbox;
+        ebox.Enlarge(Vector3(1e-3f));
+
         SimpleRayContainer::const_iterator sit, sit_end = rays.end();
 
@@ -207 +210 @@
         {
                 CastRay(*sit, vssRays, sbox, castDoubleRays, pruneInvalidRays);
-                if (!vssRays.empty() && (!vssRays.back() || !sbox.IsInside(*vssRays.back())))
+                if (!vssRays.empty() && (!vssRays.back() || !ebox.IsInside(*vssRays.back())))
                 cout << "error " << *vssRays.back()<<endl;
         }

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

@@ -473 +473 @@
   static Vector3 shifts[packetSize];
   // mutate the 
-  float alpha = RandomValue(0.0f, 2.0f*M_PI);
+  float alpha = RandomValue(0.0f, Real(2.0*M_PI));
   //float alpha = vr2.x*2.0f*M_PI;
   

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

@@ -712 +712 @@
 template <typename T, typename S>
 float Pvs<T, S>::AddSample(T sample, const float pdf)
-{cout << "t";
+{
         ++ mSamples;
         

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

@@ -205 +205 @@
 bool SpatialBoxBasedDistribution::GenerateSample(SimpleRay &ray)
 {
+                Vector3 origin, direction; 
+
+        mPreprocessor.mViewCellsManager->GetViewPoint(origin);
+        direction = mPreprocessor.mKdTree->GetBox().GetRandomPoint() - origin;
+        //cout << "z";
+        const float c = Magnitude(direction);
+
+        if (c <= Limits::Small) 
+                return false;
+
+        const float pdf = 1.0f;
+
+        direction *= 1.0f / c;
+        ray = SimpleRay(origin, direction, SPATIAL_BOX_BASED_DISTRIBUTION, pdf);
+
+        return true;
+
+        /*
   Vector3 origin, direction; 
 
@@ -226 +244 @@
   ray = SimpleRay(origin, direction, SPATIAL_BOX_BASED_DISTRIBUTION, pdf);
   
-  return true;
+  return true;*/
 }
 

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

@@ -265 +265 @@
                                                         float &contribution)
 { 
-        cout<<"e";
         const bool result = mPvs.AddSample(sample, pdf);//, contribution);
         // have to recompute pvs size

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

@@ -3655 +3655 @@
 
         ///////////
-        //-- faster way of computing pvs:
-        //-- construct merged pvs by adding
-        //-- and only those of the next pvs which were not mailed.
-        //-- note: sumpdf is not correct!!
+        //-- merge pvss
 
         vector<ObjectPvs>::iterator oit = pvsList.begin();
@@ -3666 +3663 @@
                 ObjectPvsIterator pit = (*oit).GetIterator();
                 
-                // first mark all object from this pvs
+                // add pvss to new pvs: use mailing to avoid adding entries two times.
                 while (pit.HasMoreEntries())
                 {               
@@ -3677 +3674 @@
                                 intersect->Mail();
 
-                                if (pvs.AddSampleDirtyCheck(intersect, entry.mData.mSumPdf))
-                                {
-                                        if (pvs.RequiresResort())
-                                        {
-                                                pvs.SimpleSort();
-                                        }
-                                }
-                                
+                                pvs.AddSampleDirty(intersect, entry.mData.mSumPdf);
                         }
                 }
         }
+
+        if (0) pvs.Sort();
 
         // store pvs in this node
@@ -3699 +3691 @@
         
 #else 
-        // really merge cells: slow put sumPdf is correct
+        // really merge cells: slow but sumPdf is correct
         viewCellInterior->GetPvs().Merge(backVc->GetPvs());
         viewCellInterior->GetPvs().Merge(frontVc->GetPvs());

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

@@ -912 +912 @@
                 }
                 if (attrName == "pvs") 
-                {//cout <<"e";
+                {
                         StrX attrValue(attributes.getValue(i));
                         const char *ptr = attrValue.LocalForm();

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

@@ -27 +27 @@
 #define COUNT_ORIGIN_OBJECTS 1
 
-#define STORE_PVS 0
+#define STORE_PVS 1
 
 
@@ -959 +959 @@
                 EvalSubdivisionCandidate(backCandidate);
         
-                cout << "f cost: " << frontCandidate.mPriority << endl;
-                cout << "b cost: " << backCandidate.mPriority << endl;
+                cout << "f cost: " << frontCandidate.mPriority << " " << frontCandidate.mRenderCostDecr << endl;
+                cout << "b cost: " << backCandidate.mPriority << " " << backCandidate.mRenderCostDecr << endl;
                 tQueue.push(frontCandidate);
                 tQueue.push(backCandidate);
@@ -1273 +1273 @@
                 if (ray->mTerminationObject) 
                 {
-                        cout << "m";
+                        //cout << "m";
                         if (vc->AddPvsSample(ray->mTerminationObject, ray->mPdf, contribution))
                                 madeContrib = true;