diff --git a/CMSceneGraph b/CMSceneGraph index 2f3f7bf6..57a35560 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 2f3f7bf6b3d6a9ea540ba01d5b4a3de9cba83442 +Subproject commit 57a355602415294de7bcfdca9bd935db5b484388 diff --git a/inc/hgl/graph/TileData.h b/inc/hgl/graph/TileData.h index eaa1ca21..6bfb66e9 100644 --- a/inc/hgl/graph/TileData.h +++ b/inc/hgl/graph/TileData.h @@ -38,34 +38,34 @@ namespace hgl uint tile_width,tile_height; ///Add(bmp->data,bmp->total_bytes,bmp->width,bmp->height);} ///<增加一个Tile + TileObject *Add(const void *,const uint,const int=-1,const int=-1); ///<增加一个Tile + TileObject *Add(BitmapData *bmp){return this->Add(bmp->data,bmp->total_bytes,bmp->width,bmp->height);} ///<增加一个Tile - bool Delete(TileObject *); ///<删除一个Tile - bool Change(TileObject *,const void *,const uint,const int=-1,const int=-1); ///<更改一个Tile的数据内容 - void Clear(); ///<清除Tile数据 + bool Delete(TileObject *); ///<删除一个Tile + bool Change(TileObject *,const void *,const uint,const int=-1,const int=-1); ///<更改一个Tile的数据内容 + void Clear(); ///<清除Tile数据 };//class TileData }//namespace graph }//namespace hgl diff --git a/src/SceneGraph/font/Font.cpp b/src/SceneGraph/font/Font.cpp index 4c0fbcca..2da8a858 100644 --- a/src/SceneGraph/font/Font.cpp +++ b/src/SceneGraph/font/Font.cpp @@ -3,26 +3,26 @@ namespace hgl { - namespace graph - { - Font::Font() - { - memset(this,0,sizeof(Font)); - } - - Font::Font(const os_char *n,int w,int h,bool b,bool i,bool aa) - { - memset(this,0,sizeof(Font)); + namespace graph + { + Font::Font() + { + memset(this,0,sizeof(Font)); + } + + Font::Font(const os_char *n,int w,int h,bool b,bool i,bool aa) + { + memset(this,0,sizeof(Font)); - hgl::strcpy(name,MAX_FONT_NAME_LENGTH,n); + hgl::strcpy(name,MAX_FONT_NAME_LENGTH,n); - width=w; - height=h; + width=w; + height=h; - bold=b; - italic=i; + bold=b; + italic=i; - anti=aa; - } - }//namespace graph + anti=aa; + } + }//namespace graph }//namespace hgl