hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use os_char instead char in Font()

Browse Source
This commit is contained in:
hyzboy 2020-07-28 16:34:29 +08:00
parent bd811a009c
commit 488f16483c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/hgl/graph/font/Font.h
View File

@ -1,19 +1,20 @@
#ifndef HGL_GRAPH_FONT_INCLUDE #ifndef HGL_GRAPH_FONT_INCLUDE
#define HGL_GRAPH_FONT_INCLUDE #define HGL_GRAPH_FONT_INCLUDE
#include<hgl/CompOperator.h> #include<hgl/type/DataType.h>
#include<string.h>
namespace hgl namespace hgl
{ {
namespace graph namespace graph
{ {
constexpr size_t MAX_FONT_NAME_LENGTH=128;
/** /**
* 字体信息 * 字体信息
*/ */
struct Font struct Font
{ {
os_char name[128]; ///<字体名称 os_char name[MAX_FONT_NAME_LENGTH]; ///<字体名称
int width; ///<宽度 int width; ///<宽度
int height; ///<高度 int height; ///<高度
@ -26,7 +27,7 @@ namespace hgl
public: public:
Font(); Font();
Font(const char *,int,int,bool,bool,bool=true); Font(const os_char *,int,int,bool,bool,bool=true);
CompOperatorMemcmp(const Font &); ///<比较操作符重载 CompOperatorMemcmp(const Font &); ///<比较操作符重载
};//struct Font };//struct Font

5
src/SceneGraph/font/Font.cpp
View File

@ -1,4 +1,5 @@
#include<hgl/graph/font/Font.h> #include<hgl/graph/font/Font.h>
#include<hgl/type/StrChar.h>
namespace hgl namespace hgl
{ {
@ -9,11 +10,11 @@ namespace hgl
memset(this,0,sizeof(Font)); memset(this,0,sizeof(Font));
} }
Font::Font(const char *n,int w,int h,bool b,bool i,bool aa) Font::Font(const os_char *n,int w,int h,bool b,bool i,bool aa)
{ {
memset(this,0,sizeof(Font)); memset(this,0,sizeof(Font));
strcpy(name,n); hgl::strcpy(name,MAX_FONT_NAME_LENGTH,n);
width=w; width=w;
height=h; height=h;