mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 13:10:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert file path construction behavior to not strip forward slashes from prefix so it can be utilized to change output directory

Browse Source
This commit is contained in:
Rye Mutt 2021-04-27 15:11:03 -04:00
parent 461f66a9a0
commit da64ccf87f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/EmberCommon/EmberCommon.h
View File

@ -347,13 +347,13 @@ static string MakeSingleFilename(const string& path, const string& out, const st
} }
else if (useFinalName) else if (useFinalName)
{ {
filename = path + CleanPath(prefix + finalName + suffix + "." + format); filename = path + prefix + CleanPath(finalName + suffix + "." + format);
} }
else else
{ {
ostringstream fnstream; ostringstream fnstream;
fnstream << prefix << setfill('0') << setprecision(0) << fixed << setw(padding) << i << suffix << "." << format; fnstream << setfill('0') << setprecision(0) << fixed << setw(padding) << i << suffix << "." << format;
filename = path + CleanPath(fnstream.str()); filename = path + prefix + CleanPath(fnstream.str());
} }
return filename; return filename;
@ -371,8 +371,8 @@ static string MakeSingleFilename(const string& path, const string& out, const st
static string MakeAnimFilename(const string& path, const string& prefix, const string& suffix, const string& format, glm::uint padding, size_t ftime) static string MakeAnimFilename(const string& path, const string& prefix, const string& suffix, const string& format, glm::uint padding, size_t ftime)
{ {
ostringstream fnstream; ostringstream fnstream;
fnstream << prefix << setfill('0') << setprecision(0) << fixed << setw(padding) << ftime << suffix << format; fnstream << setfill('0') << setprecision(0) << fixed << setw(padding) << ftime << suffix << format;
return path + CleanPath(fnstream.str()); return path + prefix + CleanPath(fnstream.str());
} }
/// <summary> /// <summary>