Merge branch 'main' of https://github.com/NicholasBottone/the-all-americans-in-cs1230

grinds and merge:

1 files changed, 4 insertions, 3 deletions

diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp
index 181b995..d9d467d 100644
--- a/src/raytracer/raytracer.cpp
+++ b/src/raytracer/raytracer.cpp
@@ -91,9 +91,10 @@ glm::vec4 RayTracer::getPixelFromRay(
     float minDist = FINF;
     // shoot a ray at each shape
     for (const RenderShapeData &shape : scene.getShapes()) {
-        glm::vec4 pObject = Vec4Ops::inverseTransformPoint4(pWorld, shape.inverseCTM, shape.translation4d);
-        glm::vec4 dObject = glm::normalize(Vec4Ops::transformDir4(dWorld, shape.inverseCTM));
-        std::cout << "pObject: " << pObject.w << std::endl;
+        glm::vec4 pObject = Vec4Ops::inverseTransformPoint4(pWorld, shape.inverseCTM, shape.inverseTranslation4d);
+        glm::vec4 dObject = glm::normalize(Vec4Ops::inverseTransformDir4(dWorld, shape.inverseCTM));
+//        std::cout << "pObject: " << pObject.x << ", " << pObject.y << ", " << pObject.z << ", " << pObject.w << std::endl;
+//        std::cout << "dObject: " << dObject.x << ", " << dObject.y << ", " << dObject.z << ", " << dObject.w << std::endl;
         bool isHit = false;
         glm::vec4 newIntersectionObj = findIntersection(pObject, dObject, shape, isHit);
         if (!isHit) // no hit