From d492e438d2b9b165e55c9a8799bbc45e5f5bd967 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Fri, 26 Oct 2018 13:34:55 -0700 Subject: [PATCH] Fixed camera a bit --- CameraController.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CameraController.cpp b/CameraController.cpp index 1d3e2ce..a03649a 100644 --- a/CameraController.cpp +++ b/CameraController.cpp @@ -133,7 +133,12 @@ void CameraController::tiltDown() void CameraController::centerCamera(Instance* selection) { CoordinateFrame frame = CoordinateFrame(g3dCamera.getCoordinateFrame().translation); - if(PartInstance* part = dynamic_cast(selection)) + if(selection == NULL) + { + lookAt(Vector3(0,0,0)); + focusPosition=Vector3(0,0,0); + } + else if(PartInstance* part = dynamic_cast(selection)) { Vector3 partPos = (part)->getPosition()/2; lookAt(partPos); @@ -142,10 +147,8 @@ void CameraController::centerCamera(Instance* selection) } else { - { - lookAt(Vector3(0,0,0)); - focusPosition=Vector3(0,0,0); - } + lookAt(Vector3(0,0,0)); + focusPosition=Vector3(0,0,0); } }