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

merged /branches/2009-02-23_Shape_IntersectList_Update into trunk

Browse Source 
git-svn-id: svn://anubis/fart/trunk@146 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-02-23 20:37:57 +00:00
commit 5f18370846
12 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/Scene.cc
View File

@ -171,15 +171,17 @@ vector<Scene::ShapeDistance> Scene::getRayHits(const Ray & ray)
it != m_shapes.end();
it++)
{
Shape::IntersectList intersections = (*it)->intersect(ray);
Shape::IntersectionList intersections = (*it)->intersect(*it, ray);
for (int i = 0, num_results = intersections.size();
i < num_results;
i++)
{
Vector normal = (*it)->getNormalAt(intersections[i]);
refptr<Shape> shape = intersections[i].first;
const Vector & isect_point = intersections[i].second;
Vector normal = shape->getNormalAt(isect_point);
double dot = normal % ray.getDirection();
double intersect_dist = (intersections[i] - ray.getOrigin()).mag();
double intersect_dist = (isect_point - ray.getOrigin()).mag();
if (dot < 0.0) /* cull back faces */
{
double transparency = (*it)->getTransparency();
@ -190,7 +192,7 @@ vector<Scene::ShapeDistance> Scene::getRayHits(const Ray & ray)
}
if (minSolidDist == 0.0 || minSolidDist >= intersect_dist)
{
hits.push_back(ShapeDistance(*it, intersect_dist));
hits.push_back(ShapeDistance(shape, intersect_dist));
}
}
}

10
shapes/Box.cc
View File

@ -15,11 +15,11 @@ Box::Box(refptr<Vector> size)
m_size[2] = fabs(m_size[2]) / 2.0;
}
Shape::IntersectList Box::intersect(const Ray & ray)
Shape::IntersectionList Box::intersect(refptr<Shape> _this, const Ray & ray)
{
Ray ray_inv = m_inverse.transform_ray(ray);
IntersectList res;
IntersectionList res;
/*
* Ray equation: R = R0 + tRd
* x = R0x + tRdx
@ -45,7 +45,11 @@ Shape::IntersectList Box::intersect(const Ray & ray)
&& (dim == 1 || fabs(isect_point[1]) <= m_size[1])
&& (dim == 2 || fabs(isect_point[2]) <= m_size[2]) )
{
res.push_back(m_transform.transform_point(isect_point));
res.push_back(
Intersection(_this,
m_transform.transform_point(
isect_point))
);
}
}
}

2
shapes/Box.h
View File

@ -8,7 +8,7 @@ class Box : public Shape
{
public:
Box(refptr<Vector> size);
IntersectList intersect(const Ray & ray);
IntersectionList intersect(refptr<Shape> _this, const Ray & ray);
Vector getNormalAt(const Vector & pt);
protected:

19
shapes/Cyl.cc
View File

@ -19,10 +19,10 @@ Cyl::Cyl(double bottom_radius, double top_radius, double height)
m_slope = (m_top_radius - m_bottom_radius) / m_height; /* rise over run */
}
Shape::IntersectList Cyl::intersect(const Ray & ray)
Shape::IntersectionList Cyl::intersect(refptr<Shape> _this, const Ray & ray)
{
Ray ray_inv = m_inverse.transform_ray(ray);
IntersectList res;
IntersectionList res;
/* First intersect with the bottom plane, if it has positive area */
if (m_bottom_radius > 0.0)
@ -36,7 +36,10 @@ Shape::IntersectList Cyl::intersect(const Ray & ray)
if (isect_point[0]*isect_point[0] + isect_point[1]*isect_point[1]
< m_bottom_radius_2)
{
res.push_back(m_transform.transform_point(isect_point));
res.push_back(
Intersection(_this,
m_transform.transform_point(isect_point))
);
}
}
}
@ -53,7 +56,10 @@ Shape::IntersectList Cyl::intersect(const Ray & ray)
if (isect_point[0]*isect_point[0] + isect_point[1]*isect_point[1]
< m_top_radius_2)
{
res.push_back(m_transform.transform_point(isect_point));
res.push_back(
Intersection(_this,
m_transform.transform_point(isect_point))
);
}
}
}
@ -97,7 +103,10 @@ Shape::IntersectList Cyl::intersect(const Ray & ray)
Vector isect_point = ray_inv[solutions.results[i]];
if (isect_point[2] >= 0.0 && isect_point[2] <= m_height)
{
res.push_back(m_transform.transform_point(isect_point));
res.push_back(
Intersection(_this,
m_transform.transform_point(isect_point))
);
}
}
}

2
shapes/Cyl.h
View File

@ -8,7 +8,7 @@ class Cyl : public Shape
{
public:
Cyl(double bottom_radius, double top_radius, double height);
IntersectList intersect(const Ray & ray);
IntersectionList intersect(refptr<Shape> _this, const Ray & ray);
Vector getNormalAt(const Vector & pt);
protected:

9
shapes/Intersect.cc
View File

@ -7,12 +7,13 @@ Intersect::Intersect(refptr<Shape> shape1, refptr<Shape> shape2)
m_shape2 = shape2;
}
Shape::IntersectList Intersect::intersect(const Ray & ray)
Shape::IntersectionList Intersect::intersect(refptr<Shape> _this, const Ray & ray)
{
IntersectList res;
IntersectList res1 = m_shape1->intersect(ray);
IntersectList res2 = m_shape2->intersect(ray);
IntersectionList res;
IntersectionList res1 = m_shape1->intersect(m_shape1, ray);
IntersectionList res2 = m_shape2->intersect(m_shape2, ray);
/* TODO: finish */
return res;
}

2
shapes/Intersect.h
View File

@ -8,7 +8,7 @@ class Intersect : public Shape
{
public:
Intersect(refptr<Shape> shape1, refptr<Shape> shape2);
IntersectList intersect(const Ray & ray);
IntersectionList intersect(refptr<Shape> _this, const Ray & ray);
Vector getNormalAt(const Vector & pt);
protected:

9
shapes/Plane.cc
View File

@ -13,11 +13,11 @@ Plane::Plane(double a, double b, double c, double d)
m_d = d;
}
Shape::IntersectList Plane::intersect(const Ray & ray)
Shape::IntersectionList Plane::intersect(refptr<Shape> _this, const Ray & ray)
{
Ray ray_inv = m_inverse.transform_ray(ray);
IntersectList res;
IntersectionList res;
/*
* Plane equation: ax + by + cz + d = 0
* Ray equation: R = R0 + tRd
@ -38,7 +38,10 @@ Shape::IntersectList Plane::intersect(const Ray & ray)
Solver::Result solutions = solver.solve();
if (solutions.numResults > 0)
{
res.push_back(m_transform.transform_point(ray_inv[solutions.results[0]]));
Vector isect_point = ray_inv[solutions.results[0]];
res.push_back(
Intersection(_this, m_transform.transform_point(isect_point))
);
}
return res;
}

2
shapes/Plane.h
View File

@ -8,7 +8,7 @@ class Plane : public Shape
{
public:
Plane(double a, double b, double c, double d);
IntersectList intersect(const Ray & ray);
IntersectionList intersect(refptr<Shape> _this, const Ray & ray);
Vector getNormalAt(const Vector & pt);
protected:

7
shapes/Shape.h
View File

@ -9,15 +9,18 @@
#include "util/Material.h"
#include "util/refptr.h"
#include <vector>
#include <utility>
class Shape
{
public:
typedef std::vector<Vector> IntersectList;
typedef std::pair< refptr<Shape> , Vector > Intersection;
typedef std::vector< Intersection > IntersectionList;
Shape();
virtual ~Shape();
virtual IntersectList intersect(const Ray & ray) = 0;
virtual IntersectionList intersect(refptr<Shape> _this,
const Ray & ray) = 0;
virtual Vector getNormalAt(const Vector & pt) = 0;
void setTransform(Transform & t)

10
shapes/Sphere.cc
View File

@ -11,11 +11,11 @@ Sphere::Sphere(double radius)
m_radius2 = radius * radius;
}
Shape::IntersectList Sphere::intersect(const Ray & ray)
Shape::IntersectionList Sphere::intersect(refptr<Shape> _this, const Ray & ray)
{
Ray ray_inv = m_inverse.transform_ray(ray);
IntersectList res;
IntersectionList res;
QuadraticSolver solver(1.0,
2 * ( ray_inv.getOrigin()[0] * ray_inv.getDirection()[0]
+ ray_inv.getOrigin()[1] * ray_inv.getDirection()[1]
@ -29,8 +29,10 @@ Shape::IntersectList Sphere::intersect(const Ray & ray)
{
if (quadSolutions.results[i] >= 0.0)
{
res.push_back(m_transform.transform_point(
ray_inv[quadSolutions.results[i]]));
Vector isect_point = ray_inv[quadSolutions.results[i]];
res.push_back(
Intersection(_this, m_transform.transform_point(isect_point))
);
}
}
return res;

2
shapes/Sphere.h
View File

@ -8,7 +8,7 @@ class Sphere : public Shape
{
public:
Sphere(double radius);
IntersectList intersect(const Ray & ray);
IntersectionList intersect(refptr<Shape> _this, const Ray & ray);
Vector getNormalAt(const Vector & pt);
protected: