Changeset 352 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

Timestamp:

10/27/05 18:50:39 (19 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCell.cpp

@@ -5 +5 @@
 #include "Triangle3.h"
 
-ViewCell::ViewCell(): MeshInstance(NULL)
+ViewCell::ViewCell(): MeshInstance(NULL), mPiercingRays(0)
 {
 }
 
-ViewCell::ViewCell(Mesh *mesh): MeshInstance(mesh)
+ViewCell::ViewCell(Mesh *mesh): MeshInstance(mesh), mPiercingRays(0)
 {
 }
@@ -80 +80 @@
 }
 
+ViewCell *ViewCell::MergeViewCells(const ViewCell &front, const ViewCell &back)
+{
+        /*stable_sort(front.mPiercingRays.begin(), front.mPiercingRays.end());
+        stable_sort(back.mPiercingRays.begin(), back.mPiercingRays.end());
+
+        ViewCell *vc = front.Merge(back);
+
+        if (vc)
+                return vc;
+
+        return back.Merge(front);*/return NULL;
+}
+
+ViewCell *ViewCell::Merge(const ViewCell &other) const
+{
+        //-- compute set differences
+        const float minDif = 10;
+
+        RayContainer diff;
+
+        set_difference(mPiercingRays.begin(), mPiercingRays.end(), 
+                                   other.mPiercingRays.begin(), other.mPiercingRays.end(),
+                                   diff.begin());
+
+        if (diff.size() < minDif)
+        {
+                ViewCell *vc = new ViewCell();
+
+                RayContainer::const_iterator it, it_end = other.mPiercingRays.end();
+
+                for (it = other.mPiercingRays.begin(); it != it_end; ++ it)
+                        vc->mPiercingRays.push_back(*it);
+
+                while (!diff.empty())
+                {
+                        vc->mPiercingRays.push_back(diff.back());
+                        diff.pop_back();
+                }
+
+                return vc;
+        }
+
+        return NULL;
+}
+
+
 void ViewCell::AddPassingRay(const Ray &ray, const int contributions)
 {