diff options
author | David Doan <daviddoan@Davids-MacBook-Pro-100.local> | 2023-12-08 16:21:23 -0500 |
---|---|---|
committer | David Doan <daviddoan@Davids-MacBook-Pro-100.local> | 2023-12-08 16:21:23 -0500 |
commit | 0388edf148a1441416d74a5683af05aadd18aad0 (patch) | |
tree | c92bf25186da78bb57912c70f7c7fbcfb42fefab | |
parent | 7fff3eb8df3eb102398aa238e19cc5c48365021f (diff) |
camera stuff
-rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps | bin | 411580 -> 495996 bytes | |||
-rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log | 122 | ||||
-rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt | 8 | ||||
-rw-r--r-- | src/camera/camera.cpp | 4 | ||||
-rw-r--r-- | src/camera/camera.h | 4 | ||||
-rw-r--r-- | src/vec4ops/vec4ops.cpp | 2 |
6 files changed, 46 insertions, 94 deletions
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps Binary files differindex 098090a..57d6bbf 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log index 85e6a1c..275c304 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log @@ -1,89 +1,41 @@ # ninja log v5 -13139 20771 1702064215142352333 CMakeFiles/projects_ray.dir/src/4dvecops/rotations4d.cpp.o a68b058b2b31494b -11351 19827 1702064214182143434 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd -13416 20864 1702064215236466339 CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o 6a8e798858a50a50 -1385 12282 1702065018051013538 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -1442 11711 1702064206073226525 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 -7050 16376 1702064210716439678 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 -1383 11333 1702065017096708648 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 -1440 13139 1702064207501605829 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de -11429 23179 1702064217554857434 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc -1441 13416 1702064207777518454 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd -1384 4596 1702065010366160912 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e -30 182 1702065125431868588 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -1384 5716 1702065011489561055 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 -200 4587 1702065129825887435 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -11711 20888 1702064215260999702 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 -1442 11477 1702064205822037256 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 -11347 20513 1702064214881458314 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 -1445 11162 1702064205526863123 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 -1444 11429 1702064205724148746 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 -11163 19641 1702064214010669497 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed -30 182 1702065125431868588 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -30 182 1702065125431868588 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -1443 11347 1702064205653231118 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 -4588 5081 1702065130309939471 projects_ray 865bd59e3d066978 -12396 20432 1702064214795082010 CMakeFiles/projects_ray.dir/src/4dvecops/vec4operations.cpp.o 8a1f44fde5c5e5a2 -10520 16652 1702059274174301834 CMakeFiles/projects_ray.dir/src/4dvecops/vectoroperations.cpp.o 1982a459020cef63 -11477 20654 1702064215019432764 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 -30 182 1702065125431868588 projects_ray_autogen/timestamp 596afd61accb21ff -1442 11351 1702064205668214082 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b -2 397 1702065900279518077 build.ninja d13bedc3f8269e08 -1441 20042 1702064214394169043 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 4d14ff80692ac6b3 -1383 9240 1702065015009041355 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -29 1944 1702069100451926691 projects_ray_autogen/timestamp 596afd61accb21ff -29 1944 1702069100451926691 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -29 1944 1702069100451926691 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -29 1944 1702069100451926691 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -1954 10434 1702069108948568142 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 -1948 10610 1702069109113518686 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b -1950 10704 1702069109142586186 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 -1952 10707 1702069109215397589 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 -1949 10713 1702069109225165550 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 -1948 10880 1702069109392295049 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 -1944 11467 1702069109980807896 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -1946 12289 1702069110797672686 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de -1945 12976 1702069111484407134 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -1945 14599 1702069113110069310 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 +189 2314 1702069278992181344 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 176379e1dc38d565 +2089 13241 1702070338881135510 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a 1946 16434 1702069114953926356 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 4d14ff80692ac6b3 -28 165 1702069276854594485 projects_ray_autogen/timestamp 596afd61accb21ff -28 165 1702069276854594485 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -28 165 1702069276854594485 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -28 165 1702069276854594485 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +2 397 1702065900279518077 build.ninja d13bedc3f8269e08 +2101 12126 1702070337753055794 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b +44 2089 1702070327703327000 projects_ray_autogen/timestamp 596afd61accb21ff +11864 19662 1702070345303654830 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 +12174 19074 1702070344717287185 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e +10520 16652 1702059274174301834 CMakeFiles/projects_ray.dir/src/4dvecops/vectoroperations.cpp.o 1982a459020cef63 +12396 20432 1702064214795082010 CMakeFiles/projects_ray.dir/src/4dvecops/vec4operations.cpp.o 8a1f44fde5c5e5a2 +4588 5081 1702065130309939471 projects_ray 865bd59e3d066978 +2116 12174 1702070337811074798 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 +44 2089 1702070327703327000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +44 2089 1702070327703327000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +2134 11860 1702070337498423441 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed +2120 12122 1702070337760261970 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 +2125 11864 1702070337501117946 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 +7741 17608 1702070343250659187 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 +2111 12197 1702070337830834101 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 191 2112 1702069278793333995 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 9cafd52c1d615711 -189 2314 1702069278992181344 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 176379e1dc38d565 -182 8391 1702069285029239443 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 -182 8467 1702069285123505150 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed -183 8608 1702069285277208029 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd -183 9423 1702069286082037763 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 -186 9543 1702069286206405688 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 -187 9646 1702069286315911769 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 -184 13123 1702069289793018958 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc -31 1948 1702069360545745000 projects_ray_autogen/timestamp 596afd61accb21ff -31 1948 1702069360545745000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -31 1948 1702069360545745000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -31 1948 1702069360545745000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -1950 6393 1702069365015782260 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 -1978 10149 1702069368766713563 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 -1975 10198 1702069368814762535 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 -1955 10341 1702069368958262764 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b -1959 10462 1702069369057523904 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 -1964 10484 1702069369085929356 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 -1966 10616 1702069369232878584 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 -1957 10776 1702069369392485202 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 -1948 11339 1702069369941386682 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -1952 12296 1702069370912325415 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de +12123 19912 1702070345558452802 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 +2093 14883 1702070340494289225 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +2094 7741 1702070333385195616 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 +44 2089 1702070327703327000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +1384 4596 1702065010366160912 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e 1953 12354 1702069370966741736 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd -1949 12846 1702069371460161623 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -6393 14018 1702069372637521024 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed -1949 14223 1702069372836438985 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 -10199 15862 1702069374479248497 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd -10616 15939 1702069374559606393 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e -10149 16243 1702069374864486624 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 -10462 16366 1702069374990562645 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 -10484 16416 1702069375038618989 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 -10341 18625 1702069377245754462 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc -27 137 1702069427984175634 projects_ray_autogen/timestamp 596afd61accb21ff -27 137 1702069427984175634 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -27 137 1702069427984175634 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -27 137 1702069427984175634 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +11860 22788 1702070348439358582 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc +2099 14052 1702070339690166505 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de +2091 16924 1702070342559045288 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 +2106 12448 1702070338075988717 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 +2130 11741 1702070337379904954 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 +1385 12282 1702065018051013538 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +13416 20864 1702064215236466339 CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o 6a8e798858a50a50 +11741 19027 1702070344672002756 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd +13139 20771 1702064215142352333 CMakeFiles/projects_ray.dir/src/4dvecops/rotations4d.cpp.o a68b058b2b31494b +26 149 1702070384514276358 projects_ray_autogen/timestamp 596afd61accb21ff +26 149 1702070384514276358 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +26 149 1702070384514276358 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +26 149 1702070384514276358 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +160 2132 1702070386484079773 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 176379e1dc38d565 diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt index 9d59622..944ae5e 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -2,14 +2,14 @@ /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/camera/camera.cpp +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.h /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.h -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/mainwindow.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/camera/camera.h -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.h -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/mainwindow.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/scenedata.h +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/scenedata.h /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/rgba.h /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp index 4cc9e56..4c19663 100644 --- a/src/camera/camera.cpp +++ b/src/camera/camera.cpp @@ -26,11 +26,11 @@ glm::mat4 Camera::getInverseViewMatrix() const { return m_inverseViewMatrix; } -glm::vec3 Camera::getTranslationVector() const { +glm::vec4 Camera::getTranslationVector() const { return m_translationVector; } -glm::vec3 Camera::getInverseTranslationVector() const { +glm::vec4 Camera::getInverseTranslationVector() const { return m_inverseTranslationVector; } diff --git a/src/camera/camera.h b/src/camera/camera.h index 5059655..00a6733 100644 --- a/src/camera/camera.h +++ b/src/camera/camera.h @@ -16,8 +16,8 @@ public: // You might also want to define another function that return the inverse of the view matrix. glm::mat4 getViewMatrix() const; glm::mat4 getInverseViewMatrix() const; - glm::vec3 getTranslationVector() const; - glm::vec3 getInverseTranslationVector() const; + glm::vec4 getTranslationVector() const; + glm::vec4 getInverseTranslationVector() const; // Returns the aspect ratio of the camera. float getAspectRatio() const; diff --git a/src/vec4ops/vec4ops.cpp b/src/vec4ops/vec4ops.cpp index 458bc1f..70c018b 100644 --- a/src/vec4ops/vec4ops.cpp +++ b/src/vec4ops/vec4ops.cpp @@ -39,7 +39,7 @@ glm::mat4 Vec4Ops::getViewMatrix4( // rotation matrices for each plane glm::mat4 rotMatrixXY = getRotationMatrix4XY(glm::radians(settings.xy)); - glm::mat4 rotMatrixXZ = getRotationMatrix4XZ(glm::radians(settings.xz)); + glm::mat4 rotMatrixXZ = getRotationMatrix4ZX(glm::radians(settings.xz)); glm::mat4 rotMatrixYZ = getRotationMatrix4YZ(glm::radians(settings.yz)); glm::mat4 rotMatrixXW = getRotationMatrix4XW(glm::radians(settings.xw)); glm::mat4 rotMatrixYW = getRotationMatrix4YW(glm::radians(settings.yw)); |