mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30:06 -05:00
90ec5b8246
-Show common folder locations such as documents, downloads, pictures in the sidebar in all file dialogs. -Warning message about exceeding memory in final render dialog now suggests strips as the solution to the problem. -Strips now has a tooltip explaining what it does. -Allow more digits in the spinners on the color section the flame tab. -Add manually adjustable size spinners in the final render dialog. Percentage scale and absolute size are fully synced. -Default prefix in final render is now the filename when doing animations (coming from sequence section of the library tab). -Changed the elliptic variation back to using a less precise version for float, and a more precise version for double. The last release had it always using double. -New applied xaos table that shows a read-only view of actual weights by taking the base xform weights and multiplying them by the xaos values. -New table in the xaos tab that gives a graphical representation of the probability that each xform is chosen, with and without xaos. -Add button to transpose the xaos rows and columns. -Add support for importing .chaos files from Chaotica. --Pasting back to Chaotica will work for most, but not all, variations due to incompatible parameter names in some. -Curves are now splines instead of Bezier. This adds compatibility with Chaotica, but breaks it for Apophysis. Xmls are still pastable, but the color curves will look different. --The curve editor on the palette tab can now add points by clicking on the lines and remove points by clicking on the points themselves, just like Chaotica. --Splines are saved in four new xml fields: overall_curve, red_curve, green_curve and blue_curve. -Allow for specifying the percentage of a sub batch each thread should iterate through per kernel call when running with OpenCL. This gives a roughly 1% performance increase due to having to make less kernel calls while iterating. --This field is present for interactive editing (where it's not very useful) and in the final render dialog. --On the command line, this is specified as --sbpctth for EmberRender and EmberAnimate. -Allow double clicking to toggle the supersample field in the flame tab between 1 and 2 for easily checking the effect of the field. -When showing affine values as polar coordinates, show angles normalized to 360 to match Chaotica. -Fuse Count spinner now toggles between 15 and 100 when double clicking for easily checking the effect of the field. -Added field for limiting the range in the x and y direction that the initial points are chosen from. -Added a field called K2 which is an alternative way to set brightness, ignored when zero. --This has no effect for many variations, but hs a noticeable effect for some. -Added new variations: arcsech arcsech2 arcsinh arctanh asteria block bwraps_rand circlecrop2 coth_spiral crackle2 depth_blur depth_blur2 depth_gaussian depth_gaussian2 depth_ngon depth_ngon2 depth_sine depth_sine2 dragonfire dspherical dust excinis exp2 flipx flowerdb foci_p gaussian glynnia2 glynnsim4 glynnsim5 henon henon hex_rand hex_truchet hypershift lazyjess lens lozi lozi modulusx modulusy oscilloscope2 point_symmetry pointsymmetry projective pulse rotate scry2 shift smartshape spher squares starblur2 swirl3 swirl3r tanh_spiral target0 target2 tile_hlp truchet_glyph truchet_inv truchet_knot unicorngaloshen vibration vibration2 --hex_truchet, hex_rand should always use double. They are extremely sensitive. --Bug fixes: -Bounds sign was flipped for x coordinate of world space when center was not zero. -Right clicking and dragging spinner showed menu on mouse up, even if it was very far away. -Text boxes for size in final render dialog were hard to type in. Same bug as xform weight used to be so fix the same way. -Fix spelling to be plural in toggle color speed box. -Stop using the blank user palette to generate flames. Either put colored palettes in it, or exclude it from randoms. -Clicking the random palette button for a palette file with only one palette in it would freeze the program. -Clicking none scale in final render did not re-render the preview. -Use less precision on random xaos. No need for 12 decimal places. -The term sub batch is overloaded in the options dialog. Change the naming and tooltip of those settings for cpu and opencl. --Also made clear in the tooltip for the default opencl quality setting that the value is per device. -The arrows spinner in palette editor appears like a read-only label. Made it look like a spinner. -Fix border colors for various spin boxes and table headers in the style sheet. Requires reload. -Fix a bug in the bwraps variation which would produce different results than Chaotica and Apophysis. -Synth was allowed to be selected for random flame generation when using an Nvidia card but it shouldn't have been because Nvidia has a hard time compiling synth. -A casting bug in the OpenCL kernels for log scaling and density filtering was preventing successful compilations on Intel iGPUs. Fixed even though we don't support anything other than AMD and Nvidia. -Palette rotation (click and drag) position was not being reset when loading a new flame. -When the xform circles were hidden, opening and closing the options dialog would improperly reshow them. -Double click toggle was broken on integer spin boxes. -Fixed tab order of some controls. -Creating a palette from a jpg in the palette editor only produced a single color. --Needed to package imageformats/qjpeg.dll with the Windows installer. -The basic memory benchmark test flame was not really testing memory. Make it more spread out. -Remove the temporal samples field from the flame tab, it was never used because it's only an animation parameter which is specified in the final render dialog or on the command line with EmberAnimate. --Code changes: -Add IsEmpty() to Palette to determine if a palette is all black. -Attempt to avoid selecting a blank palette in PaletteList::GetRandomPalette(). -Add function ScanForChaosNodes() and some associated helper functions in XmlToEmber. -Make variation param name correction be case insensitive in XmlToEmber. -Report error when assigning a variation param value in XmlToEmber. -Add SubBatchPercentPerThread() method to RendererCL. -Override enterEvent() and leaveEvent() in DoubleSpinBox and SpinBox to prevent the context menu from showing up on right mouse up after already leaving the spinner. -Filtering the mouse wheel event in TableWidget no longer appears to be needed. It was probably an old Qt bug that has been fixed. -Gui/ember syncing code in the final render dialog needed to be reworked to accommodate absolute sizes.
573 lines
18 KiB
C++
573 lines
18 KiB
C++
#include "EmberCommonPch.h"
|
|
#include "EmberAnimate.h"
|
|
#include "JpegUtils.h"
|
|
|
|
using namespace EmberCommon;
|
|
|
|
/// <summary>
|
|
/// The core of the EmberAnimate.exe program.
|
|
/// Template argument expected to be float or double.
|
|
/// </summary>
|
|
/// <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 EmberAnimate(int argc, _TCHAR* argv[], EmberOptions& opt)
|
|
{
|
|
auto info = OpenCLInfo::Instance();
|
|
std::cout.imbue(std::locale(""));
|
|
|
|
if (opt.DumpArgs())
|
|
cout << opt.GetValues(eOptionUse::OPT_USE_ANIMATE) << "\n";
|
|
|
|
if (opt.OpenCLInfo())
|
|
{
|
|
cout << "\nOpenCL Info: \n";
|
|
cout << info->DumpInfo();
|
|
return true;
|
|
}
|
|
|
|
VerbosePrint("Using " << (sizeof(T) == sizeof(float) ? "single" : "double") << " precision.");
|
|
//Regular variables.
|
|
Timing t;
|
|
bool unsorted = false;
|
|
uint padding;
|
|
size_t i, firstUnsortedIndex = 0;
|
|
string inputPath = GetPath(opt.Input());
|
|
vector<Ember<T>> embers;
|
|
XmlToEmber<T> parser;
|
|
EmberToXml<T> emberToXml;
|
|
Interpolater<T> interpolater;
|
|
EmberReport emberReport;
|
|
const vector<pair<size_t, size_t>> devices = Devices(opt.Devices());
|
|
std::atomic<size_t> atomfTime;
|
|
vector<std::thread> threadVec;
|
|
auto progress = make_unique<RenderProgress<T>>();
|
|
vector<unique_ptr<Renderer<T, float>>> renderers;
|
|
vector<string> errorReport;
|
|
std::recursive_mutex verboseCs;
|
|
auto fullpath = GetExePath(argv[0]);
|
|
|
|
if (opt.EmberCL())
|
|
{
|
|
renderers = CreateRenderers<T>(eRendererType::OPENCL_RENDERER, devices, false, 0, emberReport);
|
|
errorReport = emberReport.ErrorReport();
|
|
|
|
if (!errorReport.empty())
|
|
emberReport.DumpErrorReport();
|
|
|
|
if (!renderers.size() || renderers.size() != devices.size())
|
|
{
|
|
cout << "Only created " << renderers.size() << " renderers out of " << devices.size() << " requested, exiting.\n";
|
|
return false;
|
|
}
|
|
|
|
for (auto& renderer : renderers)
|
|
if (auto rendererCL = dynamic_cast<RendererCL<T, float>*>(renderer.get()))
|
|
{
|
|
rendererCL->OptAffine(true);//Optimize empty affines for final renderers, this is normally false for the interactive renderer.
|
|
rendererCL->SubBatchPercentPerThread(float(opt.SBPctPerTh()));
|
|
}
|
|
|
|
if (opt.DoProgress())
|
|
renderers[0]->Callback(progress.get());
|
|
|
|
cout << "Using OpenCL to render.\n";
|
|
|
|
if (opt.Verbose())
|
|
{
|
|
for (auto& device : devices)
|
|
{
|
|
cout << "Platform: " << info->PlatformName(device.first) << "\n";
|
|
cout << "Device: " << info->DeviceName(device.first, device.second) << "\n";
|
|
}
|
|
}
|
|
|
|
if (opt.ThreadCount() > 1)
|
|
cout << "Cannot specify threads with OpenCL, using 1 thread.\n";
|
|
|
|
opt.ThreadCount(1);
|
|
|
|
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());
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
unique_ptr<Renderer<T, float>> tempRenderer(CreateRenderer<T>(eRendererType::CPU_RENDERER, devices, false, 0, emberReport));
|
|
errorReport = emberReport.ErrorReport();
|
|
|
|
if (!errorReport.empty())
|
|
emberReport.DumpErrorReport();
|
|
|
|
if (!tempRenderer.get())
|
|
{
|
|
cout << "Renderer creation failed, exiting.\n";
|
|
return false;
|
|
}
|
|
|
|
if (opt.DoProgress())
|
|
tempRenderer->Callback(progress.get());
|
|
|
|
if (opt.ThreadCount() == 0)
|
|
{
|
|
cout << "Using " << Timing::ProcessorCount() << " automatically detected threads.\n";
|
|
opt.ThreadCount(Timing::ProcessorCount());
|
|
}
|
|
else
|
|
{
|
|
cout << "Using " << opt.ThreadCount() << " manually specified threads.\n";
|
|
}
|
|
|
|
tempRenderer->ThreadCount(opt.ThreadCount(), opt.IsaacSeed() != "" ? opt.IsaacSeed().c_str() : nullptr);
|
|
renderers.push_back(std::move(tempRenderer));
|
|
}
|
|
|
|
if (!InitPaletteList<float>(fullpath, opt.PalettePath())) //For any modern flames, the palette isn't used. This is for legacy purposes and should be removed.
|
|
return false;
|
|
|
|
cout << "Parsing ember file " << opt.Input() << "\n";
|
|
|
|
if (!ParseEmberFile(parser, opt.Input(), embers))
|
|
return false;
|
|
|
|
cout << "Finished parsing.\n";
|
|
|
|
if (embers.size() <= 1)
|
|
{
|
|
cout << "Read " << embers.size() << " embers from file. At least 2 required to animate, exiting.\n";
|
|
return false;
|
|
}
|
|
|
|
if (!Find(opt.Format(), "jpg") &&
|
|
!Find(opt.Format(), "png") &&
|
|
#ifdef _WIN32
|
|
!Find(opt.Format(), "bmp") &&
|
|
#endif
|
|
!Find(opt.Format(), "exr"))
|
|
{
|
|
#ifdef _WIN32
|
|
cout << "Format must be bmp, jpg, png, png16 or exr, not " << opt.Format() << ". Setting to png.\n";
|
|
#else
|
|
cout << "Format must be jpg, png, png16 or exr, not " << opt.Format() << ". Setting to png.\n";
|
|
#endif
|
|
opt.Format("png");
|
|
}
|
|
|
|
if (opt.AspectRatio() < 0)
|
|
{
|
|
cout << "Invalid pixel aspect ratio " << opt.AspectRatio() << "\n. Must be positive, setting to 1.\n";
|
|
opt.AspectRatio(1);
|
|
}
|
|
|
|
if (opt.Dtime() < 1)
|
|
{
|
|
cout << "Warning: dtime must be positive, not " << opt.Dtime() << ". Setting to 1.\n";
|
|
opt.Dtime(1);
|
|
}
|
|
|
|
if (opt.Frame() != UINT_MAX)
|
|
{
|
|
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() + 1);
|
|
}
|
|
|
|
//Prep all embers, by ensuring they:
|
|
//-Are sorted by time.
|
|
//-Do not have a dimension of 0.
|
|
//-Do not have a memory requirement greater than max uint.
|
|
//-Have quality and size scales applied, if present.
|
|
//-Have equal dimensions.
|
|
for (i = 0; i < embers.size(); i++)
|
|
{
|
|
auto& ember = embers[i];
|
|
auto& emberm1 = embers[i - 1];
|
|
|
|
if (i > 0 && ember.m_Time <= emberm1.m_Time)
|
|
{
|
|
if (!unsorted)
|
|
firstUnsortedIndex = i;
|
|
|
|
unsorted = true;
|
|
}
|
|
|
|
if (i > 0 && ember.m_Time == emberm1.m_Time)
|
|
{
|
|
cout << "Image " << i << " time of " << ember.m_Time << " equaled previous image time of " << emberm1.m_Time << ". Adjusting up by 1.\n";
|
|
ember.m_Time++;
|
|
}
|
|
|
|
if (opt.Supersample() > 0)
|
|
ember.m_Supersample = opt.Supersample();
|
|
|
|
if (opt.TemporalSamples() > 0)
|
|
ember.m_TemporalSamples = opt.TemporalSamples();
|
|
|
|
if (opt.Quality() > 0)
|
|
ember.m_Quality = T(opt.Quality());
|
|
|
|
if (opt.DeMin() > -1)
|
|
ember.m_MinRadDE = T(opt.DeMin());
|
|
|
|
if (opt.DeMax() > -1)
|
|
ember.m_MaxRadDE = T(opt.DeMax());
|
|
|
|
ember.m_Quality *= T(opt.QualityScale());
|
|
|
|
if (opt.SizeScale() != 1.0)
|
|
{
|
|
ember.m_FinalRasW = size_t(T(ember.m_FinalRasW) * opt.SizeScale());
|
|
ember.m_FinalRasH = size_t(T(ember.m_FinalRasH) * opt.SizeScale());
|
|
ember.m_PixelsPerUnit *= T(opt.SizeScale());
|
|
}
|
|
else if (opt.WidthScale() != 1.0 || opt.HeightScale() != 1.0)
|
|
{
|
|
auto scaleType = eScaleType::SCALE_NONE;
|
|
|
|
if (ToLower(opt.ScaleType()) == "width")
|
|
scaleType = eScaleType::SCALE_WIDTH;
|
|
else if (ToLower(opt.ScaleType()) == "height")
|
|
scaleType = eScaleType::SCALE_HEIGHT;
|
|
else if (ToLower(opt.ScaleType()) != "none")
|
|
cout << "Scale type must be width height or none. Setting to none.\n";
|
|
|
|
auto w = std::max<size_t>(size_t(ember.m_OrigFinalRasW * opt.WidthScale()), 10);
|
|
auto h = std::max<size_t>(size_t(ember.m_OrigFinalRasH * opt.HeightScale()), 10);
|
|
ember.SetSizeAndAdjustScale(w, h, false, scaleType);
|
|
}
|
|
|
|
//Cast to double in case the value exceeds 2^32.
|
|
double imageMem = 4 * double(ember.m_FinalRasW)
|
|
* double(ember.m_FinalRasH) * double(renderers[0]->BytesPerChannel());
|
|
double maxMem = pow(2.0, double((sizeof(void*) * 8) - 1));
|
|
|
|
if (imageMem > maxMem)//Ensure the max amount of memory for a process isn't exceeded.
|
|
{
|
|
cout << "Image " << i << " size > " << maxMem << ". Setting to 1920 x 1080.\n";
|
|
ember.m_FinalRasW = 1920;
|
|
ember.m_FinalRasH = 1080;
|
|
}
|
|
|
|
if (ember.m_FinalRasW == 0 || ember.m_FinalRasH == 0)
|
|
{
|
|
cout << "Warning: Output image " << i << " has dimension 0: " << ember.m_FinalRasW << ", " << ember.m_FinalRasH << ". Setting to 1920 x 1080.\n";
|
|
ember.m_FinalRasW = 1920;
|
|
ember.m_FinalRasH = 1080;
|
|
}
|
|
|
|
if ((ember.m_FinalRasW != embers[0].m_FinalRasW) ||
|
|
(ember.m_FinalRasH != embers[0].m_FinalRasH))
|
|
{
|
|
cout << "Warning: flame " << i << " at time " << ember.m_Time << " size mismatch. (" << ember.m_FinalRasW << ", " << ember.m_FinalRasH <<
|
|
") should be (" << embers[0].m_FinalRasW << ", " << embers[0].m_FinalRasH << "). Setting to " << embers[0].m_FinalRasW << ", " << embers[0].m_FinalRasH << ".\n";
|
|
ember.m_FinalRasW = embers[0].m_FinalRasW;
|
|
ember.m_FinalRasH = embers[0].m_FinalRasH;
|
|
}
|
|
}
|
|
|
|
if (unsorted)
|
|
{
|
|
cout << "Embers were unsorted by time. First out of order index was " << firstUnsortedIndex << ". Sorting.\n";
|
|
std::sort(embers.begin(), embers.end(), &CompareEmbers<T>);
|
|
}
|
|
|
|
if (opt.Frame() == UINT_MAX)
|
|
{
|
|
if (opt.FirstFrame() == UINT_MAX)
|
|
opt.FirstFrame(size_t(embers[0].m_Time));
|
|
|
|
if (opt.LastFrame() == UINT_MAX)
|
|
opt.LastFrame(ClampGte<size_t>(size_t(embers.back().m_Time),
|
|
opt.FirstFrame() + opt.Dtime()));//Make sure the final value is at least first frame + dtime.
|
|
}
|
|
|
|
//Final setup steps before running.
|
|
padding = uint(std::log10(double(embers.size()))) + 1;
|
|
|
|
for (auto& r : renderers)
|
|
{
|
|
r->SetExternalEmbersPointer(&embers);//All will share a pointer to the original vector to conserve memory with large files. Ok because the vec doesn't get modified.
|
|
r->EarlyClip(opt.EarlyClip());
|
|
r->YAxisUp(opt.YAxisUp());
|
|
r->LockAccum(opt.LockAccum());
|
|
r->PixelAspectRatio(T(opt.AspectRatio()));
|
|
r->Priority(eThreadPriority(Clamp<intmax_t>(intmax_t(opt.Priority()), intmax_t(eThreadPriority::LOWEST), intmax_t(eThreadPriority::HIGHEST))));
|
|
}
|
|
|
|
std::function<void (vector<v4F>&, string, EmberImageComments, size_t, size_t, size_t)> saveFunc = [&](vector<v4F>& finalImage,
|
|
string baseFilename,//These are copies because this will be launched in a thread.
|
|
EmberImageComments comments,
|
|
size_t w,
|
|
size_t h,
|
|
size_t chan)
|
|
{
|
|
auto finalImagep = finalImage.data();
|
|
auto size = w * h;
|
|
bool doBmp = Find(opt.Format(), "bmp");
|
|
bool doJpg = Find(opt.Format(), "jpg");
|
|
bool doExr = Find(opt.Format(), "exr");
|
|
bool doPng8 = Find(opt.Format(), "png");
|
|
bool doPng16 = Find(opt.Format(), "png16");
|
|
bool doOnlyPng8 = doPng8 && !doPng16;
|
|
vector<byte> rgb8Image;
|
|
vector<std::thread> writeFileThreads;
|
|
writeFileThreads.reserve(5);
|
|
|
|
if (doBmp || doJpg)
|
|
{
|
|
rgb8Image.resize(size * 3);
|
|
Rgba32ToRgb8(finalImagep, rgb8Image.data(), w, h);
|
|
|
|
if (doBmp)
|
|
{
|
|
writeFileThreads.push_back(std::thread([&]()
|
|
{
|
|
auto fn = baseFilename + ".bmp";
|
|
VerbosePrint("Writing " + fn);
|
|
auto writeSuccess = WriteBmp(fn.c_str(), rgb8Image.data(), w, h);
|
|
|
|
if (!writeSuccess)
|
|
cout << "Error writing " << fn << "\n";
|
|
}));
|
|
}
|
|
|
|
if (doJpg)
|
|
{
|
|
writeFileThreads.push_back(std::thread([&]()
|
|
{
|
|
auto fn = baseFilename + ".jpg";
|
|
VerbosePrint("Writing " + fn);
|
|
auto writeSuccess = WriteJpeg(fn.c_str(), rgb8Image.data(), w, h, int(opt.JpegQuality()), opt.EnableComments(), comments, opt.Id(), opt.Url(), opt.Nick());
|
|
|
|
if (!writeSuccess)
|
|
cout << "Error writing " << fn << "\n";
|
|
}));
|
|
}
|
|
}
|
|
|
|
if (doPng8)
|
|
{
|
|
bool doBothPng = doPng16 && (opt.Format().find("png") != opt.Format().rfind("png"));
|
|
|
|
if (doBothPng || doOnlyPng8)//8-bit PNG
|
|
{
|
|
writeFileThreads.push_back(std::thread([&]()
|
|
{
|
|
auto fn = baseFilename + ".png";
|
|
VerbosePrint("Writing " + fn);
|
|
vector<byte> rgba8Image(size * 4);
|
|
Rgba32ToRgba8(finalImagep, rgba8Image.data(), w, h, opt.Transparency());
|
|
auto writeSuccess = WritePng(fn.c_str(), rgba8Image.data(), w, h, 1, opt.EnableComments(), comments, opt.Id(), opt.Url(), opt.Nick());
|
|
|
|
if (!writeSuccess)
|
|
cout << "Error writing " << fn << "\n";
|
|
}));
|
|
}
|
|
|
|
if (doPng16)
|
|
{
|
|
writeFileThreads.push_back(std::thread([&]()
|
|
{
|
|
auto suffix = opt.Suffix();
|
|
auto fn = baseFilename;
|
|
|
|
if (doBothPng)//Add suffix if they specified both PNG.
|
|
{
|
|
VerbosePrint("Doing both PNG formats, so adding suffix _p16 to avoid overwriting the same file.");
|
|
fn += "_p16";
|
|
}
|
|
|
|
fn += ".png";
|
|
VerbosePrint("Writing " + fn);
|
|
vector<glm::uint16> rgba16Image(size * 4);
|
|
Rgba32ToRgba16(finalImagep, rgba16Image.data(), w, h, opt.Transparency());
|
|
auto writeSuccess = WritePng(fn.c_str(), (byte*)rgba16Image.data(), w, h, 2, opt.EnableComments(), comments, opt.Id(), opt.Url(), opt.Nick());
|
|
|
|
if (!writeSuccess)
|
|
cout << "Error writing " << fn << "\n";
|
|
}));
|
|
}
|
|
}
|
|
|
|
if (doExr)
|
|
{
|
|
writeFileThreads.push_back(std::thread([&]()
|
|
{
|
|
auto fn = baseFilename + ".exr";
|
|
VerbosePrint("Writing " + fn);
|
|
vector<Rgba> rgba32Image(size);
|
|
Rgba32ToRgbaExr(finalImagep, rgba32Image.data(), w, h, opt.Transparency());
|
|
auto writeSuccess = WriteExr(fn.c_str(), rgba32Image.data(), w, h, opt.EnableComments(), comments, opt.Id(), opt.Url(), opt.Nick());
|
|
|
|
if (!writeSuccess)
|
|
cout << "Error writing " << fn << "\n";
|
|
}));
|
|
}
|
|
|
|
Join(writeFileThreads);
|
|
};
|
|
atomfTime.store(opt.FirstFrame());
|
|
std::function<void(size_t)> iterFunc = [&](size_t index)
|
|
{
|
|
size_t ftime, finalImageIndex = 0;
|
|
RendererBase* renderer = renderers[index].get();
|
|
ostringstream os;
|
|
EmberStats stats;
|
|
EmberImageComments comments;
|
|
Ember<T> centerEmber;
|
|
vector<v4F> finalImages[2];
|
|
std::thread writeThread;
|
|
os.imbue(std::locale(""));
|
|
|
|
//The conditions of this loop use atomics to synchronize when running on multiple GPUs.
|
|
//The order is reversed from the usual loop: rather than compare and increment the counter,
|
|
//it's incremented, then compared. This is done to ensure the GPU on this thread "claims" this
|
|
//frame before working on it.
|
|
//The mechanism for incrementing is:
|
|
// Do an atomic add, which returns the previous value.
|
|
// Add the time increment Dtime() to the return value to mimic what the new atomic value should be.
|
|
// Assign the result to the ftime counter.
|
|
// Do a <= comparison to LastFrame().
|
|
// If true, enter the loop and immediately decrement the counter by Dtime() to make up for the fact
|
|
// that it was first incremented before comparing.
|
|
while ((ftime = (atomfTime.fetch_add(opt.Dtime()) + opt.Dtime())) <= opt.LastFrame())
|
|
{
|
|
T localTime = T(ftime) - opt.Dtime();
|
|
|
|
if (opt.Verbose() && ((opt.LastFrame() - opt.FirstFrame()) / opt.Dtime() >= 1))
|
|
{
|
|
rlg l(verboseCs);
|
|
cout << "Time = " << ftime << " / " << opt.LastFrame() << " / " << opt.Dtime() << "\n";
|
|
}
|
|
|
|
renderer->Reset();
|
|
|
|
if ((renderer->Run(finalImages[finalImageIndex], localTime) != eRenderStatus::RENDER_OK) || renderer->Aborted() || finalImages[finalImageIndex].empty())
|
|
{
|
|
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;
|
|
}
|
|
|
|
if (opt.WriteGenome())
|
|
{
|
|
auto flameName = MakeAnimFilename(inputPath, opt.Prefix(), opt.Suffix(), ".flame", padding, ftime);
|
|
|
|
if (opt.Verbose())
|
|
{
|
|
rlg l(verboseCs);
|
|
cout << "Writing " << flameName << "\n";
|
|
}
|
|
|
|
interpolater.Interpolate(embers, localTime, 0, centerEmber);//Get center flame.
|
|
emberToXml.Save(flameName, centerEmber, opt.PrintEditDepth(), true, opt.HexPalette(), true, false, false);
|
|
centerEmber.Clear();
|
|
}
|
|
|
|
stats = renderer->Stats();
|
|
comments = renderer->ImageComments(stats, opt.PrintEditDepth(), true);
|
|
os.str("");
|
|
size_t iterCount = renderer->TotalIterCount(1);
|
|
os << comments.m_NumIters << " / " << iterCount << " (" << std::fixed << std::setprecision(2) << ((double(stats.m_Iters) / double(iterCount)) * 100) << "%)";
|
|
|
|
if (opt.Verbose())
|
|
{
|
|
rlg l(verboseCs);
|
|
cout << "\nIters ran/requested: " + os.str() << "\n";
|
|
|
|
if (!opt.EmberCL()) cout << "Bad values: " << stats.m_Badvals << "\n";
|
|
|
|
cout << "Render time: " << t.Format(stats.m_RenderMs) << "\n";
|
|
cout << "Pure iter time: " << t.Format(stats.m_IterMs) << "\n";
|
|
cout << "Iters/sec: " << size_t(stats.m_Iters / (stats.m_IterMs / 1000.0)) << "\n";
|
|
}
|
|
|
|
//Run image writing in a thread. Although doing it this way duplicates the final output memory, it saves a lot of time
|
|
//when running with OpenCL. Call join() to ensure the previous thread call has completed.
|
|
Join(writeThread);
|
|
auto threadVecIndex = finalImageIndex;//Cache before launching thread.
|
|
auto baseFilename = MakeAnimFilename(inputPath, opt.Prefix(), opt.Suffix(), "", padding, ftime);
|
|
|
|
if (opt.ThreadedWrite())//Copies of all but the first parameter are passed to saveFunc(), to avoid conflicting with those values changing when starting the render for the next image.
|
|
{
|
|
writeThread = std::thread(saveFunc, std::ref(finalImages[threadVecIndex]), baseFilename, comments, renderer->FinalRasW(), renderer->FinalRasH(), renderer->NumChannels());
|
|
finalImageIndex ^= 1;//Toggle the index.
|
|
}
|
|
else
|
|
saveFunc(finalImages[threadVecIndex], baseFilename, comments, renderer->FinalRasW(), renderer->FinalRasH(), renderer->NumChannels());//Will always use the first index, thereby not requiring more memory.
|
|
}
|
|
|
|
Join(writeThread);//One final check to make sure all writing is done before exiting this thread.
|
|
};
|
|
threadVec.reserve(renderers.size());
|
|
|
|
for (size_t r = 0; r < renderers.size(); r++)
|
|
{
|
|
threadVec.push_back(std::thread([&](size_t dev)
|
|
{
|
|
iterFunc(dev);
|
|
}, r));
|
|
}
|
|
|
|
Join(threadVec);
|
|
t.Toc("\nFinished in: ", true);
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Main program entry point for EmberAnimate.exe.
|
|
/// </summary>
|
|
/// <param name="argc">The number of command line arguments passed</param>
|
|
/// <param name="argv">The command line arguments passed</param>
|
|
/// <returns>0 if successful, else 1.</returns>
|
|
int _tmain(int argc, _TCHAR* argv[])
|
|
{
|
|
bool b = false;
|
|
EmberOptions opt;
|
|
//Required for large allocs, else GPU memory usage will be severely limited to small sizes.
|
|
//This must be done in the application and not in the EmberCL DLL.
|
|
#ifdef _WIN32
|
|
_putenv_s("GPU_MAX_ALLOC_PERCENT", "100");
|
|
#else
|
|
putenv(const_cast<char*>("GPU_MAX_ALLOC_PERCENT=100"));
|
|
#endif
|
|
_MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);
|
|
_MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
|
|
|
|
if (!opt.Populate(argc, argv, eOptionUse::OPT_USE_ANIMATE))
|
|
{
|
|
auto palf = PaletteList<float>::Instance();
|
|
#ifdef DO_DOUBLE
|
|
|
|
if (!opt.Sp())
|
|
b = EmberAnimate<double>(argc, argv, opt);
|
|
else
|
|
#endif
|
|
b = EmberAnimate<float>(argc, argv, opt);
|
|
}
|
|
|
|
return b ? 0 : 1;
|
|
}
|