diff options
| author | David Doan <daviddoan@Davids-MacBook-Pro-193.local> | 2023-12-13 01:31:00 -0500 |
|---|---|---|
| committer | David Doan <daviddoan@Davids-MacBook-Pro-193.local> | 2023-12-13 01:31:00 -0500 |
| commit | 086dff023dc8a13d5e3a8867a845d6244409c8ef (patch) | |
| tree | 38fb8b60f69dc307e7c61f06817d3821f5a6a9a7 /src/intersect/intersect.cpp | |
| parent | e5e01a62cd12a338b66c0a33775e91854a305ec4 (diff) | |
| parent | 07776876eb4638a224fd332944ce9ddca1f5a592 (diff) | |
Merge branch 'main' of https://github.com/NicholasBottone/the-all-americans-in-cs1230
grinds and merge:
Diffstat (limited to 'src/intersect/intersect.cpp')
| -rw-r--r-- | src/intersect/intersect.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/intersect/intersect.cpp b/src/intersect/intersect.cpp index 353508e..69512e3 100644 --- a/src/intersect/intersect.cpp +++ b/src/intersect/intersect.cpp @@ -1,3 +1,4 @@ +#include <iostream> #include "raytracer/raytracer.h" /** @@ -28,6 +29,7 @@ glm::vec4 intersectCircle( return glm::vec4(0.f); } + float t1 = (-b - std::sqrt(discriminant)) / (2.f*a); float t2 = (-b + std::sqrt(discriminant)) / (2.f*a); if (t1 <= 0 && t2 <= 0) // both behind camera |