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

fixed bug in shapes/Plane which would return negative results, fixed bug in main/Scene which would not check for shape to be non-null after calling getRayClosestHit()

Browse Source 
git-svn-id: svn://anubis/fart/trunk@161 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-02-28 17:07:30 +00:00
parent c78e5941c8
commit 9ef826df43
4 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
main/Scene-load.cc
View File

@ -10,25 +10,26 @@ using namespace std;
void Scene::load(const char * filename)
{
refptr<Node> node = parse(filename);
processNode(node);
/* TODO: parse file somehow */
refptr<Shape> plane = new Plane(0, 0, 1, -2);
m_shapes.push_back(plane);
// refptr<Node> node = parse(filename);
// processNode(node);
refptr<Shape> shape = new Plane(0, 0, 1, 2);
shape->setTransform(m_transform);
m_shapes.push_back(shape);
m_transform.translate(1.0, 5.0, 0.5);
refptr<Material> m = new Material();
m->setDiffuseColor(Color::red);
m->setAmbientColor(Color::red);
refptr<Shape> shape = new Sphere(1.0);
m_transform.translate(1.0, 5.0, 0.5);
shape = new Sphere(1.0);
shape->setTransform(m_transform);
shape->setMaterial(m);
m_shapes.push_back(shape);
m_transform.translate(-1.0, -5.0, -0.5);
m_transform.translate(-2, -2, -1);
m_transform.translate(-1, 3, -0.5);
refptr<Shape> shape1 = new Sphere(0.8);
shape1->setMaterial(m);
shape1->setTransform(m_transform);
@ -41,66 +42,64 @@ void Scene::load(const char * filename)
shape2->setTransform(m_transform);
shape = new Intersect(shape1, shape2);
m_shapes.push_back(shape);
m_transform.rotate(-20, 0, 1, 0);
m_transform.translate(2, 2, 1);
m_transform.translate(1, -3, 0.5);
m_transform.translate(1.5, 3.2, -0.7);
m_transform.rotate(15, 0, 0, 1);
m = new Material();
m->setDiffuseColor(Color::magenta);
m->setAmbientColor(Color::magenta);
m_transform.translate(2.5, 1, -1.5);
shape1 = new Box(new Vector(1, 1, 1));
shape1->setMaterial(m);
shape1->setTransform(m_transform);
m = new Material();
m->setDiffuseColor(Color::yellow);
m->setAmbientColor(Color::yellow);
shape2 = new Sphere(0.6);
m_transform.translate(-0.5, -0.5, 0.5);
shape2->setTransform(m_transform);
shape2->setMaterial(m);
shape = new Subtract(shape1, shape2);
m_shapes.push_back(shape);
m_transform.rotate(-15, 0, 0, 1);
m_transform.translate(-1.0, -2.7, 0.2);
m_transform.translate(-2.0, 0.5, 1.0);
m_transform.translate(1, 5, -1.5);
m = new Material();
m->setDiffuseColor(Color::blue);
m->setAmbientColor(Color::blue);
shape = new Box(new Vector(1.8, 1.8, 0.5));
m_transform.translate(0, 0, -2.0);
shape->setTransform(m_transform);
shape->setMaterial(m);
m_shapes.push_back(shape);
m_transform.translate(-1, -5, 1.5);
m_transform.translate(0.2, 6.5, 1.5);
m_transform.rotate(45, 1, 0, 0);
m = new Material();
m->setDiffuseColor(Color::cyan);
m->setAmbientColor(Color::cyan);
shape = new Cyl(1.0, 0.0, 2.0);
m_transform.translate(-1.3, 2.5, 3.5);
m_transform.rotate(45, 1, 0, 0);
shape->setTransform(m_transform);
shape->setMaterial(m);
m_shapes.push_back(shape);
m_transform.rotate(-45, 1, 0, 0);
m_transform.translate(-0.2, -6.5, -1.5);
m_transform.translate(-1.5, 5.0, 2.5);
m_transform.rotate(45, 0, 0, 1);
m_transform.rotate(45, 1, 0, 0);
m = new Material();
m->setDiffuseColor(Color::yellow);
m->setAmbientColor(Color::yellow);
shape = new Box(new Vector(1, 1, 1));
m_transform.rotate(-45, 1, 0, 0);
m_transform.translate(-1.7, -0.5, -2.0);
m_transform.rotate(45, 0, 0, 1);
m_transform.rotate(45, 1, 0, 0);
shape->setTransform(m_transform);
shape->setMaterial(m);
m_shapes.push_back(shape);
m_transform.rotate(-45, 1, 0, 0);
m_transform.rotate(-45, 0, 0, 1);
m_transform.translate(1.5, -5.0, -2.5);
refptr<Light> light = new PointLight();
light->setPosition(Vector(2, -1, 2));

3
main/Scene.cc
View File

@ -147,6 +147,8 @@ Color Scene::traceRayDepth(const Ray & ray, int depth)
ShapeDistance hit = getRayClosestHit(ray);
if ( ! hit.shape.isNull() )
{
/* compute the Phong lighting for each hit */
refptr<Material> material = hit.shape->getMaterial();
@ -158,6 +160,7 @@ Color Scene::traceRayDepth(const Ray & ray, int depth)
surfacePoint,
hit.shape->getNormalAt(surfacePoint),
m_ambient_light);
}
return color;
}

3
shapes/Plane.cc
View File

@ -37,10 +37,13 @@ Shape::IntersectionList Plane::intersect(refptr<Shape> _this, const Ray & ray)
+ m_d);
Solver::Result solutions = solver.solve();
if (solutions.numResults > 0)
{
if (solutions.results[0] > 0.0)
{
Vector isect_point = ray_inv[solutions.results[0]];
res.add(Intersection(_this, m_transform.transform_point(isect_point)));
}
}
return res;
}

9
util/Solver.cc
View File

@ -16,6 +16,11 @@ Solver::~Solver()
{
}
Solver::Result::Result()
{
numResults = 0;
}
/**************************************************************************
* LinearSolver methods *
@ -120,7 +125,3 @@ Solver::Result QuarticSolver::solve()
return res;
}
Solver::Result::Result()
{
numResults = 0;
}