Changeset 2570 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

12/18/07 09:04:41 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• IntersectableWrapper.cpp (modified) (2 diffs)
• Pvs.h (modified) (3 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (3 diffs)
• ViewCellsManager.h (modified) (1 diff)

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

@@ -115 +115 @@
 
 
-int TriangleIntersectable::GetRandomEdgePoint(Vector3 &point,
-                                                                                          Vector3 &normal)
+int TriangleIntersectable::GetRandomEdgePoint(Vector3 &point, Vector3 &normal)
 {
         const int edge = Random(3);
@@ -137 +136 @@
 }
 
+
 int KdIntersectable::ComputeNumTriangles()
 {
+        Intersectable::NewMail();
+
         std::stack<KdNode *> tStack;
         tStack.push(mItem);

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

@@ -39 +39 @@
         typename vector<PvsEntry<T, S> >::const_iterator mItCurrent;
         typename vector<PvsEntry<T, S> >::const_iterator mItEnd;
+};
+
+
+struct VerbosePvsStats
+{
+        VerbosePvsStats(): mDistanceWeightedTriangles(0), mDistanceWeightedPvs(0), mWeightedTriangles(0)
+        {}
+
+        float mDistanceWeightedTriangles;
+        float mDistanceWeightedPvs;
+        float mWeightedTriangles;
 };
 
@@ -205 +216 @@
 
         typename PvsIterator<T, S> GetIterator() const;
+
+        VerbosePvsStats mStats;
 
 protected:
@@ -236 +249 @@
 
 template <typename T, typename S>
-VerbosePvs<T, S>::VerbosePvs(const vector<PvsEntry<T, S> > &samples)
+VerbosePvs<T, S>::VerbosePvs(const vector<PvsEntry<T, S> > &samples): 
+mLastSorted(0)
 {
         mEntries.reserve(samples.size());
         mEntries = samples;
-        mLastSorted = 0;
         mSamples = samples.size();
 }

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -1180 +1180 @@
 }
 
-
+#if 0
 float QtGlRendererWidget::ComputeRenderCost(ViewCell *vc)
 {
@@ -1221 +1221 @@
         return renderCost;
 }
-
+#else
+
+float QtGlRendererWidget::ComputeRenderCost(ViewCell *vc)
+{
+        float renderCost = 0;
+
+        if (mShowDistanceWeightedPvs)
+        {
+                return vc->GetPvs().mStats.mDistanceWeightedPvs;
+        }
+        else if (mShowDistanceWeightedTriangles)
+        {
+                return vc->GetPvs().mStats.mDistanceWeightedTriangles;
+        }
+        else //if (mShowWeightedTriangles)
+        {
+                return vc->GetPvs().mStats.mWeightedTriangles;
+        }
+}
+#endif
 
 void
@@ -1374 +1393 @@
                         else if (mShowWeightedCost)
                         {
-                                const float rcCost = mTransferFunction * vc->GetTrianglesInPvs();
+                                const float rcCost = mTransferFunction * ComputeRenderCost(vc);
                                 importance = rcCost / maxRcCost;
                         }

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

@@ -2101 +2101 @@
                 if (!ViewCellsConstructed()) 
                 {
-                        // view cells not yet constructed
+                        // view cells not constructed yet =>
                         // just take the lenghts of the rays as contributions
                         if ((*it)->mTerminationObject)
@@ -2669 +2669 @@
 
 
+void ViewCellsManager::UpdateStatsForViewCell(ViewCell *vc, Intersectable *obj)
+{
+                KdIntersectable *kdObj = static_cast<KdIntersectable *>(obj);
+
+        const AxisAlignedBox3 box = kdObj->GetBox();
+                const float dist = SqrDistance(vc->GetBox().Center(), box.Center());
+
+                float f;
+
+                const float radius = mViewSpaceBox.Radius();
+                const float fullRadius = mViewSpaceBox.Radius();
+
+                const float minVal = 0.1f;
+                const float maxVal = 1.0f;
+
+                if (dist <= radius) 
+                        f = maxVal;
+                else if (dist >= fullRadius)
+                        f = minVal;
+                else // linear blending
+                {
+                        f = minVal * (dist - radius) + maxVal * (fullRadius - radius - dist);
+                }
+
+                const int numTriangles = kdObj->ComputeNumTriangles();
+
+                vc->GetPvs().mStats.mDistanceWeightedTriangles += f * numTriangles; 
+                vc->GetPvs().mStats.mDistanceWeightedPvs += f;
+                vc->GetPvs().mStats.mWeightedTriangles += numTriangles;
+}
+
+
 void ViewCellsManager::ComputeViewCellContribution(ViewCell *viewCell,
                                                                                                    VssRay &ray, 
@@ -2692 +2724 @@
                 hasAbsContribution = viewCell->GetPvs().AddSampleDirtyCheck(obj, ray.mPdf);
                 //hasAbsContribution = viewCell->GetPvs().AddSample(obj,ray.mPdf);
+#if 1
+                UpdateStatsForViewCell(viewCell, obj);
+#endif
+
         }
         else 

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

@@ -670 +670 @@
         
 
+        void UpdateStatsForViewCell(ViewCell *viewCell, Intersectable *obj);
+
+
         ///////////////////////
         //-- helper functions for view cell visualization