From e381c3efeb01b581ea0c54342a198b4d0f417f95 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Fri, 24 Jun 2022 21:17:28 +0800 Subject: [PATCH] renamed to render_obj from render_instance --- example/2dVector/line.cpp | 8 ++++---- example/2dVector/roundbox.cpp | 8 ++++---- example/Vulkan/DrawText.cpp | 16 ++++++++-------- example/Vulkan/DrawTile.cpp | 12 ++++++------ example/Vulkan/InstanceTriangle.cpp | 8 ++++---- example/Vulkan/RectanglePrimitive.cpp | 12 ++++++------ example/Vulkan/first_triangle.cpp | 8 ++++---- example/Vulkan/second_triangle.cpp | 8 ++++---- example/Vulkan/third_triangle.cpp | 6 +++--- inc/hgl/graph/font/TextLayout.h | 4 ++-- inc/hgl/graph/font/TextRender.h | 2 +- src/SceneGraph/font/TextRender.cpp | 4 ++-- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/example/2dVector/line.cpp b/example/2dVector/line.cpp index 33eae721..83641bc0 100644 --- a/example/2dVector/line.cpp +++ b/example/2dVector/line.cpp @@ -36,7 +36,7 @@ private: Camera cam; MaterialInstance * material_instance =nullptr; - Renderable *render_instance =nullptr; + Renderable * render_obj =nullptr; GPUBuffer * ubo_camera_info =nullptr; GPUBuffer * ubo_color_material =nullptr; GPUBuffer * ubo_line_config =nullptr; @@ -118,7 +118,7 @@ private: if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); - render_instance=db->CreateRenderable(primitive,material_instance,pipeline); + render_obj=db->CreateRenderable(primitive,material_instance,pipeline); return(true); } @@ -138,7 +138,7 @@ public: if(!InitVBO()) return(false); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); return(true); } @@ -152,7 +152,7 @@ public: ubo_camera_info->Write(&cam.info); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); } };//class TestApp:public VulkanApplicationFramework diff --git a/example/2dVector/roundbox.cpp b/example/2dVector/roundbox.cpp index c1b1227b..7700c09a 100644 --- a/example/2dVector/roundbox.cpp +++ b/example/2dVector/roundbox.cpp @@ -36,7 +36,7 @@ private: Camera cam; MaterialInstance * material_instance =nullptr; - Renderable *render_instance =nullptr; + Renderable * render_obj =nullptr; GPUBuffer * ubo_camera_info =nullptr; GPUBuffer * ubo_rb_config =nullptr; @@ -134,7 +134,7 @@ private: if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V4I16,VERTEX_COUNT,position_data)))return(false); - render_instance=db->CreateRenderable(primitive,material_instance,pipeline); + render_obj=db->CreateRenderable(primitive,material_instance,pipeline); return(true); } @@ -154,7 +154,7 @@ public: if(!InitVBO()) return(false); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); return(true); } @@ -168,7 +168,7 @@ public: ubo_camera_info->Write(&cam.info); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); } };//class TestApp:public VulkanApplicationFramework diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index 5fa007e5..239c052e 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -14,8 +14,8 @@ private: TextRender * text_render =nullptr; - TextPrimitive * text_render_obj =nullptr; - Renderable *render_instance =nullptr; + TextPrimitive * text_primitive =nullptr; + Renderable * render_obj =nullptr; public: @@ -40,12 +40,12 @@ private: if(!text_render) return(false); - text_render_obj=text_render->CreatePrimitive(str); - if(!text_render_obj) + text_primitive=text_render->CreatePrimitive(str); + if(!text_primitive) return(false); - render_instance=text_render->CreateRenderable(text_render_obj); - if(!render_instance) + render_obj=text_render->CreateRenderable(text_primitive); + if(!render_obj) return(false); return(true); @@ -61,7 +61,7 @@ public: if(!InitTextRenderable()) return(false); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); return(true); } @@ -70,7 +70,7 @@ public: { VulkanApplicationFramework::Resize(w,h); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); } };//class TestApp:public VulkanApplicationFramework diff --git a/example/Vulkan/DrawTile.cpp b/example/Vulkan/DrawTile.cpp index f931ba9b..74e6b85a 100644 --- a/example/Vulkan/DrawTile.cpp +++ b/example/Vulkan/DrawTile.cpp @@ -40,8 +40,8 @@ private: Sampler * sampler =nullptr; MaterialInstance * material_instance =nullptr; - Primitive * primitive =nullptr; - Renderable *render_instance =nullptr; + Primitive * primitive =nullptr; + Renderable * render_obj =nullptr; Pipeline * pipeline =nullptr; @@ -180,9 +180,9 @@ private: primitive->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,position_data)); primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,tile_count,tex_coord_data)); - render_instance=db->CreateRenderable(primitive,material_instance,pipeline); + render_obj=db->CreateRenderable(primitive,material_instance,pipeline); - return(render_instance); + return(render_obj); } public: @@ -204,7 +204,7 @@ public: if(!InitVBO()) return(false); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); return(true); } @@ -213,7 +213,7 @@ public: { VulkanApplicationFramework::Resize(w,h); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); } };//class TestApp:public VulkanApplicationFramework diff --git a/example/Vulkan/InstanceTriangle.cpp b/example/Vulkan/InstanceTriangle.cpp index 6bc7aab3..933c21a2 100644 --- a/example/Vulkan/InstanceTriangle.cpp +++ b/example/Vulkan/InstanceTriangle.cpp @@ -32,7 +32,7 @@ class TestApp:public VulkanApplicationFramework private: MaterialInstance * material_instance =nullptr; - Renderable *render_instance =nullptr; + Renderable * render_obj =nullptr; Pipeline * pipeline =nullptr; @@ -59,7 +59,7 @@ private: if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); - render_instance=db->CreateRenderable(primitive,material_instance,pipeline); + render_obj=db->CreateRenderable(primitive,material_instance,pipeline); return(true); } @@ -76,7 +76,7 @@ public: if(!InitVBO()) return(false); - if(!BuildCommandBuffer(render_instance)) + if(!BuildCommandBuffer(render_obj)) return(false); return(true); @@ -86,7 +86,7 @@ public: { VulkanApplicationFramework::Resize(w,h); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); } };//class TestApp:public VulkanApplicationFramework diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index 2620f96b..1895aa9d 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -37,8 +37,8 @@ private: Texture2D * texture =nullptr; Sampler * sampler =nullptr; MaterialInstance * material_instance =nullptr; - Primitive * primitive =nullptr; - Renderable *render_instance =nullptr; + Primitive * primitive =nullptr; + Renderable * render_obj =nullptr; Pipeline * pipeline =nullptr; @@ -73,9 +73,9 @@ private: primitive->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,position_data)); primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,VERTEX_COUNT,tex_coord_data)); - render_instance=db->CreateRenderable(primitive,material_instance,pipeline); + render_obj=db->CreateRenderable(primitive,material_instance,pipeline); - return(render_instance); + return(render_obj); } public: @@ -91,7 +91,7 @@ public: if(!InitVBO()) return(false); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); return(true); } @@ -100,7 +100,7 @@ public: { VulkanApplicationFramework::Resize(w,h); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); } };//class TestApp:public VulkanApplicationFramework diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index ca66214e..d45528e1 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -32,7 +32,7 @@ class TestApp:public VulkanApplicationFramework private: MaterialInstance * material_instance =nullptr; - Renderable *render_instance =nullptr; + Renderable * render_obj =nullptr; Pipeline * pipeline =nullptr; @@ -59,7 +59,7 @@ private: if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); - render_instance=db->CreateRenderable(primitive,material_instance,pipeline); + render_obj=db->CreateRenderable(primitive,material_instance,pipeline); return(true); } @@ -76,7 +76,7 @@ public: if(!InitVBO()) return(false); - if(!BuildCommandBuffer(render_instance)) + if(!BuildCommandBuffer(render_obj)) return(false); return(true); @@ -86,7 +86,7 @@ public: { VulkanApplicationFramework::Resize(w,h); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); } };//class TestApp:public VulkanApplicationFramework diff --git a/example/Vulkan/second_triangle.cpp b/example/Vulkan/second_triangle.cpp index 421027bc..5ee0e69b 100644 --- a/example/Vulkan/second_triangle.cpp +++ b/example/Vulkan/second_triangle.cpp @@ -32,7 +32,7 @@ class TestApp:public VulkanApplicationFramework private: MaterialInstance * material_instance =nullptr; - Renderable *render_instance =nullptr; + Renderable * render_obj =nullptr; Pipeline * pipeline =nullptr; @@ -61,7 +61,7 @@ private: if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); - render_instance=db->CreateRenderable(primitive,material_instance,pipeline); + render_obj=db->CreateRenderable(primitive,material_instance,pipeline); return(true); } @@ -78,7 +78,7 @@ public: if(!InitVBO()) return(false); - if(!BuildCommandBuffer(render_instance)) + if(!BuildCommandBuffer(render_obj)) return(false); return(true); @@ -88,7 +88,7 @@ public: { VulkanApplicationFramework::Resize(w,h); - BuildCommandBuffer(render_instance); + BuildCommandBuffer(render_obj); } };//class TestApp:public VulkanApplicationFramework diff --git a/example/Vulkan/third_triangle.cpp b/example/Vulkan/third_triangle.cpp index 49405445..4ab41f71 100644 --- a/example/Vulkan/third_triangle.cpp +++ b/example/Vulkan/third_triangle.cpp @@ -34,7 +34,7 @@ private: RenderList * render_list =nullptr; MaterialInstance * material_instance =nullptr; - Renderable *render_instance =nullptr; + Renderable * render_obj =nullptr; Pipeline * pipeline =nullptr; @@ -63,9 +63,9 @@ private: if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); - render_instance=db->CreateRenderable(primitive,material_instance,pipeline); + render_obj=db->CreateRenderable(primitive,material_instance,pipeline); - render_root.CreateSubNode(render_instance); + render_root.CreateSubNode(render_obj); render_root.RefreshMatrix(); diff --git a/inc/hgl/graph/font/TextLayout.h b/inc/hgl/graph/font/TextLayout.h index 1a3da046..6796f1f5 100644 --- a/inc/hgl/graph/font/TextLayout.h +++ b/inc/hgl/graph/font/TextLayout.h @@ -142,7 +142,7 @@ namespace hgl protected: - TextPrimitive *text_render_obj; + TextPrimitive *text_primitive; MemBlock vertex; MemBlock tex_coord; @@ -153,7 +153,7 @@ namespace hgl direction.text_direction=0; draw_chars_count=0; - text_render_obj =nullptr; + text_primitive =nullptr; } virtual ~TextLayout()=default; diff --git a/inc/hgl/graph/font/TextRender.h b/inc/hgl/graph/font/TextRender.h index 90c4ed13..cdf99e74 100644 --- a/inc/hgl/graph/font/TextRender.h +++ b/inc/hgl/graph/font/TextRender.h @@ -58,7 +58,7 @@ namespace hgl bool Layout(TextPrimitive *tr,const UTF16String &str); - Renderable *CreateRenderable(TextPrimitive *text_render_obj); + Renderable *CreateRenderable(TextPrimitive *text_primitive); void Release(TextPrimitive *); };//class TextRender diff --git a/src/SceneGraph/font/TextRender.cpp b/src/SceneGraph/font/TextRender.cpp index 3b46e222..c5c51664 100644 --- a/src/SceneGraph/font/TextRender.cpp +++ b/src/SceneGraph/font/TextRender.cpp @@ -174,9 +174,9 @@ namespace hgl return true; } - Renderable *TextRender::CreateRenderable(TextPrimitive *text_render_obj) + Renderable *TextRender::CreateRenderable(TextPrimitive *text_primitive) { - return db->CreateRenderable(text_render_obj,material_instance,pipeline); + return db->CreateRenderable(text_primitive,material_instance,pipeline); } void TextRender::Release(TextPrimitive *tr)