Changeset 1883 for GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp

Timestamp:

12/12/06 17:25:53 (18 years ago)

Author:

bittner

Message:

mixture distribution initial coding

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp (modified) (8 diffs)

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

@@ -28 +28 @@
 #include "Preprocessor.h"
 #include "SceneGraph.h"
+#include "SamplingStrategy.h"
 
 
@@ -1949 +1950 @@
                 Vector3 direction = VssRay::GetDirection(dirVector.x, dirVector.y);
                 //cout<<"dir vector.x="<<dirVector.x<<"direction'.x="<<atan2(direction.x, direction.y)<<endl;
-                rays.push_back(SimpleRay(origin, direction));
+                rays.push_back(SimpleRay(origin,
+                                                                 direction,
+                                                                 SamplingStrategy::RSS_BASED_DISTRIBUTION,
+                                                                 1.0f
+                                                                 ));
           }
         } else {
@@ -2308 +2313 @@
 
   //Debug<<"dir vector.x="<<dirVector.x<<"direction'.x="<<atan2(direction.x, direction.y)<<endl;
-  rays.push_back(SimpleRay(origin, direction));
+  rays.push_back(SimpleRay(origin,
+                                                   direction,
+                                                   SamplingStrategy::RSS_BASED_DISTRIBUTION,
+                                                   1.0f
+                                                   ));
 }
 
@@ -2472 +2481 @@
         if (!intersects) {
           //cout<<"dir vector.x="<<dirVector.x<<"direction'.x="<<atan2(direction.x, direction.y)<<endl;
-          rays.push_back(SimpleRay(origin, direction));
+          rays.push_back(SimpleRay(origin,
+                                                           direction,
+                                                           SamplingStrategy::RSS_BASED_DISTRIBUTION,
+                                                           1.0f
+                                                           ));
           generated++;
         }
@@ -2588 +2601 @@
         if (node->IsLeaf()) {
           RssTreeLeaf *leaf = (RssTreeLeaf *)node;
-          prunned += PruneRaysRandom(leaf, ratio);
-          //prunned += PruneRaysContribution(leaf, ratio);
+          //prunned += PruneRaysRandom(leaf, ratio);
+          prunned += PruneRaysContribution(leaf, ratio);
         } else {
           RssTreeInterior *in = (RssTreeInterior *)node;
@@ -2722 +2735 @@
 // if small very high importance of the last sample
 // if 1.0f then weighs = 1 1/2 1/3 1/4
-//float passSampleWeightDecay = 1.0f;
-float passSampleWeightDecay = 1000.0f;
+float passSampleWeightDecay = 1.0f;
+//float passSampleWeightDecay = 1000.0f;
 
 float
@@ -2730 +2743 @@
   int passDiff = mCurrentPass - pass;
   float weight;
-  if (1) 
+  if (0) 
         weight = 1.0f/(passDiff + passSampleWeightDecay);
   else 
@@ -2777 +2790 @@
 RssTree::ComputeImportance(RssTreeLeaf *leaf) 
 {
+#if 1
   if (leaf->mTotalRays)
         leaf->mImportance = leaf->mTotalContribution / leaf->mTotalRays;
   else
-        leaf->mImportance = 0.0f;
+        leaf->mImportance = Limits::Small;
   return;
+#endif
   
   if (0)