aboutsummaryrefslogtreecommitdiff
path: root/src/utils/sceneparser.cpp
diff options
context:
space:
mode:
authorNicholas Bottone <nick@bottone.io>2023-12-08 14:54:46 -0500
committerNicholas Bottone <nick@bottone.io>2023-12-08 14:54:46 -0500
commitf5b9e57575cd0ab35fc3d5658e86fede76cca46b (patch)
tree7b521bab9adcfedf1dea5877d15d9864c03fd268 /src/utils/sceneparser.cpp
parent298a7f8e68ae0aa1cbe6729c6f5f4ddb6d5b5650 (diff)
Refactor scale4 function to modify the currentCTM matrix
Diffstat (limited to 'src/utils/sceneparser.cpp')
-rw-r--r--src/utils/sceneparser.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/utils/sceneparser.cpp b/src/utils/sceneparser.cpp
index 2fa1953..6d668ff 100644
--- a/src/utils/sceneparser.cpp
+++ b/src/utils/sceneparser.cpp
@@ -43,7 +43,7 @@ void initTree(SceneNode* currentNode, std::vector<RenderShapeData> *shapes, std:
SceneParser::translate4(currentTranslation4d, t->translate);
break;
case TransformationType::TRANSFORMATION_SCALE:
- SceneParser::scale4(currentTranslation4d, t->scale);
+ SceneParser::scale4(currentCTM, t->scale);
break;
case TransformationType::TRANSFORMATION_ROTATE:
currentCTM *= SceneParser::getRotationMatrix4(t->angle, t->rotate3, t->rotateW);
@@ -176,11 +176,11 @@ void SceneParser::translate4(
}
void SceneParser::scale4(
- glm::vec4 &v1,
- glm::vec4 v2
+ glm::mat4 &m,
+ glm::vec4 v
) {
- v1.x *= v2.x;
- v1.y *= v2.y;
- v1.z *= v2.z;
- v1.w *= v2.w;
+ m[0][0] *= v.x;
+ m[1][1] *= v.y;
+ m[2][2] *= v.z;
+ m[3][3] *= v.w;
} \ No newline at end of file