GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UTF-8 and UTF-16 encoding support usage in Json resources

Browse Source 
Closes #310
Closes #27
This commit is contained in:
Wojtek Figat
2021-03-07 21:30:01 +01:00
parent 400cc97100
commit 77b21de534
16 changed files with 186 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Serialization/JsonTools.h
View File

@@ -358,9 +358,9 @@ public:
FORCE_INLINE static void GetString(String& result, const Value& node, const char* name)
{
const auto member = node.FindMember(name);
if (member != node.MemberEnd() && member->value.IsString())
if (member != node.MemberEnd())
{
result.Set(member->value.GetString(), member->value.GetStringLength());
result = member->value.GetText();
}
}

13
Source/Engine/Serialization/JsonWriter.h
View File

@@ -73,21 +73,20 @@ public:
void String(const Char* str)
{
const int32 length = StringUtils::Length(str);
const StringAsANSI<256> buf(str, length);
String(buf.Get(), length);
const StringAsUTF8<256> buf(str);
String(buf.Get());
}
void String(const Char* str, const int32 length)
{
const StringAsANSI<256> buf(str, length);
String(buf.Get(), length);
const StringAsUTF8<256> buf(str, length);
String(buf.Get());
}
void String(const ::String& value)
{
const StringAsANSI<256> buf(*value, value.Length());
String(buf.Get(), value.Length());
const StringAsUTF8<256> buf(*value, value.Length());
String(buf.Get());
}
FORCE_INLINE void RawValue(const StringAnsi& str)