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

Merge branch 'master' of git.cg.cs.tu-bs.de:CG1_WS2223/group_12

Browse source
This commit is contained in:
Maximilian Giller 2022-11-17 17:43:14 +01:00
commit e20d852d53
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
primitive/sphere.cpp
View file

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

2
primitive/triangle.cpp
View file

@ -101,7 +101,7 @@ bool Triangle::intersect(Ray &ray) const {
return false; return false;
// Calculate the normal // Calculate the normal
// IMPLEMENT ME ray.normal = crossProduct(edge1, edge1);
// Calculate the surface position // Calculate the surface position
ray.surface = u * this->surface[1] + v * this->surface[2] + (1 - u - v) * this->surface[0]; ray.surface = u * this->surface[1] + v * this->surface[2] + (1 - u - v) * this->surface[0];