aboutsummaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorNicholas Bottone <nick@bottone.io>2023-12-13 03:53:49 -0500
committerNicholas Bottone <nick@bottone.io>2023-12-13 03:53:49 -0500
commit8a59716630868da2b051b7c5f907c13f2324ae25 (patch)
treed44b4c8c02816c427baed0e874b8b278c11a001c /src/utils
parentb4031fbb557ff10e82e7314c6b870c32e09d70e4 (diff)
Refactor collision update function and remove unused code
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/sceneparser.cpp4
-rw-r--r--src/utils/sceneparser.h2
2 files changed, 1 insertions, 5 deletions
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<RenderShapeData> *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