Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'utf8_build_files' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-utf8_build_files

Browse Source
This commit is contained in:
Wojciech Figat
2023-06-23 21:18:14 +02:00
parent 7b34ddc089 83485d2f52
commit c37aee0a27
3 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Editor/Editor.cpp
+7 -7
View File
@@ -184,7 +184,7 @@ bool Editor::CheckProjectUpgrade()
" BuildNativeCode = false;\n"
" }}\n"
"}}\n"
), codeName), Encoding::Unicode);
), codeName), Encoding::UTF8);
if (useEditorModule)
{
File::WriteAllText(gameEditorModuleFolder / String::Format(TEXT("{0}Editor.Build.cs"), codeName), String::Format(TEXT(
@@ -211,7 +211,7 @@ bool Editor::CheckProjectUpgrade()
" BuildNativeCode = false;\n"
" }}\n"
"}}\n"
), codeName), Encoding::Unicode);
), codeName), Encoding::UTF8);
}
// Generate target files
@@ -229,7 +229,7 @@ bool Editor::CheckProjectUpgrade()
" Modules.Add(\"{0}\");\n"
" }}\n"
"}}\n"
), codeName), Encoding::Unicode);
), codeName), Encoding::UTF8);
const String editorTargetGameEditorModule = useEditorModule ? String::Format(TEXT(" Modules.Add(\"{0}Editor\");\n"), codeName) : String::Empty;
File::WriteAllText(sourceFolder / String::Format(TEXT("{0}EditorTarget.Build.cs"), codeName), String::Format(TEXT(
"using Flax.Build;\n"
@@ -246,7 +246,7 @@ bool Editor::CheckProjectUpgrade()
"{1}"
" }}\n"
"}}\n"
), codeName, editorTargetGameEditorModule), Encoding::Unicode);
), codeName, editorTargetGameEditorModule), Encoding::UTF8);
// Generate new project file
Project->ProjectPath = root / String::Format(TEXT("{0}.flaxproj"), codeName);
@@ -454,7 +454,7 @@ int32 Editor::LoadProduct()
" // Reference the modules for game\n"
" Modules.Add(\"Game\");\n"
" }\n"
"}\n"), Encoding::Unicode);
"}\n"), Encoding::UTF8);
failed |= File::WriteAllText(projectPath / TEXT("Source/GameEditorTarget.Build.cs"),TEXT(
"using Flax.Build;\n"
"\n"
@@ -468,7 +468,7 @@ int32 Editor::LoadProduct()
" // Reference the modules for editor\n"
" Modules.Add(\"Game\");\n"
" }\n"
"}\n"), Encoding::Unicode);
"}\n"), Encoding::UTF8);
failed |= File::WriteAllText(projectPath / TEXT("Source/Game/Game.Build.cs"),TEXT(
"using Flax.Build;\n"
"using Flax.Build.NativeCpp;\n"
@@ -496,7 +496,7 @@ int32 Editor::LoadProduct()
" // To add C++ define use: options.PublicDefinitions.Add(\"COMPILE_WITH_FLAX\");\n"
" // To learn more see scripting documentation.\n"
" }\n"
"}\n"), Encoding::Unicode);
"}\n"), Encoding::UTF8);
if (failed)
return 12;
}
Source/Engine/Core/Encoding.h
+1 -1
View File
@@ -4,4 +4,4 @@
#include "Enums.h"
DECLARE_ENUM_3(Encoding, ANSI, Unicode, UnicodeBigEndian);
DECLARE_ENUM_4(Encoding, ANSI, Unicode, UnicodeBigEndian, UTF8);
Source/Engine/Platform/Base/FileBase.cpp
+39
View File
@@ -309,6 +309,45 @@ bool FileBase::WriteAllText(const StringView& path, const Char* data, int32 leng
return WriteAllBytes(path, tmp.Get(), tmp.Count());
}
case Encoding::UTF8:
{
Array<byte> tmp;
tmp.SetCapacity(length);
for (int i=0; i<length; ++i)
{
Char c = data[i];
if (c < 0x0080)
{
tmp.Add((byte)c);
}
else if (c < 0x0800)
{
tmp.Add(0xC0 | (c >> 6));
tmp.Add(0x80 | (c & 0x3F));
}
else if (c < 0xD800 || c >= 0xE000)
{
tmp.Add(0xE0 | (c >> 12));
tmp.Add(0x80 | ((c >> 6) & 0x3F));
tmp.Add(0x80 | (c & 0x3F));
}
else // Surrogate pair
{
++i;
if (i >= length)
return true;
uint32 p = 0x10000 + (((c & 0x3FF) << 10) | (data[i] & 0x3FF));
tmp.Add(0xF0 | (p >> 18));
tmp.Add(0x80 | ((p >> 12) & 0x3F));
tmp.Add(0x80 | ((p >> 6) & 0x3F));
tmp.Add(0x80 | (p & 0x3F));
}
}
return WriteAllBytes(path, tmp.Get(), tmp.Count());
}
default:
return true;
}