diff options
| -rw-r--r-- | src/accelerate/bvh.cpp | 12 | ||||
| -rw-r--r-- | src/utils/sceneparser.cpp | 4 | ||||
| -rw-r--r-- | src/utils/sceneparser.h | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/src/accelerate/bvh.cpp b/src/accelerate/bvh.cpp index 2949cbe..3640cf9 100644 --- a/src/accelerate/bvh.cpp +++ b/src/accelerate/bvh.cpp @@ -83,18 +83,6 @@ float intersectRegion( return tMin; } -void updateAfterCollision(RenderShapeData& objA, RenderShapeData& objB) { - glm::vec3 vA_prime = ((objA.mass - objB.mass) * objA.velocity + 2 * objB.mass * objB.velocity) / (objA.mass + objB.mass); - glm::vec3 vB_prime = ((objB.mass - objA.mass) * objB.velocity + 2 * objA.mass * objA.velocity) / (objA.mass + objB.mass); - - objA.velocity = glm::vec4(vA_prime, 0.f); - objB.velocity = glm::vec4(vB_prime, 0.f); - - objA.position += objA.velocity; - objB.position += objB.velocity; - -} - float RayTracer::traverseBVH( glm::vec4 p, glm::vec4 d, 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 |