From b409f1663e0cd1a2d7f4c034c2ad7979b9476a3e Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 13 May 2021 17:34:40 +0800 Subject: [PATCH] rename "ubo_camera_matrix" to "ubo_camera_info" --- CMPlatform | 2 +- CMSceneGraph | 2 +- example/2dVector/line.cpp | 6 +++--- example/Vulkan/DrawText.cpp | 10 +++++----- example/Vulkan/DrawTile.cpp | 10 +++++----- example/Vulkan/FragCoordTest.cpp | 12 ++++++------ example/Vulkan/Geometry2D.cpp | 6 +++--- example/Vulkan/OffscreenRender.cpp | 8 ++++---- example/Vulkan/RectanglePrimitive.cpp | 10 +++++----- example/Vulkan/first_triangle.cpp | 10 +++++----- example/Vulkan/indices_rect.cpp | 12 ++++++------ example/Vulkan/texture_rect.cpp | 10 +++++----- example/Vulkan/two_triangle.cpp | 10 +++++----- example/common/VulkanAppFramework.h | 12 ++++++------ inc/hgl/graph/VKRenderable.h | 22 +++++++++++----------- 15 files changed, 71 insertions(+), 71 deletions(-) diff --git a/CMPlatform b/CMPlatform index 83fbda28..e2f056dd 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit 83fbda2860159fb9cf5386f8e29ebf4a9dc9f9eb +Subproject commit e2f056ddff2e1adacd6431c685af9c0ed8177e06 diff --git a/CMSceneGraph b/CMSceneGraph index 8bef798f..bc5ac1a5 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 8bef798fc168a94af6ca6275820584f583c2a278 +Subproject commit bc5ac1a503cc57f42a232aaf7e59be9d7ccedbeb diff --git a/example/2dVector/line.cpp b/example/2dVector/line.cpp index 819f47d5..7ed9e56d 100644 --- a/example/2dVector/line.cpp +++ b/example/2dVector/line.cpp @@ -37,7 +37,7 @@ private: MaterialInstance * material_instance =nullptr; RenderableInstance *render_instance =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; GPUBuffer * ubo_color_material =nullptr; GPUBuffer * ubo_line_config =nullptr; @@ -88,7 +88,7 @@ private: cam.Refresh(); - ubo_camera_matrix =CreateUBO("camera", sizeof(CameraInfo), &cam.matrix); + ubo_camera_info =CreateUBO("camera", sizeof(CameraInfo), &cam.info); ubo_color_material =CreateUBO("color_material",sizeof(Vector4f), &color); ubo_line_config =CreateUBO("line2d_config", sizeof(Line2DConfig), &line_2d_config); @@ -135,7 +135,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(render_instance); } diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index 0ec7cf7e..e04f9531 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -28,7 +28,7 @@ private: Sampler * sampler =nullptr; MaterialInstance * material_instance =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; GPUBuffer * ubo_color =nullptr; Pipeline * pipeline =nullptr; @@ -65,7 +65,7 @@ private: sampler=db->CreateSampler(); material_instance->BindSampler("lum_texture",tile_font->GetTexture(),sampler); - material_instance->BindUBO("camera",ubo_camera_matrix); + material_instance->BindUBO("camera",ubo_camera_info); material_instance->BindUBO("color_material",ubo_color); material_instance->Update(); @@ -81,9 +81,9 @@ private: cam.Refresh(); - ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&cam.matrix); + ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&cam.info); - if(!ubo_camera_matrix) + if(!ubo_camera_info) return(false); color.One(); @@ -181,7 +181,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(render_instance); } diff --git a/example/Vulkan/DrawTile.cpp b/example/Vulkan/DrawTile.cpp index 066102c4..8281779c 100644 --- a/example/Vulkan/DrawTile.cpp +++ b/example/Vulkan/DrawTile.cpp @@ -42,7 +42,7 @@ private: MaterialInstance * material_instance =nullptr; Renderable * render_obj =nullptr; RenderableInstance *render_instance =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; Pipeline * pipeline =nullptr; @@ -155,7 +155,7 @@ private: sampler=db->CreateSampler(); material_instance->BindSampler("tex",tile_data->GetTexture(),sampler); - material_instance->BindUBO("camera",ubo_camera_matrix); + material_instance->BindUBO("camera",ubo_camera_info); material_instance->Update(); return(true); @@ -170,9 +170,9 @@ private: cam.Refresh(); - ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&cam.matrix); + ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&cam.info); - if(!ubo_camera_matrix) + if(!ubo_camera_info) return(false); return(true); @@ -227,7 +227,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(render_instance); } diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index 7dce7ec0..8a1d4272 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -28,7 +28,7 @@ private: MaterialInstance * material_instance =nullptr; RenderableInstance *renderable_instance =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; Pipeline * pipeline =nullptr; @@ -58,13 +58,13 @@ private: cam.Refresh(); - ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&cam.matrix); + ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&cam.info); - if(!ubo_camera_matrix) + if(!ubo_camera_info) return(false); - if(!material_instance->BindUBO("camera",ubo_camera_matrix))return(false); - if(!material_instance->BindUBO("frag_world",ubo_camera_matrix))return(false); + if(!material_instance->BindUBO("camera",ubo_camera_info))return(false); + if(!material_instance->BindUBO("frag_world",ubo_camera_info))return(false); material_instance->Update(); return(true); @@ -109,7 +109,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(renderable_instance); } diff --git a/example/Vulkan/Geometry2D.cpp b/example/Vulkan/Geometry2D.cpp index 6b00ddb1..0c568447 100644 --- a/example/Vulkan/Geometry2D.cpp +++ b/example/Vulkan/Geometry2D.cpp @@ -35,7 +35,7 @@ private: Renderable * ro_circle =nullptr; Renderable * ro_round_rectangle =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; GPUBuffer * ubo_color_material =nullptr; Pipeline * pipeline =nullptr; @@ -118,7 +118,7 @@ private: cam.Refresh(); - ubo_camera_matrix =CreateUBO("camera", sizeof(CameraInfo),&cam.matrix); + ubo_camera_info =CreateUBO("camera", sizeof(CameraInfo),&cam.info); ubo_color_material =CreateUBO("color_material",sizeof(Vector4f),&color); material_instance->Update(); @@ -164,7 +164,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(&render_list); } diff --git a/example/Vulkan/OffscreenRender.cpp b/example/Vulkan/OffscreenRender.cpp index bbdaaec3..5a39de88 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_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; }; struct:public RenderObject @@ -65,12 +65,12 @@ public: ro->cam.Refresh(); - ro->ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&ro->cam.matrix); + ro->ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&ro->cam.info); - if(!ro->ubo_camera_matrix) + if(!ro->ubo_camera_info) return(false); - ro->material_instance->BindUBO("camera",ro->ubo_camera_matrix); + ro->material_instance->BindUBO("camera",ro->ubo_camera_info); ro->material_instance->Update(); return(true); } diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index f531090a..359f1977 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -41,7 +41,7 @@ private: MaterialInstance * material_instance =nullptr; Renderable * render_obj =nullptr; RenderableInstance *render_instance =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; Pipeline * pipeline =nullptr; @@ -61,7 +61,7 @@ private: sampler=db->CreateSampler(); material_instance->BindSampler("tex",texture,sampler); - material_instance->BindUBO("camera",ubo_camera_matrix); + material_instance->BindUBO("camera",ubo_camera_info); material_instance->Update(); db->Add(texture); @@ -77,9 +77,9 @@ private: cam.Refresh(); - ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&cam.matrix); + ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&cam.info); - if(!ubo_camera_matrix) + if(!ubo_camera_info) return(false); return(true); @@ -127,7 +127,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(render_instance); } diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index 9ba0c32b..18f4f9d7 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -34,7 +34,7 @@ private: MaterialInstance * material_instance =nullptr; RenderableInstance *render_instance =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; Pipeline * pipeline =nullptr; @@ -62,12 +62,12 @@ private: cam.Refresh(); - ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&cam.matrix); + ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&cam.info); - if(!ubo_camera_matrix) + if(!ubo_camera_info) return(false); - material_instance->BindUBO("camera",ubo_camera_matrix); + material_instance->BindUBO("camera",ubo_camera_info); material_instance->Update(); return(true); } @@ -113,7 +113,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(render_instance); } diff --git a/example/Vulkan/indices_rect.cpp b/example/Vulkan/indices_rect.cpp index fe127673..dd7c27e3 100644 --- a/example/Vulkan/indices_rect.cpp +++ b/example/Vulkan/indices_rect.cpp @@ -38,7 +38,7 @@ private: MaterialInstance * material_instance =nullptr; RenderableInstance *renderable_instance =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; Pipeline * pipeline =nullptr; @@ -62,13 +62,13 @@ private: cam.Refresh(); - ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&cam.matrix); + ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&cam.info); - if(!ubo_camera_matrix) + if(!ubo_camera_info) return(false); - if(!material_instance->BindUBO("camera",ubo_camera_matrix))return(false); - if(!material_instance->BindUBO("frag_world",ubo_camera_matrix))return(false); + if(!material_instance->BindUBO("camera",ubo_camera_info))return(false); + if(!material_instance->BindUBO("frag_world",ubo_camera_info))return(false); material_instance->Update(); return(true); @@ -115,7 +115,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(renderable_instance); } diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index 30a2ef9e..0e90df3c 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -53,7 +53,7 @@ private: Sampler * sampler =nullptr; MaterialInstance * material_instance =nullptr; RenderableInstance *renderable_instance =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; Pipeline * pipeline =nullptr; private: @@ -85,12 +85,12 @@ private: cam.Refresh(); - ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&cam.matrix); + ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&cam.info); - if(!ubo_camera_matrix) + if(!ubo_camera_info) return(false); - if(!material_instance->BindUBO("camera",ubo_camera_matrix))return(false); + if(!material_instance->BindUBO("camera",ubo_camera_info))return(false); material_instance->Update(); return(true); } @@ -137,7 +137,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(renderable_instance); } diff --git a/example/Vulkan/two_triangle.cpp b/example/Vulkan/two_triangle.cpp index ddc2449f..91d610fb 100644 --- a/example/Vulkan/two_triangle.cpp +++ b/example/Vulkan/two_triangle.cpp @@ -37,7 +37,7 @@ private: MaterialInstance * material_instance =nullptr; RenderableInstance *render_instance =nullptr; - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; Pipeline * pipeline =nullptr; @@ -65,12 +65,12 @@ private: cam.Refresh(); - ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&cam.matrix); + ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&cam.info); - if(!ubo_camera_matrix) + if(!ubo_camera_info) return(false); - material_instance->BindUBO("camera",ubo_camera_matrix); + material_instance->BindUBO("camera",ubo_camera_info); material_instance->Update(); return(true); } @@ -119,7 +119,7 @@ public: cam.Refresh(); - ubo_camera_matrix->Write(&cam.matrix); + ubo_camera_info->Write(&cam.info); BuildCommandBuffer(&render_list); } diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index cd7f52e3..0d589184 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -300,12 +300,12 @@ class CameraAppFramework:public VulkanApplicationFramework { private: - GPUBuffer * ubo_camera_matrix =nullptr; + GPUBuffer * ubo_camera_info =nullptr; protected: - WalkerCamera * camera; - float move_speed=1; + WalkerCamera * camera =nullptr; + float move_speed =1; Vector2f mouse_last_pos; @@ -340,7 +340,7 @@ public: camera->Refresh(); //更新矩阵计算 - ubo_camera_matrix=db->CreateUBO(sizeof(CameraInfo),&camera->matrix); + ubo_camera_info=db->CreateUBO(sizeof(CameraInfo),&camera->info); } void Resize(int w,int h)override @@ -351,7 +351,7 @@ public: GPUBuffer *GetCameraMatrixBuffer() { - return ubo_camera_matrix; + return ubo_camera_info; } virtual void BuildCommandBuffer(uint32_t index)=0; @@ -359,7 +359,7 @@ public: virtual void Draw()override { camera->Refresh(); //更新相机矩阵 - ubo_camera_matrix->Write(&camera->matrix); //写入缓冲区 + ubo_camera_info->Write(&camera->info); //写入缓冲区 const uint32_t index=AcquireNextImage(); diff --git a/inc/hgl/graph/VKRenderable.h b/inc/hgl/graph/VKRenderable.h index 7496c55a..8118ff2a 100644 --- a/inc/hgl/graph/VKRenderable.h +++ b/inc/hgl/graph/VKRenderable.h @@ -51,21 +51,21 @@ public: Renderable(const uint32_t dc=0):draw_count(dc){} virtual ~Renderable()=default; - const uint GetRefCount()const{return ref_count;} + const uint GetRefCount()const{return ref_count;} - void SetBoundingBox(const AABB &aabb){BoundingBox=aabb;} - const AABB &GetBoundingBox()const {return BoundingBox;} + void SetBoundingBox(const AABB &aabb){BoundingBox=aabb;} + const AABB &GetBoundingBox()const {return BoundingBox;} - bool Set(const UTF8String &name,VAB *vb,VkDeviceSize offset=0); + bool Set(const UTF8String &name,VAB *vb,VkDeviceSize offset=0); - bool Set(IndexBuffer *ib,VkDeviceSize offset=0) - { - if(!ib)return(false); + bool Set(IndexBuffer *ib,VkDeviceSize offset=0) + { + if(!ib)return(false); - indices_buffer=ib; - indices_offset=offset; - return(true); - } + indices_buffer=ib; + indices_offset=offset; + return(true); + } public: