|
|
@ -41,7 +41,7 @@ namespace Misc
|
|
|
|
for (const auto& path : filepath)
|
|
|
|
for (const auto& path : filepath)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
#ifdef OSG_USE_UTF8_FILENAME
|
|
|
|
#ifdef OSG_USE_UTF8_FILENAME
|
|
|
|
std::filesystem::path osgPath{ stringToU8String(path) };
|
|
|
|
std::filesystem::path osgPath{ StringUtils::stringToU8String(path) };
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
std::filesystem::path osgPath{ path };
|
|
|
|
std::filesystem::path osgPath{ path };
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
@ -52,7 +52,7 @@ namespace Misc
|
|
|
|
{
|
|
|
|
{
|
|
|
|
osgPath = osgPath.parent_path();
|
|
|
|
osgPath = osgPath.parent_path();
|
|
|
|
#ifdef OSG_USE_UTF8_FILENAME
|
|
|
|
#ifdef OSG_USE_UTF8_FILENAME
|
|
|
|
std::string extraPath = u8StringToString(osgPath.u8string_view());
|
|
|
|
std::string extraPath = StringUtils::u8StringToString(osgPath.u8string());
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
std::string extraPath = osgPath.string();
|
|
|
|
std::string extraPath = osgPath.string();
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
@ -67,7 +67,7 @@ namespace Misc
|
|
|
|
if (std::find_if(availableOSGPlugins.begin(), availableOSGPlugins.end(),
|
|
|
|
if (std::find_if(availableOSGPlugins.begin(), availableOSGPlugins.end(),
|
|
|
|
[&](std::string_view availablePlugin) {
|
|
|
|
[&](std::string_view availablePlugin) {
|
|
|
|
#ifdef OSG_USE_UTF8_FILENAME
|
|
|
|
#ifdef OSG_USE_UTF8_FILENAME
|
|
|
|
std::filesystem::path pluginPath{ stringToU8String(availablePlugin) };
|
|
|
|
std::filesystem::path pluginPath{ StringUtils::stringToU8String(availablePlugin) };
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
std::filesystem::path pluginPath {availablePlugin};
|
|
|
|
std::filesystem::path pluginPath {availablePlugin};
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|