From 2511dedf8c137c93f302a4c7216a333597ad4157 Mon Sep 17 00:00:00 2001 From: Linloir <3145078758@qq.com> Date: Tue, 13 Dec 2022 20:47:01 +0800 Subject: [PATCH] Fix Camera - Update rotate methods - Fix view matrix function --- FinalProject/camera.h | 3 +-- FinalProject/sceneviewer.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/FinalProject/camera.h b/FinalProject/camera.h index 3bb9ed5..e1b0ee5 100644 --- a/FinalProject/camera.h +++ b/FinalProject/camera.h @@ -142,6 +142,5 @@ inline void Camera::push(float distance) { } inline glm::mat4 Camera::viewMatrix() { - float temp = glm::sqrt(_position.x * _position.x + _position.y * _position.y + _position.z * _position.z); - return glm::lookAt(-_front*temp, glm::vec3(0.0f), _up); + return glm::lookAt(_position, _position + _front, _up); } diff --git a/FinalProject/sceneviewer.cpp b/FinalProject/sceneviewer.cpp index aa6bfef..2ddb15f 100644 --- a/FinalProject/sceneviewer.cpp +++ b/FinalProject/sceneviewer.cpp @@ -65,7 +65,7 @@ void SceneViewer::initializeGL() { vertexShader.dispose(); fragmentShader.dispose(); - Model* backpackModel = new Model("D:\\ProgrammingFile\\SceneEditor\\Models\\backpack\\backpack.obj"); + Model* backpackModel = new Model("E:\\Repositories\\CollegeProjects\\CGAssignments\\FinalProject\\Models\\backpack\\backpack.obj"); Logger::info("Model loaded"); Renderable backpack(backpackModel); _objects.push_back(backpack);