From 95c899f546c984474542eae6900f2b9d3f84596f Mon Sep 17 00:00:00 2001 From: ayachi3 <1592757525@qq.com> Date: Tue, 13 Dec 2022 20:25:16 +0800 Subject: [PATCH] change sequence of model * rotation --- FinalProject/renderable.h | 6 ++---- FinalProject/sceneviewer.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/FinalProject/renderable.h b/FinalProject/renderable.h index 3e55e8f..1ae9fe3 100644 --- a/FinalProject/renderable.h +++ b/FinalProject/renderable.h @@ -43,12 +43,10 @@ inline glm::mat4 Renderable::modelMatrix() const { glm::mat4 model = glm::mat4(1.0f); model = glm::translate(model, _position); // 左乘与右乘应该是不一样的，但是这里的表现相同 - model = model * _rotation; - //model = _rotation * model; + //model = model * _rotation; + model = _rotation * model; model = glm::scale(model, _scale); return model; - - } inline glm::vec3 Renderable::get_lower_boundary()const { diff --git a/FinalProject/sceneviewer.cpp b/FinalProject/sceneviewer.cpp index ff09019..772beae 100644 --- a/FinalProject/sceneviewer.cpp +++ b/FinalProject/sceneviewer.cpp @@ -86,11 +86,11 @@ void SceneViewer::initializeGL() { Renderable renderable(backpackModel); _objects.push_back(backpackModel); - //renderable.scale(1); - //renderable.rotate(glm::vec3(1, 0, 0), 2); - //renderable.check_boundary(); - //auto t1 = renderable.get_lower_boundary(); - //auto t2 = renderable.get_upper_boundary(); + renderable.move(glm::vec3(100.0f, 0.0f, 0.0f)); + renderable.rotate(glm::vec3(0, 1, 0), 3.1415926f/2); + renderable.check_boundary(); + auto t1 = renderable.get_lower_boundary(); + auto t2 = renderable.get_upper_boundary(); _camera.setPosition(glm::vec3(0.0f, 15.0f, 8.0f)); _camera.setYaw(-90.0f);