diff --git a/example/2dVector/line.cpp b/example/2dVector/line.cpp index aec62c58..da5f181d 100644 --- a/example/2dVector/line.cpp +++ b/example/2dVector/line.cpp @@ -26,15 +26,11 @@ static Vector4f color(1,1,1,1); struct Line2DConfig { - float width; - float border; + float width=2.0f; + float border=0.75f; }; -static Line2DConfig line_2d_config -{ - 10, - 2.5 -}; +static Line2DConfig line_2d_config; class TestApp:public VulkanApplicationFramework { diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index 1865ebb0..3fcfa3c2 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -1,7 +1,4 @@ -// DrawTile -// 该示例使用TileData,演示多个tile图片在一张纹理上 - -#include +#include #include #include #include @@ -142,7 +139,7 @@ private: LoadStringFromTextFile(str,OS_TEXT("README.md")); text_render_obj=db->CreateTextRenderable(material_instance->GetMaterial()); - + if(tl_engine.SimpleLayout(text_render_obj,tile_font,str)<=0)return(false); render_instance=db->CreateRenderableInstance(text_render_obj,material_instance,pipeline); diff --git a/inc/hgl/graph/vulkan/VKDatabase.h b/inc/hgl/graph/vulkan/VKDatabase.h index aca440cb..9ef60112 100644 --- a/inc/hgl/graph/vulkan/VKDatabase.h +++ b/inc/hgl/graph/vulkan/VKDatabase.h @@ -78,13 +78,13 @@ public: // VBO/VAO #undef SCENE_DB_CREATE_FUNC - IndexBuffer *CreateIBO(IndexType index_type,uint32_t count,const void *data,SharingMode sm=SharingMode::Exclusive); - IndexBuffer *CreateIBO16(uint32_t count,const uint16 *data,SharingMode sm=SharingMode::Exclusive){return CreateIBO(IndexType::U16,count,(void *)data,sm);} - IndexBuffer *CreateIBO32(uint32_t count,const uint32 *data,SharingMode sm=SharingMode::Exclusive){return CreateIBO(IndexType::U32,count,(void *)data,sm);} + IndexBuffer *CreateIBO(IndexType index_type,uint32_t count,const void * data, SharingMode sm=SharingMode::Exclusive); + IndexBuffer *CreateIBO16( uint32_t count,const uint16 *data, SharingMode sm=SharingMode::Exclusive){return CreateIBO(IndexType::U16,count,(void *)data,sm);} + IndexBuffer *CreateIBO32( uint32_t count,const uint32 *data, SharingMode sm=SharingMode::Exclusive){return CreateIBO(IndexType::U32,count,(void *)data,sm);} IndexBuffer *CreateIBO(IndexType index_type,uint32_t count,SharingMode sm=SharingMode::Exclusive){return CreateIBO(index_type,count,nullptr,sm);} - IndexBuffer *CreateIBO16(uint32_t count,SharingMode sm=SharingMode::Exclusive){return CreateIBO(IndexType::U16,count,nullptr,sm);} - IndexBuffer *CreateIBO32(uint32_t count,SharingMode sm=SharingMode::Exclusive){return CreateIBO(IndexType::U32,count,nullptr,sm);} + IndexBuffer *CreateIBO16( uint32_t count,SharingMode sm=SharingMode::Exclusive){return CreateIBO(IndexType::U16,count,nullptr,sm);} + IndexBuffer *CreateIBO32( uint32_t count,SharingMode sm=SharingMode::Exclusive){return CreateIBO(IndexType::U32,count,nullptr,sm);} public: //Material @@ -98,10 +98,10 @@ public: //Material MaterialInstance * CreateMaterialInstance(Material *); MaterialInstance * CreateMaterialInstance(const OSString &); - Pipeline * CreatePipeline(Material *,RenderTarget *,PipelineData *,const Prim &prim=Prim::Triangles,const bool prim_restart=false); - Pipeline * CreatePipeline(MaterialInstance *,RenderTarget *,PipelineData *,const Prim &prim=Prim::Triangles,const bool prim_restart=false); - Pipeline * CreatePipeline(Material *,RenderTarget *,const OSString &,const Prim &prim=Prim::Triangles,const bool prim_restart=false); - Pipeline * CreatePipeline(MaterialInstance *,RenderTarget *,const OSString &,const Prim &prim=Prim::Triangles,const bool prim_restart=false); + Pipeline * CreatePipeline(Material *, RenderTarget *,PipelineData *, const Prim &prim=Prim::Triangles,const bool prim_restart=false); + Pipeline * CreatePipeline(MaterialInstance *, RenderTarget *,PipelineData *, const Prim &prim=Prim::Triangles,const bool prim_restart=false); + Pipeline * CreatePipeline(Material *, RenderTarget *,const OSString &,const Prim &prim=Prim::Triangles,const bool prim_restart=false); + Pipeline * CreatePipeline(MaterialInstance *, RenderTarget *,const OSString &,const Prim &prim=Prim::Triangles,const bool prim_restart=false); Renderable * CreateRenderable(const uint32_t vertex_count=0); TextRenderable * CreateTextRenderable(Material *);