godzil/dorayme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shape is now an abstract class and can't be instanciated.

Browse Source 
Change derived shape to only deal with local calculation they don't need anymore to deal with how they've been transformed.
This commit is contained in:
Godzil
2020-02-21 00:02:30 +00:00
parent 2a8fe61388
commit 66c1582a5f
8 changed files with 140 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/shapes/sphere.cpp
View File

@@ -13,17 +13,15 @@
#include <tuple.h>
#include <intersect.h>
Intersect Sphere::intersect(Ray r)
Intersect Sphere::localIntersect(Ray r)
{
Intersect ret;
double a, b, c, discriminant;
Ray transRay = this->invTransform(r);
Tuple sphere_to_ray = r.origin - Point(0, 0, 0);
Tuple sphere_to_ray = transRay.origin - Point(0, 0, 0);
a = transRay.direction.dot(transRay.direction);
b = 2 * transRay.direction.dot(sphere_to_ray);
a = r.direction.dot(r.direction);
b = 2 * r.direction.dot(sphere_to_ray);
c = sphere_to_ray.dot(sphere_to_ray) - 1;
discriminant = b * b - 4 * a * c;
@@ -37,14 +35,7 @@ Intersect Sphere::intersect(Ray r)
return ret;
}
Tuple Sphere::normalAt(Tuple point)
Tuple Sphere::localNormalAt(Tuple point)
{
Tuple object_point = this->inverseTransform * point;
Tuple object_normal = (object_point - Point(0, 0, 0)).normalise();
Tuple world_normal = this->inverseTransform.transpose() * object_normal;
/* W may get wrong, so hack it. This is perfectly normal as we are using a 4x4 matrix instead of a 3x3 */
world_normal.w = 0;
return world_normal.normalise();
return (point - Point(0, 0, 0)).normalise();
}