mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-16 13:14:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-Make previous path related code work for all OSes.
This commit is contained in:
Person
2018-05-03 00:24:51 -07:00
parent ccf5a7e80f
commit dba1bdc6c8
5 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/EmberGenome/EmberGenome.cpp
View File

@ -43,7 +43,7 @@ void SetDefaultTestValues(Ember<T>& ember)
/// <param name="opt">A populated EmberOptions object which specifies all program options to be used</param>
/// <returns>True if success, else false.</returns>
template <typename T>
bool EmberGenome(EmberOptions& opt)
bool EmberGenome(int argc, _TCHAR* argv[], EmberOptions& opt)
{
auto info = OpenCLInfo::Instance();
std::cout.imbue(std::locale(""));
@ -193,6 +193,7 @@ bool EmberGenome(EmberOptions& opt)
unique_ptr<Renderer<T, float>> renderer(CreateRenderer<T>(opt.EmberCL() ? eRendererType::OPENCL_RENDERER : eRendererType::CPU_RENDERER, devices, false, 0, emberReport));
QTIsaac<ISAAC_SIZE, ISAAC_INT> rand(ISAAC_INT(t.Tic()), ISAAC_INT(t.Tic() * 2), ISAAC_INT(t.Tic() * 3));
vector<string> errorReport = emberReport.ErrorReport();
auto fullpath = GetExePath(argv[0]);
os.imbue(std::locale(""));
os2.imbue(std::locale(""));
@ -205,7 +206,7 @@ bool EmberGenome(EmberOptions& opt)
return false;
}
if (!InitPaletteList<float>(opt.PalettePath()))
if (!InitPaletteList<float>(fullpath, opt.PalettePath()))
return false;
if (!opt.EmberCL())
@ -870,10 +871,10 @@ int _tmain(int argc, _TCHAR* argv[])
#ifdef DO_DOUBLE
if (!opt.Sp())
b = EmberGenome<double>(opt);
b = EmberGenome<double>(argc, argv, opt);
else
#endif
b = EmberGenome<float>(opt);
b = EmberGenome<float>(argc, argv, opt);
}
return b ? 0 : 1;