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

--User changes

Browse Source 
-Remove --time option for EmberAnimate, it was redundant with --frame.
 -Make --enable_jpg_comments and --enable_png_comments just be bools that when present mean true, rather than having to specify =true.
 -Add a new argument --ts for EmberAnimate to allow the user to specify the temporal samples value to use for the entire animation. Useful for testing.

--Bug fixes
 -Properly seed rands in EmberAnimate when specifying --isaac_seed and using more than one device with --opencl.

--Code changes
 --Small cleanup to flatten/unflatten all code.
 --Make EmberOptionEntry<T>::operator() return a const reference instead of a copy.
This commit is contained in:
mfeemster
2016-05-05 16:11:30 -07:00
parent 95a71ea6d7
commit b5341c7d79
3 changed files with 50 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Source/EmberAnimate/EmberAnimate.cpp
View File

@ -78,8 +78,25 @@ bool EmberAnimate(EmberOptions& opt)
opt.ThreadCount(1);
for (auto& r : renderers)
r->ThreadCount(opt.ThreadCount(), opt.IsaacSeed() != "" ? opt.IsaacSeed().c_str() : nullptr);
if (opt.IsaacSeed().empty())
{
for (auto& r : renderers)
r->ThreadCount(opt.ThreadCount(), nullptr);
}
else
{
for (i = 0; i < renderers.size(); i++)
{
string ns;
auto& is = opt.IsaacSeed();
ns.reserve(is.size());
for (auto& c : is)
ns.push_back(c + char(i * opt.ThreadCount()));
renderers[i]->ThreadCount(opt.ThreadCount(), ns.c_str());
}
}
if (opt.BitsPerChannel() != 8)
{
@ -167,34 +184,16 @@ bool EmberAnimate(EmberOptions& opt)
opt.Dtime(1);
}
if (opt.Frame())
if (opt.Frame() != UINT_MAX)
{
if (opt.Time())
{
cout << "Cannot specify both time and frame.\n";
return false;
}
if (opt.FirstFrame() || opt.LastFrame())
if (opt.FirstFrame() != UINT_MAX || opt.LastFrame() != UINT_MAX)
{
cout << "Cannot specify both frame and begin or end.\n";
return false;
}
opt.FirstFrame(opt.Frame());
opt.LastFrame(opt.Frame());
}
if (opt.Time())
{
if (opt.FirstFrame() || opt.LastFrame())
{
cout << "Cannot specify both time and begin or end.\n";
return false;
}
opt.FirstFrame(opt.Time());
opt.LastFrame(opt.Time());
opt.LastFrame(opt.Frame() + 1);
}
//Prep all embers, by ensuring they:
@ -222,6 +221,9 @@ bool EmberAnimate(EmberOptions& opt)
if (opt.Supersample() > 0)
embers[i].m_Supersample = opt.Supersample();
if (opt.TemporalSamples() > 0)
embers[i].m_TemporalSamples = opt.TemporalSamples();
if (opt.Quality() > 0)
embers[i].m_Quality = T(opt.Quality());
@ -270,7 +272,7 @@ bool EmberAnimate(EmberOptions& opt)
std::sort(embers.begin(), embers.end(), &CompareEmbers<T>);
}
if (!opt.Time() && !opt.Frame())
if (opt.Frame() == UINT_MAX)
{
if (opt.FirstFrame() == UINT_MAX)
opt.FirstFrame(size_t(embers[0].m_Time));
@ -280,12 +282,6 @@ bool EmberAnimate(EmberOptions& opt)
opt.FirstFrame() + opt.Dtime()));//Make sure the final value is at least first frame + dtime.
}
if (!opt.Out().empty())
{
cout << "Single output file " << opt.Out() << " specified for multiple images. They would be all overwritten and only the last image will remain, exiting.\n";
return false;
}
//Final setup steps before running.
padding = uint(std::log10(double(embers.size()))) + 1;
@ -366,7 +362,7 @@ bool EmberAnimate(EmberOptions& opt)
if ((renderer->Run(finalImages[finalImageIndex], localTime) != eRenderStatus::RENDER_OK) || renderer->Aborted() || finalImages[finalImageIndex].empty())
{
cout << "Error: image rendering failed, skipping to next image.\n";
cout << "Error: image rendering failed, aborting.\n";
renderer->DumpErrorReport();//Something went wrong, print errors.
atomfTime.store(opt.LastFrame() + 1);//Abort all threads if any of them encounter an error.
break;