diff --git a/CMCore b/CMCore index 9a2368d7..53449b1d 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 9a2368d749699b67065646265110ba089a0264a4 +Subproject commit 53449b1d4c579efd6f8bd2de6b315cc0663a1ecd diff --git a/inc/hgl/graph/font/FontSource.h b/inc/hgl/graph/font/FontSource.h index 771e7f36..4b4cfbfa 100644 --- a/inc/hgl/graph/font/FontSource.h +++ b/inc/hgl/graph/font/FontSource.h @@ -46,7 +46,7 @@ namespace hgl bool begin_disable; ///<是否行首禁用符号 bool end_disable; ///<是否行尾禁用符号 - bool vrotate; ///<竖排时是否需要旋转 + bool vrotate; ///<竖排时是否需要旋转 };// /** @@ -62,7 +62,7 @@ namespace hgl };//struct CharLayoutAttributes using CLA=CharLayoutAttributes; - + /** * 文字位图数据源 */ diff --git a/inc/hgl/graph/font/TextLayout.h b/inc/hgl/graph/font/TextLayout.h index 30748e80..8144c1ac 100644 --- a/inc/hgl/graph/font/TextLayout.h +++ b/inc/hgl/graph/font/TextLayout.h @@ -56,7 +56,7 @@ namespace hgl /** * 文本排版属性 */ - struct TextLayoutAttributes + struct TextLayoutAttribute { FontSource * font_source =nullptr; ///<字符源 CharLayoutAttr *char_layout_attr =nullptr; ///<缺省字符排版属性 @@ -78,7 +78,9 @@ namespace hgl float tab_size =4.0f; ///BindSampler("lum_texture",tile_font->GetTexture(),sampler))return(false); + if(!mp->BindSampler("lum_texture",tile_font->GetTexture(),sampler))return(false); if(!mp->BindUBO("color_material",ubo_color))return(false); mp->Update();