m.giller/cloudy-raytracer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adds normals for sphere and triangle

Browse source
This commit is contained in:
Maximilian Giller 2022-11-17 16:16:32 +01:00
parent b54fdf4f7c
commit 1531a0f2c7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
primitive/sphere.cpp
View file

@ -36,7 +36,9 @@ bool Sphere::intersect(Ray &ray) const {
return false;
// Calculate the normal
// IMPLEMENT ME
auto intersectPoint = ray.origin + ray.direction * t;
auto normalDirection = intersectPoint - this->center; // Point of intersect - origin of sphere creates a line along the normal, pointing outwards
ray.normal = normalized(normalDirection);
// Calculate the surface position and tangent vector
float const phi = std::acos(ray.normal.y);

3
primitive/triangle.cpp
View file

@ -35,7 +35,7 @@ bool Triangle::intersectArea(Ray &ray) const {
float const cosine = dotProduct(ray.direction, normal);
if (abs(cosine) < EPSILON)
if (std::abs(cosine) < EPSILON)
return false;
float const t = dotProduct(vertex[0] - ray.origin, normal) / cosine;
@ -57,6 +57,7 @@ bool Triangle::intersectArea(Ray &ray) const {
ray.surface = a * this->surface[1] + b * this->surface[2] + (1 - a - b) * this->surface[0];
// Set the new length and the current primitive
ray.normal = normal;
ray.length = t;
ray.primitive = this;