From a8a13165d1ec3bbcaff17fd5544090ca6c5f5218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=B1=EC=83=81=EC=88=98?= <shirostic@ajou.ac.kr> Date: Sun, 15 Dec 2019 03:56:58 +0900 Subject: [PATCH] modify camera setting. --- LearnOpenGL/OpenGLWrapper.cpp | 6 +++--- LearnOpenGL/OpenGLWrapper.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LearnOpenGL/OpenGLWrapper.cpp b/LearnOpenGL/OpenGLWrapper.cpp index aa25f8e..55a8c42 100644 --- a/LearnOpenGL/OpenGLWrapper.cpp +++ b/LearnOpenGL/OpenGLWrapper.cpp @@ -125,15 +125,15 @@ void RenderObject::render(Camera &camera) glUseProgram(0); } -void RenderObject::projective_render(Camera &camera) +void RenderObject::projective_render(Camera &camera, Camera &projector) { glm::mat4 bias = { 0.5f, 0.0f, 0.0f, 0.5f, 0.0f, 0.5f, 0.0f, 0.5f, 0.0f, 0.0f, 0.5f, 0.5f, 0.0f, 0.0f, 0.0f, 1.0f }; - glm::mat4 projector_view = glm::lookAt(camera.transform.get_translate(), camera.transform.get_translate() + camera.transform.get_front(), camera.transform.get_up()); - glm::mat4 projector_projection = glm::perspective(glm::radians(camera.Zoom), 1.0f, 0.1f, 100.0f); + glm::mat4 projector_view = glm::lookAt(projector.transform.get_translate(), projector.transform.get_translate() + projector.transform.get_front(), projector.transform.get_up()); + glm::mat4 projector_projection = glm::perspective(glm::radians(projector.Zoom), 1.0f, 0.1f, 100.0f); auto prog = material->get_program(); glUseProgram(prog); diff --git a/LearnOpenGL/OpenGLWrapper.h b/LearnOpenGL/OpenGLWrapper.h index 15f591d..7d7b07c 100644 --- a/LearnOpenGL/OpenGLWrapper.h +++ b/LearnOpenGL/OpenGLWrapper.h @@ -69,7 +69,7 @@ public: void set_material(Material *_material); void render(Camera &camera); - void projective_render(Camera &camera); + void projective_render(Camera &camera, Camera &projector); }; RenderObject *make_render_object(Mesh *mesh); -- GitLab