diff options
author | David Doan <daviddoan@Davids-MacBook-Pro-100.local> | 2023-12-08 16:21:29 -0500 |
---|---|---|
committer | David Doan <daviddoan@Davids-MacBook-Pro-100.local> | 2023-12-08 16:21:29 -0500 |
commit | 63f9136276ace08b0d069bf35a3fac49bf3f52cf (patch) | |
tree | 92dbc9dba68694bb6aa14dfb4db217ef02f56aaa | |
parent | 0388edf148a1441416d74a5683af05aadd18aad0 (diff) | |
parent | 0c0202860767947090dfef315176a94847e829a5 (diff) |
Merge branch 'main' of https://github.com/NicholasBottone/the-all-americans-in-cs1230
merge
-rw-r--r-- | src/raytracer/raytracer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp index 40fd1a4..8bcf6ba 100644 --- a/src/raytracer/raytracer.cpp +++ b/src/raytracer/raytracer.cpp @@ -25,6 +25,10 @@ RayTracer::RayTracer(QWidget *parent) : QWidget(parent) { // updated to use 4D void RayTracer::render(RGBA *imageData, const RayTraceScene &scene) { + if (m_enableParallelism) { + renderParallel(imageData, scene); + } + // naive rendering Camera camera = scene.getCamera(); float cameraDepth = 1.f; |