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

renamed GetCameraMatrixBuffer to GetCameraInfoBuffer

Browse Source
This commit is contained in:
hyzboy 2021-05-25 11:48:20 +08:00
parent 3b54446064
commit d1f6f04407
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/Vulkan/Atomsphere.cpp
View File

@ -61,7 +61,7 @@ private:
bool InitUBO() bool InitUBO()
{ {
if(!material_instance->BindUBO("camera",GetCameraMatrixBuffer())) if(!material_instance->BindUBO("camera",GetCameraInfoBuffer()))
return(false); return(false);
ubo_atomsphere=db->CreateUBO(sizeof(AtmosphereData),&atomsphere_data); ubo_atomsphere=db->CreateUBO(sizeof(AtmosphereData),&atomsphere_data);

4
example/Vulkan/DeferredModel.cpp
View File

@ -193,12 +193,12 @@ private:
sampler=db->CreateSampler(&sampler_create_info); sampler=db->CreateSampler(&sampler_create_info);
sp_gbuffer.material_instance->BindUBO("camera",GetCameraMatrixBuffer()); sp_gbuffer.material_instance->BindUBO("camera",GetCameraInfoBuffer());
sp_gbuffer.material_instance->BindSampler("TexColor" ,texture.color, sampler); sp_gbuffer.material_instance->BindSampler("TexColor" ,texture.color, sampler);
sp_gbuffer.material_instance->BindSampler("TexNormal" ,texture.normal, sampler); sp_gbuffer.material_instance->BindSampler("TexNormal" ,texture.normal, sampler);
sp_gbuffer.material_instance->Update(); sp_gbuffer.material_instance->Update();
sp_composition.material_instance->BindUBO("camera",GetCameraMatrixBuffer()); sp_composition.material_instance->BindUBO("camera",GetCameraInfoBuffer());
sp_composition.material_instance->BindUBO("lights",ubo_lights); sp_composition.material_instance->BindUBO("lights",ubo_lights);
sp_composition.material_instance->BindSampler("GB_Color" ,gbuffer.rt->GetColorTexture((uint)GBufferAttachment::Color),sampler); sp_composition.material_instance->BindSampler("GB_Color" ,gbuffer.rt->GetColorTexture((uint)GBufferAttachment::Color),sampler);
sp_composition.material_instance->BindSampler("GB_Normal" ,gbuffer.rt->GetColorTexture((uint)GBufferAttachment::Normal),sampler); sp_composition.material_instance->BindSampler("GB_Normal" ,gbuffer.rt->GetColorTexture((uint)GBufferAttachment::Normal),sampler);

2
example/Vulkan/Geometry3D.cpp
View File

@ -46,7 +46,7 @@ private:
mdp->pipeline=CreatePipeline(mdp->material_instance,InlinePipeline::Solid3D,primitive); mdp->pipeline=CreatePipeline(mdp->material_instance,InlinePipeline::Solid3D,primitive);
if(!mdp->material_instance->BindUBO("camera",GetCameraMatrixBuffer())) if(!mdp->material_instance->BindUBO("camera",GetCameraInfoBuffer()))
return(false); return(false);
mdp->material_instance->Update(); mdp->material_instance->Update();

4
example/Vulkan/InlineGeometryScene.cpp
View File

@ -204,14 +204,14 @@ private:
material_instance->BindUBO("light",ubo_light); material_instance->BindUBO("light",ubo_light);
material_instance->BindUBO("phong",ubo_phong); material_instance->BindUBO("phong",ubo_phong);
if(!material_instance->BindUBO("camera",GetCameraMatrixBuffer())) if(!material_instance->BindUBO("camera",GetCameraInfoBuffer()))
return(false); return(false);
material_instance->BindUBO("fs_light",ubo_light); material_instance->BindUBO("fs_light",ubo_light);
material_instance->Update(); material_instance->Update();
if(!axis_mi->BindUBO("camera",GetCameraMatrixBuffer())) if(!axis_mi->BindUBO("camera",GetCameraInfoBuffer()))
return(false); return(false);
axis_mi->Update(); axis_mi->Update();

2
example/Vulkan/OffscreenRender.cpp
View File

@ -131,7 +131,7 @@ public:
if(!cube.sampler)return(false); if(!cube.sampler)return(false);
cube.material_instance->BindSampler("tex",os.render_taget->GetColorTexture(),cube.sampler); cube.material_instance->BindSampler("tex",os.render_taget->GetColorTexture(),cube.sampler);
cube.material_instance->BindUBO("camera",GetCameraMatrixBuffer()); cube.material_instance->BindUBO("camera",GetCameraInfoBuffer());
cube.material_instance->Update(); cube.material_instance->Update();
{ {

2
example/common/VulkanAppFramework.h
View File

@ -349,7 +349,7 @@ public:
camera->height=h; camera->height=h;
} }
GPUBuffer *GetCameraMatrixBuffer() GPUBuffer *GetCameraInfoBuffer()
{ {
return ubo_camera_info; return ubo_camera_info;
} }

2
res

@ -1 +1 @@
Subproject commit 45e15237277bc6b1da18c8a8007b2addcb9129bc Subproject commit 2bd195674875a8de536a3fc4d4cb8a8ecc0bbeaf