From d1f6f044079a5bc088e97184723a04bc124e3a69 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Tue, 25 May 2021 11:48:20 +0800
Subject: [PATCH] renamed GetCameraMatrixBuffer to GetCameraInfoBuffer

---
 example/Vulkan/Atomsphere.cpp          | 2 +-
 example/Vulkan/DeferredModel.cpp       | 4 ++--
 example/Vulkan/Geometry3D.cpp          | 2 +-
 example/Vulkan/InlineGeometryScene.cpp | 4 ++--
 example/Vulkan/OffscreenRender.cpp     | 2 +-
 example/common/VulkanAppFramework.h    | 2 +-
 res                                    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/example/Vulkan/Atomsphere.cpp b/example/Vulkan/Atomsphere.cpp
index 46b80ec3..caeccb88 100644
--- a/example/Vulkan/Atomsphere.cpp
+++ b/example/Vulkan/Atomsphere.cpp
@@ -61,7 +61,7 @@ private:
 
     bool InitUBO()
     {
-        if(!material_instance->BindUBO("camera",GetCameraMatrixBuffer()))
+        if(!material_instance->BindUBO("camera",GetCameraInfoBuffer()))
             return(false);
 
         ubo_atomsphere=db->CreateUBO(sizeof(AtmosphereData),&atomsphere_data);
diff --git a/example/Vulkan/DeferredModel.cpp b/example/Vulkan/DeferredModel.cpp
index 5fa9b388..5af299c6 100644
--- a/example/Vulkan/DeferredModel.cpp
+++ b/example/Vulkan/DeferredModel.cpp
@@ -193,12 +193,12 @@ private:
 
         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("TexNormal"   ,texture.normal,   sampler);
         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->BindSampler("GB_Color"    ,gbuffer.rt->GetColorTexture((uint)GBufferAttachment::Color),sampler);
         sp_composition.material_instance->BindSampler("GB_Normal"   ,gbuffer.rt->GetColorTexture((uint)GBufferAttachment::Normal),sampler);
diff --git a/example/Vulkan/Geometry3D.cpp b/example/Vulkan/Geometry3D.cpp
index d72771f9..9375b7a9 100644
--- a/example/Vulkan/Geometry3D.cpp
+++ b/example/Vulkan/Geometry3D.cpp
@@ -46,7 +46,7 @@ private:
 
         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);
 
         mdp->material_instance->Update();
diff --git a/example/Vulkan/InlineGeometryScene.cpp b/example/Vulkan/InlineGeometryScene.cpp
index ff58cfb7..4f2c266d 100644
--- a/example/Vulkan/InlineGeometryScene.cpp
+++ b/example/Vulkan/InlineGeometryScene.cpp
@@ -204,14 +204,14 @@ private:
         material_instance->BindUBO("light",ubo_light);
         material_instance->BindUBO("phong",ubo_phong);
 
-        if(!material_instance->BindUBO("camera",GetCameraMatrixBuffer()))
+        if(!material_instance->BindUBO("camera",GetCameraInfoBuffer()))
             return(false);
 
         material_instance->BindUBO("fs_light",ubo_light);
 
         material_instance->Update();
 
-        if(!axis_mi->BindUBO("camera",GetCameraMatrixBuffer()))
+        if(!axis_mi->BindUBO("camera",GetCameraInfoBuffer()))
             return(false);
 
         axis_mi->Update();
diff --git a/example/Vulkan/OffscreenRender.cpp b/example/Vulkan/OffscreenRender.cpp
index 5a39de88..87b190ab 100644
--- a/example/Vulkan/OffscreenRender.cpp
+++ b/example/Vulkan/OffscreenRender.cpp
@@ -131,7 +131,7 @@ public:
         if(!cube.sampler)return(false);
 
         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();
 
         {
diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h
index 0d589184..3650536b 100644
--- a/example/common/VulkanAppFramework.h
+++ b/example/common/VulkanAppFramework.h
@@ -349,7 +349,7 @@ public:
         camera->height=h;
     }
 
-    GPUBuffer *GetCameraMatrixBuffer()
+    GPUBuffer *GetCameraInfoBuffer()
     {
         return ubo_camera_info;
     }
diff --git a/res b/res
index 45e15237..2bd19567 160000
--- a/res
+++ b/res
@@ -1 +1 @@
-Subproject commit 45e15237277bc6b1da18c8a8007b2addcb9129bc
+Subproject commit 2bd195674875a8de536a3fc4d4cb8a8ecc0bbeaf