From 37eeb71306b11d8980482443b173d6c44030c1e9 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Tue, 12 Dec 2023 22:30:22 -0500 Subject: fix merge --- src/accelerate/myqtconcurrent.cpp | 3 +-- src/vec4ops/vec4ops.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/accelerate/myqtconcurrent.cpp b/src/accelerate/myqtconcurrent.cpp index 7bfc879..211317b 100644 --- a/src/accelerate/myqtconcurrent.cpp +++ b/src/accelerate/myqtconcurrent.cpp @@ -50,8 +50,7 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) float camera4dDepth = 1; glm::vec4 pWorld = Vec4Ops::transformPoint4(glm::vec4(0.f), camera.getViewMatrix(), camera.getTranslationVector()); - glm::vec4 dWorld = Vec4Ops::transformDir4(glm::vec4(x, y, z, cameraDepth), camera.getViewMatrix()); - + glm::vec4 dWorld = Vec4Ops::inverseTransformDir4(glm::vec4(x, y, z, cameraDepth), camera.getViewMatrix()); // get the pixel color glm::vec4 pixelColor = getPixelFromRay(pWorld, dWorld, scene, 0); diff --git a/src/vec4ops/vec4ops.h b/src/vec4ops/vec4ops.h index f48dcff..a21bcc9 100644 --- a/src/vec4ops/vec4ops.h +++ b/src/vec4ops/vec4ops.h @@ -35,7 +35,7 @@ public: static glm::vec4 transformDir4(glm::vec4 dir4, glm::mat4 transformDirectionMatrix); - glm::vec4 inverseTransformDir4(glm::vec4 dir4, glm::mat4 inverseTransformDirectionMatrix); + static glm::vec4 inverseTransformDir4(glm::vec4 dir4, glm::mat4 inverseTransformDirectionMatrix); }; #endif //PROJECTS_RAY_VEC4OPS_H -- cgit v1.2.3-70-g09d2