From db04a46510dcc56bfbd424fd6a7e93a4706dbf64 Mon Sep 17 00:00:00 2001
From: Linloir <3145078758@qq.com>
Date: Sun, 18 Dec 2022 16:49:37 +0800
Subject: [PATCH] [CORE][CHG] Adapt to camera API change

---
 FinalProject/modelthumbnailwidget.cpp | 2 +-
 FinalProject/sceneviewer.cpp          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FinalProject/modelthumbnailwidget.cpp b/FinalProject/modelthumbnailwidget.cpp
index b6e1fcf..992eb05 100644
--- a/FinalProject/modelthumbnailwidget.cpp
+++ b/FinalProject/modelthumbnailwidget.cpp
@@ -61,7 +61,7 @@ void ModelThumbnailWidget::paintGL() {
     _shaderProgram.bind();
     
     glm::mat4 view = _camera.viewMatrix();
-    glm::mat4 projection = glm::perspective(glm::radians(_camera.zoomVal()), (float)width() / (float)height(), 0.1f, 100.0f);
+    glm::mat4 projection = _camera.projectionMatrix((float)width() / (float)height());
     _shaderProgram.setUniform("view", view);
     _shaderProgram.setUniform("projection", projection);
     
diff --git a/FinalProject/sceneviewer.cpp b/FinalProject/sceneviewer.cpp
index 09b555e..120f99e 100644
--- a/FinalProject/sceneviewer.cpp
+++ b/FinalProject/sceneviewer.cpp
@@ -120,7 +120,7 @@ void SceneViewer::paintGL() {
 
     // Set view and projection matrices
     glm::mat4 view = _camera.viewMatrix();
-    glm::mat4 projection = glm::perspective(glm::radians(_camera.zoomVal()), (float)width() / (float)height(), 0.1f, 100.0f);
+    glm::mat4 projection = _camera.projectionMatrix((float)width() / (float)height());
     _shaderProgram.setUniform("view", view);
     _shaderProgram.setUniform("projection", projection);
     _shaderProgram.setUniform("viewPos", _camera.position());