From 8a59716630868da2b051b7c5f907c13f2324ae25 Mon Sep 17 00:00:00 2001 From: Nicholas Bottone Date: Wed, 13 Dec 2023 03:53:49 -0500 Subject: Refactor collision update function and remove unused code --- src/utils/sceneparser.cpp | 4 +--- src/utils/sceneparser.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/utils') diff --git a/src/utils/sceneparser.cpp b/src/utils/sceneparser.cpp index bc39109..0e258c1 100644 --- a/src/utils/sceneparser.cpp +++ b/src/utils/sceneparser.cpp @@ -94,9 +94,7 @@ void initTree(SceneNode* currentNode, std::vector *shapes, std: .translation4d = currentTranslation4d, .inverseCTM = glm::inverse(currentCTM), .inverseTranslation4d = -currentTranslation4d, - // .position = glm::vec4(0.f, 0.f, 0.f, 1.f), - // .velocity = glm::vec4(0.f, 0.f, 0.f, 0.f), - // .mass = unitMass, + .velocity = primitive->velocity, }; shapes->push_back(rsd); // } diff --git a/src/utils/sceneparser.h b/src/utils/sceneparser.h index 3ab93a8..96803c9 100644 --- a/src/utils/sceneparser.h +++ b/src/utils/sceneparser.h @@ -12,9 +12,7 @@ struct RenderShapeData { 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 position; glm::vec4 velocity; - float mass; }; // Struct which contains all the data needed to render a scene -- cgit v1.2.3-70-g09d2