From cca69c10b9aa868f76da257d8ad2a5edf9424e89 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Wed, 21 Oct 2020 12:52:32 +0800 Subject: [PATCH] layout codes. --- example/Vulkan/OffscreenRender.cpp | 6 +++--- example/common/VulkanAppFramework.h | 24 ++++++++++++------------ inc/hgl/graph/VKDevice.h | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/example/Vulkan/OffscreenRender.cpp b/example/Vulkan/OffscreenRender.cpp index d51c8965..4af8c8ce 100644 --- a/example/Vulkan/OffscreenRender.cpp +++ b/example/Vulkan/OffscreenRender.cpp @@ -16,7 +16,7 @@ class TestApp:public CameraAppFramework Camera cam; MaterialInstance * material_instance =nullptr; - GPUBuffer * ubo_world_matrix =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; }; struct:public RenderObject @@ -34,8 +34,8 @@ class TestApp:public CameraAppFramework Pipeline * pipeline =nullptr; RenderableInstance *renderable_instance =nullptr; - SceneNode scene_root; - RenderList render_list; + SceneNode scene_root; + RenderList render_list; }cube; public: diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index 6aa13f48..8f13b405 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -46,22 +46,22 @@ protected: protected: - GPUDevice * device =nullptr; + GPUDevice * device =nullptr; SwapchainRenderTarget * sc_render_target =nullptr; protected: - int32_t swap_chain_count =0; + int32_t swap_chain_count =0; - GPUCmdBuffer ** cmd_buf =nullptr; + GPUCmdBuffer ** cmd_buf =nullptr; - Color4f clear_color; + Color4f clear_color; protected: - RenderResource * db =nullptr; + RenderResource * db =nullptr; - bool key_status[kbRangeSize]; + bool key_status[kbRangeSize]; public: @@ -88,7 +88,7 @@ public: InitNativeWindowSystem(); - VK_NAMESPACE::InitVulkanProperties(); + InitVulkanProperties(); win=CreateRenderWindow(OS_TEXT("VulkanTest")); if(!win) @@ -98,7 +98,7 @@ public: return(false); { - VK_NAMESPACE::CreateInstanceLayerInfo cili; + CreateInstanceLayerInfo cili; hgl_zero(cili); @@ -332,14 +332,14 @@ class CameraAppFramework:public VulkanApplicationFramework { private: - GPUBuffer * ubo_world_matrix =nullptr; + GPUBuffer * ubo_world_matrix =nullptr; protected: - ControlCamera camera; - float move_speed=1; + ControlCamera camera; + float move_speed=1; - Vector2f mouse_last_pos; + Vector2f mouse_last_pos; public: diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h index f9f8d79a..b93a81b6 100644 --- a/inc/hgl/graph/VKDevice.h +++ b/inc/hgl/graph/VKDevice.h @@ -52,7 +52,7 @@ public: virtual ~GPUDevice(); operator VkDevice () {return attr->device;} - GPUDeviceAttribute *GetGPUDeviceAttribute () {return attr;} + GPUDeviceAttribute *GetDeviceAttribute () {return attr;} VkSurfaceKHR GetSurface () {return attr->surface;} VkDevice GetDevice ()const {return attr->device;} @@ -91,8 +91,8 @@ private: //Buffer相关 public: //Buffer相关 - GPUBuffer * CreateBuffer(VkBufferUsageFlags buf_usage,VkDeviceSize size,const void *data, SharingMode sharing_mode=SharingMode::Exclusive); - GPUBuffer * CreateBuffer(VkBufferUsageFlags buf_usage,VkDeviceSize size, SharingMode sharing_mode=SharingMode::Exclusive){return CreateBuffer(buf_usage,size,nullptr,sharing_mode);} + GPUBuffer * CreateBuffer(VkBufferUsageFlags buf_usage,VkDeviceSize size,const void *data, SharingMode sharing_mode=SharingMode::Exclusive); + GPUBuffer * CreateBuffer(VkBufferUsageFlags buf_usage,VkDeviceSize size, SharingMode sharing_mode=SharingMode::Exclusive){return CreateBuffer(buf_usage,size,nullptr,sharing_mode);} VAB * CreateVAB (VkFormat format,uint32_t count,const void *data, SharingMode sharing_mode=SharingMode::Exclusive); VAB * CreateVAB (VkFormat format,uint32_t count, SharingMode sharing_mode=SharingMode::Exclusive){return CreateVAB(format,count,nullptr,sharing_mode);}