From 1fc1db43767aeb4754cb862f089b78837058c84b Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 22 Feb 2022 20:53:39 +0800 Subject: [PATCH] renamed values' name --- example/2dVector/line.cpp | 8 ++++---- example/Vulkan/DrawText.cpp | 2 +- example/Vulkan/DrawTile.cpp | 8 ++++---- example/Vulkan/FragCoordTest.cpp | 4 ++-- example/Vulkan/RectanglePrimitive.cpp | 4 ++-- example/Vulkan/first_triangle.cpp | 4 ++-- example/Vulkan/indices_rect.cpp | 4 ++-- example/Vulkan/texture_rect.cpp | 4 ++-- example/Vulkan/two_triangle.cpp | 4 ++-- src/SceneGraph/font/TextRender.cpp | 2 -- 10 files changed, 21 insertions(+), 23 deletions(-) diff --git a/example/2dVector/line.cpp b/example/2dVector/line.cpp index 14aa55c3..9d242a9f 100644 --- a/example/2dVector/line.cpp +++ b/example/2dVector/line.cpp @@ -11,7 +11,7 @@ constexpr uint32_t SCREEN_HEIGHT=720; constexpr uint32_t VERTEX_COUNT=4; -constexpr float vertex_data[VERTEX_COUNT][2]= +constexpr float position_data[VERTEX_COUNT][2]= { {SCREEN_WIDTH*0.5, SCREEN_HEIGHT*0.25}, {SCREEN_WIDTH*0.75, SCREEN_HEIGHT*0.75}, @@ -79,7 +79,7 @@ private: cam.width=extent.width; cam.height=extent.height; - cam.Refresh(); + cam.RefreshCameraInfo(); { MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global); @@ -116,7 +116,7 @@ private: Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); return(true); @@ -148,7 +148,7 @@ public: cam.width=w; cam.height=h; - cam.Refresh(); + cam.RefreshCameraInfo(); ubo_camera_info->Write(&cam.info); diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index c2941b52..f7bcd14c 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -34,7 +34,7 @@ private: bool InitUBO() { - const VkExtent2D extent=sc_render_target->GetExtent(); + const VkExtent2D &extent=sc_render_target->GetExtent(); cam.width=extent.width; cam.height=extent.height; diff --git a/example/Vulkan/DrawTile.cpp b/example/Vulkan/DrawTile.cpp index 18e34ef6..4ad12408 100644 --- a/example/Vulkan/DrawTile.cpp +++ b/example/Vulkan/DrawTile.cpp @@ -33,7 +33,7 @@ class TestApp:public VulkanApplicationFramework TileData *tile_data=nullptr; - float *vertex_data=nullptr; + float *position_data=nullptr; float *tex_coord_data=nullptr; VkFormat tile_texture_format=PF_UNDEFINED; @@ -108,10 +108,10 @@ private: const int count=tile_list.GetCount(); TileBitmap **tb=tile_list.GetData(); - vertex_data=new float[count*4]; + position_data=new float[count*4]; tex_coord_data=new float[count*4]; - float *vp=vertex_data; + float *vp=position_data; float *tp=tex_coord_data; int col=0; @@ -215,7 +215,7 @@ private: render_obj=db->CreateRenderable(tile_count); if(!render_obj)return(false); - render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,vertex_data)); + render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,position_data)); render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,tile_count,tex_coord_data)); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index bace6033..b957fcb9 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -12,7 +12,7 @@ constexpr uint32_t SCREEN_HEIGHT=256; constexpr uint32_t VERTEX_COUNT=4; -constexpr float vertex_data[VERTEX_COUNT][2]= +constexpr float position_data[VERTEX_COUNT][2]= { {0,0}, {SCREEN_WIDTH,0}, @@ -78,7 +78,7 @@ private: auto render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); return(true); diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index 388ccd2e..0664f70e 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -19,7 +19,7 @@ constexpr uint32_t VERTEX_COUNT=1; constexpr float BORDER=0.1f; -constexpr float vertex_data[4]= +constexpr float position_data[4]= { SCREEN_SIZE*BORDER, SCREEN_SIZE*BORDER, SCREEN_SIZE*(1.0-BORDER), SCREEN_SIZE*(1.0-BORDER) @@ -109,7 +109,7 @@ private: if(!render_obj)return(false); - render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,vertex_data)); + render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,position_data)); render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,VERTEX_COUNT,tex_coord_data)); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index 7479cc58..f324ce6c 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -14,7 +14,7 @@ constexpr uint32_t SCREEN_HEIGHT=720; constexpr uint32_t VERTEX_COUNT=3; -constexpr float vertex_data[VERTEX_COUNT][2]= +constexpr float position_data[VERTEX_COUNT][2]= { {SCREEN_WIDTH*0.5, SCREEN_HEIGHT*0.25}, {SCREEN_WIDTH*0.75, SCREEN_HEIGHT*0.75}, @@ -85,7 +85,7 @@ private: Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/example/Vulkan/indices_rect.cpp b/example/Vulkan/indices_rect.cpp index a7ca4b92..fece2f40 100644 --- a/example/Vulkan/indices_rect.cpp +++ b/example/Vulkan/indices_rect.cpp @@ -14,7 +14,7 @@ constexpr uint32_t VERTEX_COUNT=4; static Vector4f color(1,1,1,1); -constexpr float vertex_data[VERTEX_COUNT][2]= +constexpr float position_data[VERTEX_COUNT][2]= { {0,0}, {SCREEN_WIDTH,0}, @@ -87,7 +87,7 @@ private: auto render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index bc0067de..fa26ae2f 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -19,7 +19,7 @@ constexpr uint32_t SCREEN_HEIGHT=256; constexpr uint32_t VERTEX_COUNT=4; -constexpr float vertex_data[VERTEX_COUNT][2]= +constexpr float position_data[VERTEX_COUNT][2]= { {0, 0}, {SCREEN_WIDTH, 0}, @@ -121,7 +121,7 @@ private: auto render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V2F,VERTEX_COUNT,tex_coord_data)))return(false); if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); diff --git a/example/Vulkan/two_triangle.cpp b/example/Vulkan/two_triangle.cpp index 67e5b55f..a0d4034d 100644 --- a/example/Vulkan/two_triangle.cpp +++ b/example/Vulkan/two_triangle.cpp @@ -13,7 +13,7 @@ constexpr uint32_t SCREEN_HEIGHT=720; constexpr uint32_t VERTEX_COUNT=3; -constexpr float vertex_data[VERTEX_COUNT][2]= +constexpr float position_data[VERTEX_COUNT][2]= { {SCREEN_WIDTH*0.5, SCREEN_HEIGHT*0.25}, {SCREEN_WIDTH*0.75, SCREEN_HEIGHT*0.75}, @@ -87,7 +87,7 @@ private: Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT); if(!render_obj)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,vertex_data)))return(false); + if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); diff --git a/src/SceneGraph/font/TextRender.cpp b/src/SceneGraph/font/TextRender.cpp index c1deac18..dd992054 100644 --- a/src/SceneGraph/font/TextRender.cpp +++ b/src/SceneGraph/font/TextRender.cpp @@ -5,8 +5,6 @@ #include #include -constexpr uint CHAR_BITMAP_SIZE=16; //字符尺寸 - namespace hgl { namespace graph