diff options
author | sotech117 <michael_foiani@brown.edu> | 2023-12-13 01:30:52 -0500 |
---|---|---|
committer | sotech117 <michael_foiani@brown.edu> | 2023-12-13 01:30:52 -0500 |
commit | 07776876eb4638a224fd332944ce9ddca1f5a592 (patch) | |
tree | 1fbe79ac2b7dfc70d5963c7b9928e2f09910c00e | |
parent | c6f2be2fed772f300c0cdfe59a4a8a2733d15574 (diff) |
hardcode the camera depth to where a result is shown
-rw-r--r-- | .idea/QtSettings.xml | 2 | ||||
-rw-r--r-- | cmake-build-release/.ninja_deps | bin | 174976 -> 265104 bytes | |||
-rw-r--r-- | cmake-build-release/.ninja_log | 116 | ||||
-rw-r--r-- | cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt | 124 | ||||
-rw-r--r-- | cmake-build-release/Testing/Temporary/LastTest.log | 4 | ||||
-rwxr-xr-x | cmake-build-release/projects_ray | bin | 350537 -> 350681 bytes | |||
-rw-r--r-- | scenefiles-4d/unit_sphere.json | 2 | ||||
-rw-r--r-- | src/accelerate/myqtconcurrent.cpp | 32 | ||||
-rw-r--r-- | src/illuminate/illuminate.cpp | 1 | ||||
-rw-r--r-- | src/intersect/intersect.cpp | 2 | ||||
-rw-r--r-- | src/vec4ops/vec4ops.cpp | 2 |
11 files changed, 182 insertions, 103 deletions
diff --git a/.idea/QtSettings.xml b/.idea/QtSettings.xml index faa7b06..dd42746 100644 --- a/.idea/QtSettings.xml +++ b/.idea/QtSettings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="QtSettings"> - <option name="myCurrentProfile" value="Debug" /> + <option name="myCurrentProfile" value="Release" /> <option name="mySettingsPerProfile"> <map> <entry key="Debug"> diff --git a/cmake-build-release/.ninja_deps b/cmake-build-release/.ninja_deps Binary files differindex f9af373..b282309 100644 --- a/cmake-build-release/.ninja_deps +++ b/cmake-build-release/.ninja_deps diff --git a/cmake-build-release/.ninja_log b/cmake-build-release/.ninja_log index 0f5dc5a..05a15b7 100644 --- a/cmake-build-release/.ninja_log +++ b/cmake-build-release/.ninja_log @@ -1,31 +1,101 @@ # ninja log v5 -0 434 1702446593224993460 projects_ray_autogen/timestamp 55fca76aac650d2f -0 434 1702446593224993460 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -0 434 1702446593224993460 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -0 434 1702446593224993460 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +154 260 1702447781315410879 projects_ray 45fbfe11691b47a4 +39 1392 1702447466513612837 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1991 2750 1702446595544090623 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214 +1839 2530 1702446595324513579 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7 +675 2432 1702446595224556920 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 5dbf3687fca6fb +1692 2383 1702446595176643525 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3 +1278 2008 1702446594802049344 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640 +1759 2452 1702446595244689767 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352 +6 36 1702447781092833495 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +41 777 1702447518128546572 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 +43 702 1702447733820987971 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda +38 1198 1702447670100699535 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1 +2008 2351 1702446595146034010 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2 +757 1692 1702446594485292649 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386 435 675 1702446593470170245 CMakeFiles/projects_ray.dir/src/settings.cpp.o af593dd8c38f8a51 436 757 1702446593552201990 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0 +2351 3149 1702446595943941675 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8 +40 153 1702447781208318596 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 7e5d8f712f75efb4 +434 1369 1702446594162602358 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba +1494 2174 1702446594966067875 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37 437 1140 1702446593933045264 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6 +434 1494 1702446594287021479 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c 434 1237 1702446594030720700 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1 +2383 3031 1702446595825027072 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e +6 36 1702447781092833495 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f 437 1278 1702446594071361222 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07 -434 1369 1702446594162602358 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba -434 1494 1702446594287021479 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c -757 1692 1702446594485292649 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386 -437 1759 1702446594550766213 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1 -1140 1839 1702446594633094121 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda -1237 1991 1702446594784223220 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 -1278 2008 1702446594802049344 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640 1369 2042 1702446594835637032 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062 -1494 2174 1702446594966067875 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37 -2008 2351 1702446595146034010 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2 -1692 2383 1702446595176643525 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3 -675 2432 1702446595224556920 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 5dbf3687fca6fb -1759 2452 1702446595244689767 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352 -1839 2530 1702446595324513579 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7 -2432 2557 1702446595352904495 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 7e5d8f712f75efb4 -1991 2750 1702446595544090623 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214 +6 36 1702447781092833495 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f 2174 2962 1702446595756054008 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b -2383 3031 1702446595825027072 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e -2351 3149 1702446595943941675 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8 -2042 3432 1702446596225388493 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc -3432 3539 1702446596334814499 projects_ray 45fbfe11691b47a4 +6 36 1702447781092833495 projects_ray_autogen/timestamp 55fca76aac650d2f +7 36 1702447876162640983 projects_ray_autogen/timestamp 55fca76aac650d2f +7 36 1702447876162640983 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 36 1702447876162640983 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 36 1702447876162640983 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +40 161 1702447876286034325 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 7e5d8f712f75efb4 +39 370 1702447876494799413 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2 +370 483 1702447876607801960 projects_ray 45fbfe11691b47a4 +7 36 1702447916659752703 projects_ray_autogen/timestamp 55fca76aac650d2f +7 36 1702447916659752703 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 36 1702447916659752703 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 36 1702447916659752703 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +39 748 1702447917368247128 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda +748 858 1702447917479893607 projects_ray 45fbfe11691b47a4 +7 35 1702448001491012178 projects_ray_autogen/timestamp 55fca76aac650d2f +7 35 1702448001491012178 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 35 1702448001491012178 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 35 1702448001491012178 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +39 733 1702448002185128979 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda +39 755 1702448002207572799 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 +39 1214 1702448002665166546 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1 +1214 1320 1702448002774601344 projects_ray 45fbfe11691b47a4 +7 35 1702448120988874182 projects_ray_autogen/timestamp 55fca76aac650d2f +7 35 1702448120988874182 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 35 1702448120988874182 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 35 1702448120988874182 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +39 708 1702448121658543104 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 +708 815 1702448121767005954 projects_ray 45fbfe11691b47a4 +6 34 1702448235479913482 projects_ray_autogen/timestamp 55fca76aac650d2f +6 34 1702448235479913482 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +6 34 1702448235479913482 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +6 34 1702448235479913482 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +38 759 1702448236200489389 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 +38 1419 1702448236859769517 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1419 1530 1702448236974515960 projects_ray 45fbfe11691b47a4 +7 36 1702448417410612702 projects_ray_autogen/timestamp 55fca76aac650d2f +7 36 1702448417410612702 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 36 1702448417410612702 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 36 1702448417410612702 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +39 1382 1702448418751854474 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1382 1489 1702448418861828677 projects_ray 45fbfe11691b47a4 +7 34 1702448478936101300 projects_ray_autogen/timestamp 55fca76aac650d2f +7 34 1702448478936101300 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 34 1702448478936101300 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 34 1702448478936101300 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +38 1368 1702448480265570567 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1368 1476 1702448480376740774 projects_ray 45fbfe11691b47a4 +7 35 1702448673408163296 projects_ray_autogen/timestamp 55fca76aac650d2f +7 35 1702448673408163296 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 35 1702448673408163296 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 35 1702448673408163296 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +39 1377 1702448674744974068 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1377 1484 1702448674855052237 projects_ray 45fbfe11691b47a4 +7 36 1702448731330339182 projects_ray_autogen/timestamp 55fca76aac650d2f +7 36 1702448731330339182 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 36 1702448731330339182 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 36 1702448731330339182 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +39 1383 1702448732673030331 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1383 1487 1702448732780397288 projects_ray 45fbfe11691b47a4 +6 35 1702448805865948465 projects_ray_autogen/timestamp 55fca76aac650d2f +6 35 1702448805865948465 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +6 35 1702448805865948465 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +6 35 1702448805865948465 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +39 1360 1702448807186145761 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1360 1469 1702448807298618522 projects_ray 45fbfe11691b47a4 +7 34 1702448878474139565 projects_ray_autogen/timestamp 55fca76aac650d2f +7 34 1702448878474139565 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 34 1702448878474139565 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 34 1702448878474139565 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +38 1337 1702448879772065006 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1337 1444 1702448879882062135 projects_ray 45fbfe11691b47a4 diff --git a/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt index 0f02456..0e68cf3 100644 --- a/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -1,23 +1,10 @@ # Generated by CMake. Changes will be overwritten. -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/texture/texture.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/main.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h + mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/moc_predefs.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/Availability.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/AvailabilityInternal.h @@ -470,7 +457,6 @@ mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h - mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h @@ -521,7 +507,6 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qiterator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qline.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlist.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlocale.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlogging.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmalloc.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmap.h @@ -542,7 +527,6 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qprocessordetection.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrect.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrefcount.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qregularexpression.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopedpointer.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopeguard.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qset.h @@ -615,55 +599,21 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtransform.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qvalidator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qwindowdefs.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/QOpenGLWidget mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QBoxLayout - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QCheckBox - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QDoubleSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QLabel - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QPushButton - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSlider - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractbutton.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractslider.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractspinbox.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qboxlayout.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qcheckbox.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qframe.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qgridlayout.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlabel.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayout.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayoutitem.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qpushbutton.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qslider.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qspinbox.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/filter.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp mmc:Q_OBJECT mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp @@ -1115,10 +1065,20 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h + mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/moc_predefs.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/Availability.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/AvailabilityInternal.h @@ -1571,6 +1531,7 @@ mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h + mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h @@ -1621,6 +1582,7 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qiterator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qline.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlist.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlocale.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlogging.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmalloc.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmap.h @@ -1641,6 +1603,7 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qprocessordetection.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrect.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrefcount.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qregularexpression.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopedpointer.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopeguard.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qset.h @@ -1713,20 +1676,57 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtransform.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qvalidator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qwindowdefs.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/QOpenGLWidget mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QBoxLayout + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QCheckBox + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QDoubleSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QLabel + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QPushButton + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSlider + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractbutton.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractslider.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractspinbox.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qboxlayout.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qcheckbox.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qframe.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qgridlayout.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlabel.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayout.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayoutitem.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qpushbutton.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qslider.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qspinbox.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/main.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/texture/texture.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/filter.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log index 5382781..0500d4b 100644 --- a/cmake-build-release/Testing/Temporary/LastTest.log +++ b/cmake-build-release/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Dec 13 00:50 EST +Start testing: Dec 13 01:29 EST ---------------------------------------------------------- -End testing: Dec 13 00:50 EST +End testing: Dec 13 01:29 EST diff --git a/cmake-build-release/projects_ray b/cmake-build-release/projects_ray Binary files differindex 3b6f9da..bb364be 100755 --- a/cmake-build-release/projects_ray +++ b/cmake-build-release/projects_ray diff --git a/scenefiles-4d/unit_sphere.json b/scenefiles-4d/unit_sphere.json index f4a7546..5099526 100644 --- a/scenefiles-4d/unit_sphere.json +++ b/scenefiles-4d/unit_sphere.json @@ -21,7 +21,7 @@ { "type": "directional", "color": [1.0, 1.0, 1.0], - "direction": [-3.0, -2.0, -1.0, 0.0] + "direction": [-3.0, -2.0, -1.0, -2.0] } ] }, diff --git a/src/accelerate/myqtconcurrent.cpp b/src/accelerate/myqtconcurrent.cpp index 259fba3..12e9138 100644 --- a/src/accelerate/myqtconcurrent.cpp +++ b/src/accelerate/myqtconcurrent.cpp @@ -1,6 +1,7 @@ #include <QList> #include <QtConcurrent> +#include <iostream> #include "../raytracer/raytracer.h" #include "../vec4ops/vec4ops.h" #include "settings.h" @@ -48,21 +49,29 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) // compute the ray float x = (imageCol - scene.width()/2.f) * viewplaneWidth / scene.width(); float y = (imageRow - scene.height()/2.f) * viewplaneHeight / scene.height(); - float z = (imageDepth - scene.width()/2.f) * viewplaneDepth / scene.width(); + float z = (imageDepth - scene.depth()/2.f) * viewplaneDepth / scene.depth(); glm::vec4 pWorld = Vec4Ops::transformPoint4(glm::vec4(0.f), camera.getViewMatrix(), camera.getTranslationVector()); glm::vec4 dWorld = Vec4Ops::transformDir4(glm::vec4(x, y, z, -1.0), camera.getViewMatrix()); // get the pixel color glm::vec4 pixelColor = getPixelFromRay(pWorld, dWorld, scene, 0); + if (pixelColor.r > 0) { + std::cout << "pixelColor.r: " << pixelColor.r << ", x" << imageCol << ", y" << imageRow << ", z" << imageDepth << std::endl; + } + // set the pixel color - int index = imageRow * scene.width() + imageCol; - imageData[index] = RGBA{ - (std::uint8_t) (pixelColor.r * 255.f), - (std::uint8_t) (pixelColor.g * 255.f), - (std::uint8_t) (pixelColor.b * 255.f), - (std::uint8_t) (pixelColor.a * 255.f) - }; + if (imageDepth == 250) + { + int index = imageRow * scene.width() + imageCol; + imageData[index] = RGBA{ + (std::uint8_t) (pixelColor.r * 255.f), + (std::uint8_t) (pixelColor.g * 255.f), + (std::uint8_t) (pixelColor.b * 255.f), + (std::uint8_t) (pixelColor.a * 255.f) + }; + } + } } } @@ -72,11 +81,8 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) // 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++) { - imageData[i] = pixels[ptr + i]; - } + + std::cout << " here " << std::endl; if (m_enableAntiAliasing) { diff --git a/src/illuminate/illuminate.cpp b/src/illuminate/illuminate.cpp index a093fd1..39ecccb 100644 --- a/src/illuminate/illuminate.cpp +++ b/src/illuminate/illuminate.cpp @@ -1,3 +1,4 @@ +#include <iostream> #include "raytracer/raytracer.h" glm::vec4 RayTracer::illuminationFromPointLight( 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 diff --git a/src/vec4ops/vec4ops.cpp b/src/vec4ops/vec4ops.cpp index cf0900a..3ef939a 100644 --- a/src/vec4ops/vec4ops.cpp +++ b/src/vec4ops/vec4ops.cpp @@ -37,7 +37,7 @@ glm::mat4 Vec4Ops::getViewMatrix4( glm::vec4 upVector, glm::vec4 overVector) { // start with the e3 basis vector, the normalized look vector - glm::vec4 e3 = glm::normalize(-lookVector); + glm::vec4 e3 = glm::normalize(lookVector); // calculate e0 basis vector, from the combinatory cross of up and over with e3 glm::vec4 e0 = cross4(upVector, overVector, e3); |