aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-26 00:36:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Replace Win32 calls by NeL methods

Browse source
This commit is contained in:
kervala 2016-12-10 19:46:51 +01:00
parent 98544addc3
commit f3fae4fc60
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
code/nel/tools/3d/object_viewer/particle_workspace.cpp
View file

@ -276,16 +276,7 @@ void CParticleWorkspace::CNode::savePSAs(const std::string &fullPath) throw(NLMI
std::string CParticleWorkspace::CNode::getFullPath() const std::string CParticleWorkspace::CNode::getFullPath() const
{ {
nlassert(_WS); nlassert(_WS);
char fullPath[MAX_PATH]; return NLMISC::CPath::makePathAbsolute(_RelativePath, _WS->getPath(), true);
std::string basePath = NLMISC::CPath::standardizeDosPath(_WS->getPath());
if (PathCombine(fullPath, basePath.c_str(), _RelativePath.c_str()))
{
return fullPath;
}
else
{
return _RelativePath.c_str();
}
} }
//*********************************************************************************************** //***********************************************************************************************
@ -374,17 +365,19 @@ CParticleWorkspace::CNode *CParticleWorkspace::addNode(const std::string &filena
for(uint k = 0; k < _Nodes.size(); ++k) for(uint k = 0; k < _Nodes.size(); ++k)
{ {
if (NLMISC::nlstricmp(_Nodes[k]->getFilename(), fileName) == 0) return NULL; if (NLMISC::nlstricmp(_Nodes[k]->getFilename(), fileName) == 0) return NULL;
} }
char resultPath[MAX_PATH];
// TODO: replace with NeL methods
TCHAR resultPath[MAX_PATH];
std::string dosPath = NLMISC::CPath::standardizeDosPath(getPath()); std::string dosPath = NLMISC::CPath::standardizeDosPath(getPath());
std::string relativePath; std::string relativePath;
if (!PathRelativePathTo(resultPath, dosPath.c_str(), FILE_ATTRIBUTE_DIRECTORY, filenameWithFullPath.c_str(), 0)) if (!PathRelativePathTo(resultPath, utf8ToTStr(dosPath), FILE_ATTRIBUTE_DIRECTORY, utf8ToTStr(filenameWithFullPath), 0))
{ {
relativePath = filenameWithFullPath; relativePath = filenameWithFullPath;
} }
else else
{ {
relativePath = resultPath; relativePath = tStrToUtf8(resultPath);
} }
if (relativePath.size() >= 2) if (relativePath.size() >= 2)