diff options
| author | sotech117 <michael_foiani@brown.edu> | 2023-12-13 00:20:37 -0500 |
|---|---|---|
| committer | sotech117 <michael_foiani@brown.edu> | 2023-12-13 00:20:41 -0500 |
| commit | ab87941ad346b0e09b7855ad834379f425538455 (patch) | |
| tree | 0f23bdbe37a759733914a256e620582191db1e83 | |
| parent | 9d468499ad472e7c7dd32c5774fc685938101a4d (diff) | |
testing slice
| -rw-r--r-- | cmake-build-debug/Testing/Temporary/LastTest.log | 4 | ||||
| -rw-r--r-- | src/accelerate/myqtconcurrent.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 7a04019..0611dd2 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Dec 13 00:12 EST +Start testing: Dec 13 00:15 EST ---------------------------------------------------------- -End testing: Dec 13 00:12 EST +End testing: Dec 13 00:15 EST diff --git a/src/accelerate/myqtconcurrent.cpp b/src/accelerate/myqtconcurrent.cpp index de83f8a..9f51cdd 100644 --- a/src/accelerate/myqtconcurrent.cpp +++ b/src/accelerate/myqtconcurrent.cpp @@ -3,6 +3,7 @@ #include <QtConcurrent> #include "../raytracer/raytracer.h" #include "../vec4ops/vec4ops.h" +#include "settings.h" struct pixelRoutineArgs { glm::vec4 pCamera; @@ -69,6 +70,8 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) QtConcurrent::blockingMap(l, pixelRoutine); // get the slice relating to z == 0 and set it into int the iamge data array + + // int currentSlice = settings.w + 100.f * (5.f / 2.f); int currentSlice = 0; int ptr = currentSlice * scene.width() * scene.height(); for (int i = 0; i < scene.width() * scene.height(); i++) { |