diff --git a/inc/hgl/TypeFunc.h b/inc/hgl/TypeFunc.h index a4861a1..09edf30 100644 --- a/inc/hgl/TypeFunc.h +++ b/inc/hgl/TypeFunc.h @@ -6,6 +6,7 @@ namespace hgl { #define HGL_OFFICAL_WEB "www.hyzgame.com" + #define HGL_OFFICAL_WEB_U8 u8"www.hyzgame.com" #define ENUM_CLASS_RANGE(begin,end) BEGIN_RANGE=begin,END_RANGE=end,RANGE_SIZE=(END_RANGE-BEGIN_RANGE)+1 diff --git a/inc/hgl/filesystem/FileSystem.h b/inc/hgl/filesystem/FileSystem.h index 88bb551..bf34479 100644 --- a/inc/hgl/filesystem/FileSystem.h +++ b/inc/hgl/filesystem/FileSystem.h @@ -73,12 +73,25 @@ namespace hgl if(filename.Length()<=1) return(String()); - const int pos=filename.FindRightChar(split_char); + const T spear_char[] = { '/','\\' }; - if(pos==-1) - return String(filename); + const int dot=filename.FindRightChar(split_char); + const int pos=filename.FindRightChar(spear_char); - return filename.SubString(0,pos); + if(dot==-1) + { + if(pos==-1) + return String(filename); + else + return filename.SubString(pos+1); + } + else + { + if(pos==-1) + return filename.SubString(0,dot); + else + return filename.SubString(pos+1,dot-pos-1); + } } /** diff --git a/inc/hgl/type/StrChar.h b/inc/hgl/type/StrChar.h index cd30221..5618ff1 100644 --- a/inc/hgl/type/StrChar.h +++ b/inc/hgl/type/StrChar.h @@ -159,11 +159,13 @@ namespace hgl return(ch==0 ||ch==' ' //半角空格 ||ch==HGL_FULL_SPACE //全角空格 - ||ch=='\t' - ||ch=='\r' + ||ch=='\a' + ||ch=='\b' ||ch=='\f' - ||ch=='\v' - ||ch=='\n'); + ||ch=='\n' + ||ch=='\r' + ||ch=='\t' + ||ch=='\v'); } /** @@ -174,11 +176,13 @@ namespace hgl { return(ch==0 ||ch==' ' //半角空格 - ||ch=='\t' - ||ch=='\r' + ||ch=='\a' + ||ch=='\b' ||ch=='\f' - ||ch=='\v' - ||ch=='\n'); + ||ch=='\n' + ||ch=='\r' + ||ch=='\t' + ||ch=='\v'); } #ifdef char8_t @@ -187,11 +191,13 @@ namespace hgl { return(ch==0 ||ch==' ' //半角空格 - ||ch=='\t' - ||ch=='\r' + ||ch=='\a' + ||ch=='\b' ||ch=='\f' - ||ch=='\v' - ||ch=='\n'); + ||ch=='\n' + ||ch=='\r' + ||ch=='\t' + ||ch=='\v'); } #endif//char8_t