aboutsummaryrefslogtreecommitdiff
path: root/src/4dvecops/transform4d.cpp
diff options
context:
space:
mode:
authorsotech117 <michael_foiani@brown.edu>2023-12-08 14:37:27 -0500
committersotech117 <michael_foiani@brown.edu>2023-12-08 14:37:27 -0500
commit9ac7858c1b569ef5bbbb673c5a6438baf96b3e92 (patch)
tree7bb6a9508710cacf4838038f6f15502e1cd8e0c3 /src/4dvecops/transform4d.cpp
parent3a3c06b9bcb6d98bd774d1fdb894a4aa63fc948a (diff)
cleanup vec4 transform ops
Diffstat (limited to 'src/4dvecops/transform4d.cpp')
-rw-r--r--src/4dvecops/transform4d.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/4dvecops/transform4d.cpp b/src/4dvecops/transform4d.cpp
index 91f0d8c..5cc51f3 100644
--- a/src/4dvecops/transform4d.cpp
+++ b/src/4dvecops/transform4d.cpp
@@ -1,12 +1,18 @@
-#include "raytracer/raytracer.h"
+#include "vec4ops.h"
// this is used to transform a 4d point by a 4d matrix and its associated translation
// this is motivated by the fact that glm does not support 5d matrices, so we cannot define a mat5 to encapsulate both the rotation and translation in one matrix
// therefore, we break the 5d transformation into a 4d rotation and a 4d translation
-glm::vec4 transformPoint4(glm::vec4 point4, glm::mat4 transformDirectionMatrix, glm::vec4 translationPointVector) {
- // do the translation first
- point4 -= translationPointVector;
- // do the rotation and scaling
+glm::vec4 Vec4Ops::transformPoint4(glm::vec4 point4, glm::mat4 transformDirectionMatrix, glm::vec4 translationPointVector) {
+ // do the translation then direction
point4 = transformDirectionMatrix * point4;
+ point4 += translationPointVector;
+ return point4;
+}
+
+glm::vec4 Vec4Ops::inverseTransformPoint4(glm::vec4 point4, glm::mat4 inverseTransformDirectionMatrix, glm::vec4 inverseTranslationPointVector) {
+ // do the direction then translation
+ point4 += inverseTranslationPointVector;
+ point4 = inverseTranslationPointVector * point4;
return point4;
} \ No newline at end of file