diff --git a/example/Vulkan/Geometry3D.cpp b/example/Vulkan/Geometry3D.cpp index cd32b3de..57a098c3 100644 --- a/example/Vulkan/Geometry3D.cpp +++ b/example/Vulkan/Geometry3D.cpp @@ -49,13 +49,8 @@ private: void InitCamera() { camera.type=CameraType::Perspective; - camera.center.Set(0,0,0); - camera.eye.Set(100,100,100); - camera.up_vector.Set(0,0,1); - camera.forward_vector.Set(0,1,0); - camera.znear=4; - camera.zfar=1000; - camera.fov=90; + camera.center.Set(0,0,0,1); + camera.eye.Set(100,100,100,1); camera.width=SCREEN_WIDTH; camera.height=SCREEN_HEIGHT; diff --git a/example/Vulkan/LoadModel.cpp b/example/Vulkan/LoadModel.cpp index 92c63976..3ec063f1 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=1280; -constexpr uint32_t SCREEN_HEIGHT=960; +constexpr uint32_t SCREEN_WIDTH=128; +constexpr uint32_t SCREEN_HEIGHT=128; vulkan::Renderable *CreateMeshRenderable(SceneDB *db,vulkan::Material *mtl,const MeshData *mesh) { @@ -119,18 +119,13 @@ private: math::vec center_point=model_data->bounding_box.CenterPoint(); math::vec max_point=model_data->bounding_box.maxPoint; - max_point.x*=3.0f; + max_point.x*=2.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.up_vector.Set(0,0,1); - camera.forward_vector.Set(0,1,0); - camera.znear=4; - camera.zfar=1000; - camera.fov=90; + camera.center=center_point; + camera.eye=max_point; camera.width=SCREEN_WIDTH; camera.height=SCREEN_HEIGHT; diff --git a/example/Vulkan/VulkanAppFramework.h b/example/Vulkan/VulkanAppFramework.h index f244a314..e0ae24cd 100644 --- a/example/Vulkan/VulkanAppFramework.h +++ b/example/Vulkan/VulkanAppFramework.h @@ -21,7 +21,7 @@ using namespace hgl::graph; class VulkanApplicationFramework { -private: +private: Window * win =nullptr; vulkan::Instance * inst =nullptr; diff --git a/inc/hgl/graph/Camera.h b/inc/hgl/graph/Camera.h index 5db23283..ef993c95 100644 --- a/inc/hgl/graph/Camera.h +++ b/inc/hgl/graph/Camera.h @@ -22,14 +22,14 @@ namespace hgl float width; ///<视图宽 float height; ///<视图高 - float fov; ///<水平FOV - float znear,zfar; ///