diff options
author | sotech117 <michael_foiani@brown.edu> | 2023-12-13 04:52:41 -0500 |
---|---|---|
committer | sotech117 <michael_foiani@brown.edu> | 2023-12-13 04:53:45 -0500 |
commit | adc6d81d78b3ae24ae16c9d233864432ec09a4cb (patch) | |
tree | 832552c0777c93860b1648e5383dd390c2a91a3e /src/utils | |
parent | f887bd83942f13efe98d0c2cd997d037ed2ef068 (diff) |
cleanup parser
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/sceneparser.cpp | 4 | ||||
-rw-r--r-- | src/utils/sceneparser.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/utils/sceneparser.cpp b/src/utils/sceneparser.cpp index c601f0b..2cad55a 100644 --- a/src/utils/sceneparser.cpp +++ b/src/utils/sceneparser.cpp @@ -65,7 +65,7 @@ void initTree(SceneNode* currentNode, std::vector<RenderShapeData> *shapes, std: } } - currentCTM *= glm::translate(glm::mat4(1.0f), glm::vec3(currentTranslation4d)); + // currentCTM *= glm::translate(glm::mat4(1.0f), glm::vec3(currentTranslation4d)); for(auto primitive : currentNode->primitives) { @@ -74,11 +74,9 @@ void initTree(SceneNode* currentNode, std::vector<RenderShapeData> *shapes, std: .ctm = currentCTM, .translation4d = currentTranslation4d, .inverseCTM = glm::inverse(currentCTM), - .inverseTranslation4d = -currentTranslation4d, .velocity = primitive->velocity, }; shapes->push_back(rsd); - // } } // add the lights diff --git a/src/utils/sceneparser.h b/src/utils/sceneparser.h index 96803c9..65b0bc8 100644 --- a/src/utils/sceneparser.h +++ b/src/utils/sceneparser.h @@ -11,7 +11,6 @@ struct RenderShapeData { glm::mat4 ctm; // the cumulative transformation matrix glm::vec4 translation4d; // appended to the right of the ctm (for 4d translation) glm::mat4 inverseCTM; - glm::vec4 inverseTranslation4d; // appended to the right of the inverse ctm (for 4d translation) glm::vec4 velocity; }; |