v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ConvertPath() to UriDecodePath()

pull/2711/head
RichardTea 2019-10-14 11:27:34 +01:00
parent 5e84889724
commit 6a6ccc0fb0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Collada/ColladaLoader.cpp
View File

@ -1763,7 +1763,7 @@ aiString ColladaLoader::FindFilenameForEffectTexture(const ColladaParser& pParse
//set default texture file name //set default texture file name
result.Set(name + ".jpg"); result.Set(name + ".jpg");
ColladaParser::ConvertPath(result); ColladaParser::UriDecodePath(result);
return result; return result;
} }

8
code/Collada/ColladaParser.cpp
View File

@ -184,7 +184,7 @@ std::string ColladaParser::ReadZaeManifest(ZipArchiveIOSystem &zip_archive) {
return std::string(); return std::string();
aiString ai_str(filepath); aiString ai_str(filepath);
ConvertPath(ai_str); UriDecodePath(ai_str);
return std::string(ai_str.C_Str()); return std::string(ai_str.C_Str());
} }
@ -195,7 +195,7 @@ std::string ColladaParser::ReadZaeManifest(ZipArchiveIOSystem &zip_archive) {
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Convert a path read from a collada file to the usual representation // Convert a path read from a collada file to the usual representation
void ColladaParser::ConvertPath(aiString& ss) void ColladaParser::UriDecodePath(aiString& ss)
{ {
// TODO: collada spec, p 22. Handle URI correctly. // TODO: collada spec, p 22. Handle URI correctly.
// For the moment we're just stripping the file:// away to make it work. // For the moment we're just stripping the file:// away to make it work.
@ -1176,7 +1176,7 @@ void ColladaParser::ReadImage(Collada::Image& pImage)
if (sz) if (sz)
{ {
aiString filepath(sz); aiString filepath(sz);
ConvertPath(filepath); UriDecodePath(filepath);
pImage.mFileName = filepath.C_Str(); pImage.mFileName = filepath.C_Str();
} }
TestClosing("init_from"); TestClosing("init_from");
@ -1214,7 +1214,7 @@ void ColladaParser::ReadImage(Collada::Image& pImage)
if (sz) if (sz)
{ {
aiString filepath(sz); aiString filepath(sz);
ConvertPath(filepath); UriDecodePath(filepath);
pImage.mFileName = filepath.C_Str(); pImage.mFileName = filepath.C_Str();
} }
TestClosing("ref"); TestClosing("ref");

2
code/Collada/ColladaParser.h
View File

@ -67,7 +67,7 @@ namespace Assimp
friend class ColladaLoader; friend class ColladaLoader;
/** Converts a path read from a collada file to the usual representation */ /** Converts a path read from a collada file to the usual representation */
static void ConvertPath(aiString& ss); static void UriDecodePath(aiString& ss);
protected: protected:
/** Map for generic metadata as aiString */ /** Map for generic metadata as aiString */