josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

working on Intersect::intersect()

Browse Source 
git-svn-id: svn://anubis/fart/trunk@151 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-02-24 02:17:22 +00:00
parent 7d64dd745d
commit 2e6c62a032
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shapes/Intersect.cc
View File

@ -9,9 +9,12 @@ Intersect::Intersect(refptr<Shape> shape1, refptr<Shape> shape2)
Shape::IntersectionList Intersect::intersect(refptr<Shape> _this, const Ray & ray) Shape::IntersectionList Intersect::intersect(refptr<Shape> _this, const Ray & ray)
{ {
IntersectionList res;
IntersectionList res1 = m_shape1->intersect(m_shape1, ray); IntersectionList res1 = m_shape1->intersect(m_shape1, ray);
IntersectionList res2 = m_shape2->intersect(m_shape2, 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 */ /* TODO: finish */