From 67cf0c612e85eddece4a8adfeac47253a46766d4 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 11 Jun 2019 01:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=9F=A9=E9=98=B5=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=B9=B6=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=B0=BD=E5=BF=AB=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=A4=84=E7=90=86=EF=BC=8C=E4=BB=A5=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E9=95=9C=E5=A4=B4=E6=8E=A7=E5=88=B6=E8=B0=83=E8=AF=95=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/Vulkan/AssimpLoaderMesh.cpp | 5 ----- example/Vulkan/LoadModel.cpp | 11 ++++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/example/Vulkan/AssimpLoaderMesh.cpp b/example/Vulkan/AssimpLoaderMesh.cpp index aea26026..70415ce1 100644 --- a/example/Vulkan/AssimpLoaderMesh.cpp +++ b/example/Vulkan/AssimpLoaderMesh.cpp @@ -127,11 +127,6 @@ namespace Matrix4f MatrixRotate(const aiMatrix4x4 &s) { - //return Matrix4f(s.a1,s.b1,s.c1,s.d1, - // s.a2,s.b2,s.c2,s.d2, - // s.a3,s.b3,s.c3,s.d3, - // s.a4,s.b4,s.c4,s.d4); - return Matrix4f(s.a1,s.a2,s.a3,s.a4, s.b1,s.b2,s.b3,s.b4, s.c1,s.c2,s.c3,s.c4, diff --git a/example/Vulkan/LoadModel.cpp b/example/Vulkan/LoadModel.cpp index 5a506e19..92c63976 100644 --- a/example/Vulkan/LoadModel.cpp +++ b/example/Vulkan/LoadModel.cpp @@ -14,8 +14,8 @@ using namespace hgl; using namespace hgl::graph; -constexpr uint32_t SCREEN_WIDTH=256; -constexpr uint32_t SCREEN_HEIGHT=256; +constexpr uint32_t SCREEN_WIDTH=1280; +constexpr uint32_t SCREEN_HEIGHT=960; vulkan::Renderable *CreateMeshRenderable(SceneDB *db,vulkan::Material *mtl,const MeshData *mesh) { @@ -117,14 +117,15 @@ private: void InitCamera() { math::vec center_point=model_data->bounding_box.CenterPoint(); - math::vec min_point=model_data->bounding_box.minPoint; math::vec max_point=model_data->bounding_box.maxPoint; + max_point.x*=3.0f; + max_point.y=center_point.y; + max_point.z=center_point.z; + camera.type=CameraType::Perspective; camera.center=center_point.xyz(); camera.eye=max_point.xyz(); - //camera.center.Set(0,0,0); - //camera.eye.Set(10,10,5); camera.up_vector.Set(0,0,1); camera.forward_vector.Set(0,1,0); camera.znear=4;