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

convert tabs to spaces

Browse Source
This commit is contained in:
hyzboy 2020-07-29 15:24:41 +08:00
parent 99e6abd89a
commit 093fa93825
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 2f3f7bf6b3d6a9ea540ba01d5b4a3de9cba83442
Subproject commit 57a355602415294de7bcfdca9bd935db5b484388

34
inc/hgl/graph/TileData.h
View File

@ -38,34 +38,34 @@ namespace hgl
uint tile_width,tile_height; ///<Tile的宽和高
uint32_t tile_bytes; ///<一个tile字节数
uint tile_count,tile_max_count; ///<当前Tile数量与最大数量
uint tile_rows,tile_cols; ///<贴图中可用的Tile行数和列数
uint tile_count,tile_max_count; ///<当前Tile数量与最大数量
uint tile_rows,tile_cols; ///<贴图中可用的Tile行数和列数
protected:
bool WriteTile(TileObject *,const void *,const uint,const int,const int); ///<写入一个Tile数据
bool WriteTile(TileObject *,const void *,const uint,const int,const int); ///<写入一个Tile数据
public:
public:
int GetWidth ()const{return tile_width;} ///<取得Tile宽
int GetHeight ()const{return tile_height;} ///<取得Tile高
int GetCount ()const{return tile_count;} ///<取得Tile数量
int GetMaxCount ()const{return tile_max_count;} ///<取得Tile最大数量
int GetFreeCount()const{return tile_max_count-tile_count;} ///<取得空余Tile数量
int GetWidth ()const{return tile_width;} ///<取得Tile宽
int GetHeight ()const{return tile_height;} ///<取得Tile高
int GetCount ()const{return tile_count;} ///<取得Tile数量
int GetMaxCount ()const{return tile_max_count;} ///<取得Tile最大数量
int GetFreeCount()const{return tile_max_count-tile_count;} ///<取得空余Tile数量
Texture2D * GetTexture ()const{return tile_texture;} ///<取得贴图
Texture2D * GetTexture ()const{return tile_texture;} ///<取得贴图
public:
TileData(Device *,Texture2D *,const uint tw,const uint th);
virtual ~TileData();
TileData(Device *,Texture2D *,const uint tw,const uint th);
virtual ~TileData();
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
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

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

@ -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