From 2e6c62a032b7d7a5698b6c79f26cfd00c3b3ee2d Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Tue, 24 Feb 2009 02:17:22 +0000
Subject: [PATCH] working on Intersect::intersect()

git-svn-id: svn://anubis/fart/trunk@151 7f9b0f55-74a9-4bce-be96-3c2cd072584d
---
 shapes/Intersect.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/shapes/Intersect.cc b/shapes/Intersect.cc
index 667e2cf..cce50ab 100644
--- a/shapes/Intersect.cc
+++ b/shapes/Intersect.cc
@@ -9,9 +9,12 @@ Intersect::Intersect(refptr<Shape> shape1, refptr<Shape> shape2)
 
 Shape::IntersectionList Intersect::intersect(refptr<Shape> _this, const Ray & ray)
 {
-    IntersectionList res;
     IntersectionList res1 = m_shape1->intersect(m_shape1, ray);
     IntersectionList res2 = m_shape2->intersect(m_shape2, ray);
+    IntersectionList merged = res1.merge(res2, ray.getOrigin());
+
+    IntersectionList res;
+    bool in1 = false, in2 = false;
 
     /* TODO: finish */