X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcamera.cpp;h=eeb4dcecaffa7ab9363f716f7f31ea2e4d430461;hb=bea14b67ae4e5705965f3cc6422410a25f38ef9e;hp=fbf10bca2e1391a9f88522c0ba5ab9fe040475f1;hpb=3baab6cca7423d55ea08288d96570b02380b1fe9;p=blank.git diff --git a/src/camera.cpp b/src/camera.cpp index fbf10bc..eeb4dce 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -7,18 +7,11 @@ namespace blank { Camera::Camera() -: FPSController() -, fov(45.0f) +: fov(45.0f) , aspect(1.0f) , near_clip(0.1f) -, far_clip(100.0f) -, projection(glm::perspective(fov, aspect, near_clip, far_clip)) -, view(glm::inverse(Transform())) -, vp(projection) { - -} - -Camera::~Camera() { +, far_clip(256.0f) +, projection(glm::perspective(fov, aspect, near_clip, far_clip)) { } @@ -53,12 +46,6 @@ void Camera::Clip(float near, float far) { } -void Camera::Update(int dt) { - FPSController::Update(dt); - view = glm::inverse(Transform()); - vp = projection * view; -} - void Camera::UpdateProjection() { projection = glm::perspective(fov, aspect, near_clip, far_clip); }