From 68cbbbafe4e2b317899122cabbb5f7af4adc3c95 Mon Sep 17 00:00:00 2001 From: ayachi3 <1592757525@qq.com> Date: Tue, 13 Dec 2022 15:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=85=E5=9B=B4=E7=9B=92?= =?UTF-8?q?=E7=9A=84=E4=B8=A4=E4=B8=AA=E9=A1=B6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FinalProject/model.h | 8 +++++++- FinalProject/sceneviewer.cpp | 9 ++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/FinalProject/model.h b/FinalProject/model.h index 2e319d2..ef26663 100644 --- a/FinalProject/model.h +++ b/FinalProject/model.h @@ -8,7 +8,7 @@ #include "mesh.h" #include "shader.h" - +#include class Model { public: enum MODELSTATUS { LOADING, LOADED, ERR }; @@ -19,6 +19,12 @@ private: std::string _directory; MODELSTATUS _status = LOADING; + // largest point + glm::vec3 right_up_front = glm::vec3(3e37f, 3e37f, 3e37f); + // smallest point + glm::vec3 left_down_back = -right_up_front; + + public: Model(std::string path); ~Model(); diff --git a/FinalProject/sceneviewer.cpp b/FinalProject/sceneviewer.cpp index 37851c0..30fe06b 100644 --- a/FinalProject/sceneviewer.cpp +++ b/FinalProject/sceneviewer.cpp @@ -81,14 +81,17 @@ void SceneViewer::initializeGL() { vertexShader.dispose(); fragmentShader.dispose(); - Model* backpackModel = new Model("E:\\Repositories\\CollegeProjects\\CGAssignments\\FinalProject\\Models\\backpack\\backpack.obj"); + Model* backpackModel = new Model("D:/code/ComputerGraphic/SceneEditor/obj/nanosuit/nanosuit.obj"); Logger::info("Model loaded"); Renderable renderable(backpackModel); _objects.push_back(backpackModel); - _camera.setPosition(glm::vec3(0.0f, 0.0f, 3.0f)); + _camera.setPosition(glm::vec3(0.0f, 15.0f, 8.0f)); _camera.setYaw(-90.0f); - _camera.setPitch(0.0f); + _camera.setPitch(-30.0f); + + + } void SceneViewer::resizeGL(int w, int h) {