camera movement

2 files changed, 1 insertions, 13 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/accelerate/myqtconcurrent.cpp b/src/accelerate/myqtconcurrent.cpp
index 08248f4..4d0cb1e 100644
--- a/src/accelerate/myqtconcurrent.cpp
+++ b/src/accelerate/myqtconcurrent.cpp
@@ -52,7 +52,7 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene)
             float z = (imageDepth - scene.depth()/2.f) * viewplaneDepth / scene.depth();
 
             glm::vec4 pWorld = Vec4Ops::transformPoint4(glm::vec4(0.f), camera.getViewMatrix(), camera.getTranslationVector());
-            glm::vec4 dWorld = Vec4Ops::transformDir4(glm::vec4(x, y, z, -1.0), camera.getViewMatrix());
+            glm::vec4 dWorld = glm::normalize(Vec4Ops::transformDir4(glm::vec4(x, y, z, -1.0), camera.getViewMatrix()));
 
              pixelRoutineArgs args{
                      pWorld,