X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcamera.cpp;h=21df87414cee2ce382a3e2014efb94187c602240;hb=ea1ce7b0fb7709ae56977480821ac96a231a0686;hp=8309fe6414965b2a67d7c560f7c30e3d34227db6;hpb=d18be10ef3f0a7b61c6f5c4c4096ca2b776c75b3;p=blank.git diff --git a/src/camera.cpp b/src/camera.cpp index 8309fe6..21df874 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -11,11 +11,9 @@ Camera::Camera() , aspect(1.0f) , near_clip(0.1f) , far_clip(100.0f) -, position(0, 0, 0) -, target(0, 0, -1) -, up(0, 1, 0) +, model() , projection(glm::perspective(fov, aspect, near_clip, far_clip)) -, view(glm::lookAt(position, target, up)) +, view(model.Transform()) , vp(projection * view) { } @@ -61,7 +59,7 @@ void Camera::UpdateProjection() { } void Camera::UpdateView() { - view = glm::lookAt(position, target, up); + view = glm::inverse(model.Transform()); vp = projection * view; }