added ToAnsiString functions at Windows platform.
This commit is contained in:
parent
58c8f1db90
commit
45e8725f36
@ -285,8 +285,15 @@ namespace hgl
|
|||||||
{
|
{
|
||||||
return to_u8(ws.c_str(),ws.Length());
|
return to_u8(ws.c_str(),ws.Length());
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HGL_OS == HGL_OS_Windows
|
#if HGL_OS == HGL_OS_Windows
|
||||||
|
AnsiString ToAnsiString(const CharSet &cs,const UTF16String &str);
|
||||||
|
inline AnsiString ToAnsiString(const UTF16String &str)
|
||||||
|
{
|
||||||
|
const CharSet cs((uint16)0);
|
||||||
|
|
||||||
|
return ToAnsiString(cs,str);
|
||||||
|
}
|
||||||
|
|
||||||
inline OSString ToOSString(const u8char *str){return to_u16(str);}
|
inline OSString ToOSString(const u8char *str){return to_u16(str);}
|
||||||
inline OSString ToOSString(const UTF8String &str){return to_u16(str.c_str(), (int)(str.Length()));}
|
inline OSString ToOSString(const UTF8String &str){return to_u16(str.c_str(), (int)(str.Length()));}
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ namespace hgl
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据一个C指针风格字符串设置当前字符串内容(传入的str需要delete[])
|
* 根据一个C指针风格字符串设置当前字符串内容(传入的str会被复制一份,所以需要传入者自行delete[])
|
||||||
* @param str 字符串内容,在len<0的情况下,需以0为结尾
|
* @param str 字符串内容,在len<0的情况下,需以0为结尾
|
||||||
* @param len 字符串长度,如果str以0为结尾,可以为负值,将启用自动计算长度
|
* @param len 字符串长度,如果str以0为结尾,可以为负值,将启用自动计算长度
|
||||||
*/
|
*/
|
||||||
|
@ -25,12 +25,12 @@ namespace hgl
|
|||||||
b=nb;
|
b=nb;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
r+=(nr-r)*pos;
|
r+=(nr-r)*pos;
|
||||||
g+=(ng-g)*pos;
|
g+=(ng-g)*pos;
|
||||||
b+=(nb-b)*pos;
|
b+=(nb-b)*pos;
|
||||||
}
|
}
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void Color3f::Grey(float v1,float v2,float v3)
|
void Color3f::Grey(float v1,float v2,float v3)
|
||||||
{
|
{
|
||||||
float lum=RGB2Lum(v1,v2,v3);
|
float lum=RGB2Lum(v1,v2,v3);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user