From b041fb5c14a5ed50f3fb966ccac093b2831a37e4 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 14 Jul 2020 20:42:01 +0800 Subject: [PATCH] change values name. --- example/Vulkan/DrawText.cpp | 10 ++++---- example/Vulkan/FragCoordTest.cpp | 14 +++++------ example/Vulkan/Geometry2D.cpp | 6 ++--- example/Vulkan/RectanglePrimitive.cpp | 10 ++++---- example/Vulkan/first_triangle.cpp | 12 ++++----- example/Vulkan/indices_rect.cpp | 36 ++++++++++----------------- example/Vulkan/texture_rect.cpp | 12 ++++----- res | 2 +- 8 files changed, 46 insertions(+), 56 deletions(-) diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index d2be04a6..c69a41cf 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -28,7 +28,7 @@ private: vulkan::Sampler * sampler =nullptr; vulkan::MaterialInstance * material_instance =nullptr; vulkan::Renderable * render_obj =nullptr; - vulkan::Buffer * ubo_mvp =nullptr; + vulkan::Buffer * ubo_world_matrix =nullptr; vulkan::Pipeline * pipeline =nullptr; @@ -53,7 +53,7 @@ private: sampler=db->CreateSampler(); material_instance->BindSampler("tex",texture,sampler); - material_instance->BindUBO("world",ubo_mvp); + material_instance->BindUBO("world",ubo_world_matrix); material_instance->Update(); db->Add(material); @@ -72,9 +72,9 @@ private: cam.Refresh(); - ubo_mvp=db->CreateUBO(sizeof(WorldMatrix),&cam.matrix); + ubo_world_matrix=db->CreateUBO(sizeof(WorldMatrix),&cam.matrix); - if(!ubo_mvp) + if(!ubo_world_matrix) return(false); return(true); @@ -132,7 +132,7 @@ public: cam.Refresh(); - ubo_mvp->Write(&cam.matrix); + ubo_world_matrix->Write(&cam.matrix); BuildCommandBuffer(pipeline,material_instance,render_obj); } diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index 0391be1d..49fbc176 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -32,7 +32,7 @@ private: vulkan::Material * material =nullptr; vulkan::MaterialInstance * material_instance =nullptr; vulkan::Renderable * render_obj =nullptr; - vulkan::Buffer * ubo_mvp =nullptr; + vulkan::Buffer * ubo_world_matrix =nullptr; vulkan::Pipeline * pipeline =nullptr; @@ -44,7 +44,7 @@ public: { SAFE_CLEAR(vertex_buffer); SAFE_CLEAR(pipeline); - SAFE_CLEAR(ubo_mvp); + SAFE_CLEAR(ubo_world_matrix); SAFE_CLEAR(render_obj); SAFE_CLEAR(material_instance); SAFE_CLEAR(material); @@ -73,13 +73,13 @@ private: cam.Refresh(); - ubo_mvp=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix); + ubo_world_matrix=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix); - if(!ubo_mvp) + if(!ubo_world_matrix) return(false); - material_instance->BindUBO("world",ubo_mvp); - material_instance->BindUBO("fragment_world",ubo_mvp); + material_instance->BindUBO("world",ubo_world_matrix); + material_instance->BindUBO("fragment_world",ubo_world_matrix); material_instance->Update(); return(true); @@ -134,7 +134,7 @@ public: cam.Refresh(); - ubo_mvp->Write(&cam.matrix); + ubo_world_matrix->Write(&cam.matrix); BuildCommandBuffer(pipeline,material_instance,render_obj); } diff --git a/example/Vulkan/Geometry2D.cpp b/example/Vulkan/Geometry2D.cpp index 308dedd5..a966805e 100644 --- a/example/Vulkan/Geometry2D.cpp +++ b/example/Vulkan/Geometry2D.cpp @@ -38,7 +38,7 @@ private: *ro_circle =nullptr, *ro_round_rectangle =nullptr; - vulkan::Buffer * ubo_mvp =nullptr; + vulkan::Buffer * ubo_world_matrix =nullptr; vulkan::Buffer * ubo_color_material =nullptr; vulkan::Pipeline * pipeline =nullptr; @@ -119,7 +119,7 @@ private: cam.Refresh(); - ubo_mvp =CreateUBO("world", sizeof(WorldMatrix),&cam.matrix); + ubo_world_matrix =CreateUBO("world", sizeof(WorldMatrix),&cam.matrix); ubo_color_material =CreateUBO("color_material",sizeof(Vector4f),&color); material_instance->Update(); @@ -182,7 +182,7 @@ public: cam.Refresh(); - ubo_mvp->Write(&cam.matrix); + ubo_world_matrix->Write(&cam.matrix); BuildCommandBuffer(&render_list); } diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index c5bb59db..6abbfc00 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -41,7 +41,7 @@ private: vulkan::Sampler * sampler =nullptr; vulkan::MaterialInstance * material_instance =nullptr; vulkan::Renderable * render_obj =nullptr; - vulkan::Buffer * ubo_mvp =nullptr; + vulkan::Buffer * ubo_world_matrix =nullptr; vulkan::Pipeline * pipeline =nullptr; @@ -66,7 +66,7 @@ private: sampler=db->CreateSampler(); material_instance->BindSampler("tex",texture,sampler); - material_instance->BindUBO("world",ubo_mvp); + material_instance->BindUBO("world",ubo_world_matrix); material_instance->Update(); db->Add(material); @@ -85,9 +85,9 @@ private: cam.Refresh(); - ubo_mvp=db->CreateUBO(sizeof(WorldMatrix),&cam.matrix); + ubo_world_matrix=db->CreateUBO(sizeof(WorldMatrix),&cam.matrix); - if(!ubo_mvp) + if(!ubo_world_matrix) return(false); return(true); @@ -145,7 +145,7 @@ public: cam.Refresh(); - ubo_mvp->Write(&cam.matrix); + ubo_world_matrix->Write(&cam.matrix); BuildCommandBuffer(pipeline,material_instance,render_obj); } diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index 7d5deecf..14c19231 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -38,7 +38,7 @@ private: vulkan::Material * material =nullptr; vulkan::MaterialInstance * material_instance =nullptr; vulkan::Renderable * render_obj =nullptr; - vulkan::Buffer * ubo_mvp =nullptr; + vulkan::Buffer * ubo_world_matrix =nullptr; vulkan::Pipeline * pipeline =nullptr; @@ -52,7 +52,7 @@ public: SAFE_CLEAR(color_buffer); SAFE_CLEAR(vertex_buffer); SAFE_CLEAR(pipeline); - SAFE_CLEAR(ubo_mvp); + SAFE_CLEAR(ubo_world_matrix); SAFE_CLEAR(render_obj); SAFE_CLEAR(material_instance); SAFE_CLEAR(material); @@ -81,12 +81,12 @@ private: cam.Refresh(); - ubo_mvp=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix); + ubo_world_matrix=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix); - if(!ubo_mvp) + if(!ubo_world_matrix) return(false); - material_instance->BindUBO("world",ubo_mvp); + material_instance->BindUBO("world",ubo_world_matrix); material_instance->Update(); return(true); } @@ -158,7 +158,7 @@ public: cam.Refresh(); - ubo_mvp->Write(&cam.matrix); + ubo_world_matrix->Write(&cam.matrix); BuildCommandBuffer(pipeline,material_instance,render_obj); } diff --git a/example/Vulkan/indices_rect.cpp b/example/Vulkan/indices_rect.cpp index db10ba78..62d27007 100644 --- a/example/Vulkan/indices_rect.cpp +++ b/example/Vulkan/indices_rect.cpp @@ -12,7 +12,7 @@ constexpr uint32_t SCREEN_HEIGHT=128; constexpr uint32_t VERTEX_COUNT=4; -static Vector4f color(1,1,0,1); +static Vector4f color(1,1,1,1); constexpr float SSP=0.25; constexpr float SSN=1-SSP; @@ -42,12 +42,12 @@ private: vulkan::Material * material =nullptr; vulkan::MaterialInstance * material_instance =nullptr; vulkan::Renderable * render_obj =nullptr; - vulkan::Buffer * ubo_mvp =nullptr; + vulkan::Buffer * ubo_world_matrix =nullptr; vulkan::Buffer * ubo_color_material =nullptr; vulkan::Pipeline * pipeline =nullptr; - vulkan::VertexAttribBuffer * vertex_buffer =nullptr; + vulkan::VertexAttribBuffer *vertex_buffer =nullptr; vulkan::IndexBuffer * index_buffer =nullptr; public: @@ -58,7 +58,7 @@ public: SAFE_CLEAR(vertex_buffer); SAFE_CLEAR(pipeline); SAFE_CLEAR(ubo_color_material); - SAFE_CLEAR(ubo_mvp); + SAFE_CLEAR(ubo_world_matrix); SAFE_CLEAR(render_obj); SAFE_CLEAR(material_instance); SAFE_CLEAR(material); @@ -69,7 +69,7 @@ private: bool InitMaterial() { material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition.vert"), - OS_TEXT("res/shader/FlatColor.frag")); + OS_TEXT("res/shader/XorColor.frag")); if(!material) return(false); @@ -78,30 +78,20 @@ private: return(true); } - vulkan::Buffer *CreateUBO(const AnsiString &name,const VkDeviceSize size,void *data) - { - vulkan::Buffer *ubo=device->CreateUBO(size,data); - - if(!ubo) - return(nullptr); - - if(!material_instance->BindUBO(name,ubo)) - { - SAFE_CLEAR(ubo); - return(nullptr); - } - - return ubo; - } - bool InitUBO() { const VkExtent2D extent=sc_render_target->GetExtent(); wm.ortho=ortho(extent.width,extent.height); + wm.canvas_resolution.x=extent.width; + wm.canvas_resolution.y=extent.height; - ubo_mvp =CreateUBO("world", sizeof(WorldMatrix),&wm); - ubo_color_material =CreateUBO("color_material",sizeof(Vector4f),&color); + ubo_world_matrix =device->CreateUBO(sizeof(WorldMatrix),&wm); + ubo_color_material =device->CreateUBO(sizeof(Vector4f),&color); + + material_instance->BindUBO("world",ubo_world_matrix); + material_instance->BindUBO("fs_world",ubo_world_matrix); + material_instance->BindUBO("color_material",ubo_color_material); material_instance->Update(); return(true); diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index feea2bf1..f139d431 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -53,7 +53,7 @@ private: vulkan::Sampler * sampler =nullptr; vulkan::MaterialInstance * material_instance =nullptr; vulkan::Renderable * render_obj =nullptr; - vulkan::Buffer * ubo_mvp =nullptr; + vulkan::Buffer * ubo_world_matrix =nullptr; vulkan::Pipeline * pipeline =nullptr; @@ -69,7 +69,7 @@ public: SAFE_CLEAR(tex_coord_buffer); SAFE_CLEAR(vertex_buffer); SAFE_CLEAR(pipeline); - SAFE_CLEAR(ubo_mvp); + SAFE_CLEAR(ubo_world_matrix); SAFE_CLEAR(render_obj); SAFE_CLEAR(material_instance); SAFE_CLEAR(sampler); @@ -94,7 +94,7 @@ private: sampler=device->CreateSampler(); material_instance->BindSampler("tex",texture,sampler); - material_instance->BindUBO("world",ubo_mvp); + material_instance->BindUBO("world",ubo_world_matrix); material_instance->Update(); return(true); @@ -109,9 +109,9 @@ private: cam.Refresh(); - ubo_mvp=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix); + ubo_world_matrix=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix); - if(!ubo_mvp) + if(!ubo_world_matrix) return(false); return(true); @@ -170,7 +170,7 @@ public: cam.Refresh(); - ubo_mvp->Write(&cam.matrix); + ubo_world_matrix->Write(&cam.matrix); BuildCommandBuffer(pipeline,material_instance,render_obj); } diff --git a/res b/res index 9ce56221..3c8d4ba2 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 9ce56221ff5907b041147f12fda367c226eba73f +Subproject commit 3c8d4ba212c743feba2271743e560d32e9cb2e74