hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename "ubo_camera_matrix" to "ubo_camera_info"

Browse Source
This commit is contained in:
hyzboy 2021-05-13 17:34:40 +08:00
parent 199cc5f6b1
commit b409f1663e
15 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMPlatform

@ -1 +1 @@
Subproject commit 83fbda2860159fb9cf5386f8e29ebf4a9dc9f9eb Subproject commit e2f056ddff2e1adacd6431c685af9c0ed8177e06

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 8bef798fc168a94af6ca6275820584f583c2a278 Subproject commit bc5ac1a503cc57f42a232aaf7e59be9d7ccedbeb

6
example/2dVector/line.cpp
View File

@ -37,7 +37,7 @@ private:
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
RenderableInstance *render_instance =nullptr; RenderableInstance *render_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
GPUBuffer * ubo_color_material =nullptr; GPUBuffer * ubo_color_material =nullptr;
GPUBuffer * ubo_line_config =nullptr; GPUBuffer * ubo_line_config =nullptr;
@ -88,7 +88,7 @@ private:
cam.Refresh(); 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_color_material =CreateUBO("color_material",sizeof(Vector4f), &color);
ubo_line_config =CreateUBO("line2d_config", sizeof(Line2DConfig), &line_2d_config); ubo_line_config =CreateUBO("line2d_config", sizeof(Line2DConfig), &line_2d_config);
@ -135,7 +135,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(render_instance); BuildCommandBuffer(render_instance);
} }

10
example/Vulkan/DrawText.cpp
View File

@ -28,7 +28,7 @@ private:
Sampler * sampler =nullptr; Sampler * sampler =nullptr;
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
GPUBuffer * ubo_color =nullptr; GPUBuffer * ubo_color =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -65,7 +65,7 @@ private:
sampler=db->CreateSampler(); sampler=db->CreateSampler();
material_instance->BindSampler("lum_texture",tile_font->GetTexture(),sampler); 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->BindUBO("color_material",ubo_color);
material_instance->Update(); material_instance->Update();
@ -81,9 +81,9 @@ private:
cam.Refresh(); 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(false);
color.One(); color.One();
@ -181,7 +181,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(render_instance); BuildCommandBuffer(render_instance);
} }

10
example/Vulkan/DrawTile.cpp
View File

@ -42,7 +42,7 @@ private:
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr; Renderable * render_obj =nullptr;
RenderableInstance *render_instance =nullptr; RenderableInstance *render_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -155,7 +155,7 @@ private:
sampler=db->CreateSampler(); sampler=db->CreateSampler();
material_instance->BindSampler("tex",tile_data->GetTexture(),sampler); 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(); material_instance->Update();
return(true); return(true);
@ -170,9 +170,9 @@ private:
cam.Refresh(); 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(false);
return(true); return(true);
@ -227,7 +227,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(render_instance); BuildCommandBuffer(render_instance);
} }

12
example/Vulkan/FragCoordTest.cpp
View File

@ -28,7 +28,7 @@ private:
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
RenderableInstance *renderable_instance =nullptr; RenderableInstance *renderable_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -58,13 +58,13 @@ private:
cam.Refresh(); 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(false);
if(!material_instance->BindUBO("camera",ubo_camera_matrix))return(false); if(!material_instance->BindUBO("camera",ubo_camera_info))return(false);
if(!material_instance->BindUBO("frag_world",ubo_camera_matrix))return(false); if(!material_instance->BindUBO("frag_world",ubo_camera_info))return(false);
material_instance->Update(); material_instance->Update();
return(true); return(true);
@ -109,7 +109,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(renderable_instance); BuildCommandBuffer(renderable_instance);
} }

6
example/Vulkan/Geometry2D.cpp
View File

@ -35,7 +35,7 @@ private:
Renderable * ro_circle =nullptr; Renderable * ro_circle =nullptr;
Renderable * ro_round_rectangle =nullptr; Renderable * ro_round_rectangle =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
GPUBuffer * ubo_color_material =nullptr; GPUBuffer * ubo_color_material =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -118,7 +118,7 @@ private:
cam.Refresh(); 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_color_material =CreateUBO("color_material",sizeof(Vector4f),&color);
material_instance->Update(); material_instance->Update();
@ -164,7 +164,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(&render_list); BuildCommandBuffer(&render_list);
} }

8
example/Vulkan/OffscreenRender.cpp
View File

@ -16,7 +16,7 @@ class TestApp:public CameraAppFramework
Camera cam; Camera cam;
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
}; };
struct:public RenderObject struct:public RenderObject
@ -65,12 +65,12 @@ public:
ro->cam.Refresh(); 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); return(false);
ro->material_instance->BindUBO("camera",ro->ubo_camera_matrix); ro->material_instance->BindUBO("camera",ro->ubo_camera_info);
ro->material_instance->Update(); ro->material_instance->Update();
return(true); return(true);
} }

10
example/Vulkan/RectanglePrimitive.cpp
View File

@ -41,7 +41,7 @@ private:
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr; Renderable * render_obj =nullptr;
RenderableInstance *render_instance =nullptr; RenderableInstance *render_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -61,7 +61,7 @@ private:
sampler=db->CreateSampler(); sampler=db->CreateSampler();
material_instance->BindSampler("tex",texture,sampler); material_instance->BindSampler("tex",texture,sampler);
material_instance->BindUBO("camera",ubo_camera_matrix); material_instance->BindUBO("camera",ubo_camera_info);
material_instance->Update(); material_instance->Update();
db->Add(texture); db->Add(texture);
@ -77,9 +77,9 @@ private:
cam.Refresh(); 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(false);
return(true); return(true);
@ -127,7 +127,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(render_instance); BuildCommandBuffer(render_instance);
} }

10
example/Vulkan/first_triangle.cpp
View File

@ -34,7 +34,7 @@ private:
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
RenderableInstance *render_instance =nullptr; RenderableInstance *render_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -62,12 +62,12 @@ private:
cam.Refresh(); 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(false);
material_instance->BindUBO("camera",ubo_camera_matrix); material_instance->BindUBO("camera",ubo_camera_info);
material_instance->Update(); material_instance->Update();
return(true); return(true);
} }
@ -113,7 +113,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(render_instance); BuildCommandBuffer(render_instance);
} }

12
example/Vulkan/indices_rect.cpp
View File

@ -38,7 +38,7 @@ private:
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
RenderableInstance *renderable_instance =nullptr; RenderableInstance *renderable_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -62,13 +62,13 @@ private:
cam.Refresh(); 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(false);
if(!material_instance->BindUBO("camera",ubo_camera_matrix))return(false); if(!material_instance->BindUBO("camera",ubo_camera_info))return(false);
if(!material_instance->BindUBO("frag_world",ubo_camera_matrix))return(false); if(!material_instance->BindUBO("frag_world",ubo_camera_info))return(false);
material_instance->Update(); material_instance->Update();
return(true); return(true);
@ -115,7 +115,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(renderable_instance); BuildCommandBuffer(renderable_instance);
} }

10
example/Vulkan/texture_rect.cpp
View File

@ -53,7 +53,7 @@ private:
Sampler * sampler =nullptr; Sampler * sampler =nullptr;
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
RenderableInstance *renderable_instance =nullptr; RenderableInstance *renderable_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
private: private:
@ -85,12 +85,12 @@ private:
cam.Refresh(); 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(false);
if(!material_instance->BindUBO("camera",ubo_camera_matrix))return(false); if(!material_instance->BindUBO("camera",ubo_camera_info))return(false);
material_instance->Update(); material_instance->Update();
return(true); return(true);
} }
@ -137,7 +137,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(renderable_instance); BuildCommandBuffer(renderable_instance);
} }

10
example/Vulkan/two_triangle.cpp
View File

@ -37,7 +37,7 @@ private:
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
RenderableInstance *render_instance =nullptr; RenderableInstance *render_instance =nullptr;
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -65,12 +65,12 @@ private:
cam.Refresh(); 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(false);
material_instance->BindUBO("camera",ubo_camera_matrix); material_instance->BindUBO("camera",ubo_camera_info);
material_instance->Update(); material_instance->Update();
return(true); return(true);
} }
@ -119,7 +119,7 @@ public:
cam.Refresh(); cam.Refresh();
ubo_camera_matrix->Write(&cam.matrix); ubo_camera_info->Write(&cam.info);
BuildCommandBuffer(&render_list); BuildCommandBuffer(&render_list);
} }

12
example/common/VulkanAppFramework.h
View File

@ -300,12 +300,12 @@ class CameraAppFramework:public VulkanApplicationFramework
{ {
private: private:
GPUBuffer * ubo_camera_matrix =nullptr; GPUBuffer * ubo_camera_info =nullptr;
protected: protected:
WalkerCamera * camera; WalkerCamera * camera =nullptr;
float move_speed=1; float move_speed =1;
Vector2f mouse_last_pos; Vector2f mouse_last_pos;
@ -340,7 +340,7 @@ public:
camera->Refresh(); //更新矩阵计算 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 void Resize(int w,int h)override
@ -351,7 +351,7 @@ public:
GPUBuffer *GetCameraMatrixBuffer() GPUBuffer *GetCameraMatrixBuffer()
{ {
return ubo_camera_matrix; return ubo_camera_info;
} }
virtual void BuildCommandBuffer(uint32_t index)=0; virtual void BuildCommandBuffer(uint32_t index)=0;
@ -359,7 +359,7 @@ public:
virtual void Draw()override virtual void Draw()override
{ {
camera->Refresh(); //更新相机矩阵 camera->Refresh(); //更新相机矩阵
ubo_camera_matrix->Write(&camera->matrix); //写入缓冲区 ubo_camera_info->Write(&camera->info); //写入缓冲区
const uint32_t index=AcquireNextImage(); const uint32_t index=AcquireNextImage();

22
inc/hgl/graph/VKRenderable.h
View File

@ -51,21 +51,21 @@ public:
Renderable(const uint32_t dc=0):draw_count(dc){} Renderable(const uint32_t dc=0):draw_count(dc){}
virtual ~Renderable()=default; virtual ~Renderable()=default;
const uint GetRefCount()const{return ref_count;} const uint GetRefCount()const{return ref_count;}
void SetBoundingBox(const AABB &aabb){BoundingBox=aabb;} void SetBoundingBox(const AABB &aabb){BoundingBox=aabb;}
const AABB &GetBoundingBox()const {return BoundingBox;} 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) bool Set(IndexBuffer *ib,VkDeviceSize offset=0)
{ {
if(!ib)return(false); if(!ib)return(false);
indices_buffer=ib; indices_buffer=ib;
indices_offset=offset; indices_offset=offset;
return(true); return(true);
} }
public: public: