Commit 883db0f0 authored by hybrid's avatar hybrid

Make sure our path names use '/' instead of '\\'

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2913 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 76c4b0f8
Changes in 1.7 Changes in 1.7
- Fix adding archives twice, which caused multiple archives of the same name and type covering each other. This one required a texture name change from using backslashes to slahes under Windows.
- Give access to texture mipmaps. You can provide custom mipmap textures upon generation, regeneration, and locking.
Make sure the provided data is large enough and covers all miplevels. Also the returned pointer (from lock) will only cover the smaller data of the mipmap level dimension chosen (level 0 is the original texture).
- Separate TextureWrap mode into U and V fields - Separate TextureWrap mode into U and V fields
- Add mirror texture wrap modes - Add mirror texture wrap modes
......
...@@ -436,21 +436,24 @@ bool CFileSystem::changeWorkingDirectoryTo(const io::path& newDirectory) ...@@ -436,21 +436,24 @@ bool CFileSystem::changeWorkingDirectoryTo(const io::path& newDirectory)
io::path CFileSystem::getAbsolutePath(const io::path& filename) const io::path CFileSystem::getAbsolutePath(const io::path& filename) const
{ {
#if defined(_IRR_WINDOWS_API_) && !defined(_IRR_WINDOWS_CE_PLATFORM_)
fschar_t *p=0; fschar_t *p=0;
#if defined(_IRR_WINDOWS_CE_PLATFORM_)
return filename;
#elif defined(_IRR_WINDOWS_API_)
#if defined(_IRR_WCHAR_FILESYSTEM ) #if defined(_IRR_WCHAR_FILESYSTEM )
wchar_t fpath[_MAX_PATH]; wchar_t fpath[_MAX_PATH];
p = _wfullpath(fpath, filename.c_str(), _MAX_PATH); p = _wfullpath(fpath, filename.c_str(), _MAX_PATH);
core::stringw tmp(p);
tmp.replace(L'\\', L'/');
#else #else
c8 fpath[_MAX_PATH]; c8 fpath[_MAX_PATH];
p = _fullpath(fpath, filename.c_str(), _MAX_PATH); p = _fullpath(fpath, filename.c_str(), _MAX_PATH);
core::stringc tmp(p);
tmp.replace('\\', '/');
#endif #endif
return tmp;
#elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_)) #elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_))
c8* p=0;
c8 fpath[4096]; c8 fpath[4096];
fpath[0]=0; fpath[0]=0;
p = realpath(filename.c_str(), fpath); p = realpath(filename.c_str(), fpath);
...@@ -471,7 +474,7 @@ io::path CFileSystem::getAbsolutePath(const io::path& filename) const ...@@ -471,7 +474,7 @@ io::path CFileSystem::getAbsolutePath(const io::path& filename) const
#endif #endif
return io::path(p); return io::path(filename);
} }
......
Test suite pass at GMT Fri Nov 20 16:53:27 2009 Test suite pass at GMT Sat Nov 21 23:41:55 2009
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment