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) {