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

--User changes

Browse Source 
-The concept of "saving back to file in memory" has been removed. The current ember is saved back to memory whenever the render completes and the thumbnail will be updated each time.
 -Command line programs now default to using double precision.
 -The --bits argument has been removed and replaced with --sp to specify single precision. If omitted, DP is used.
 -Remove the --seed option, it was never used.
 -Remove the --sub_batch_size option, it has been part of the Xml for a long time.
 -Remove --hex_palette argument for EmberRender, it only makes sense in EmberAnimate and EmberGenome.
 -Set enable_jpg_comments and enable_png_comments to false by default. It was a very bad idea to have them be true because it reveals the flame parameters used to render the image which many artists guard closely.

--Bug fixes
 -Continuous update was broken.
 -Undo list was broken with new Library tab design.
 -Force repaint on xform checkbox change to ensure circles are immediately drawn around selected xforms.

--Code changes
 -Remove save to back to file in memory icon, document-hf-insert.png.
This commit is contained in:
mfeemster
2016-04-11 18:15:14 -07:00
parent b690bf8071
commit 7715910362
12 changed files with 92 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Source/EmberRender/EmberRender.cpp
View File

@ -106,6 +106,12 @@ bool EmberRender(EmberOptions& opt)
cout << "Bits per channel cannot be anything other than 8 with OpenCL, setting to 8.\n";
opt.BitsPerChannel(8);
}
if (opt.InsertPalette())
{
cout << "Inserting palette not supported with OpenCL, insertion will not take place.\n";
opt.InsertPalette(false);
}
}
if (opt.Format() != "jpg" &&
@ -129,12 +135,6 @@ bool EmberRender(EmberOptions& opt)
opt.BitsPerChannel(8);
}
if (opt.InsertPalette() && opt.BitsPerChannel() != 8)
{
cout << "Inserting palette only supported with 8 bits per channel, insertion will not take place.\n";
opt.InsertPalette(false);
}
if (opt.AspectRatio() < 0)
{
cout << "Invalid pixel aspect ratio " << opt.AspectRatio() << "\n. Must be positive, setting to 1.\n";
@ -181,9 +181,6 @@ bool EmberRender(EmberOptions& opt)
if (opt.DeMax() > -1)
embers[i].m_MaxRadDE = T(opt.DeMax());
if (opt.SubBatchSize() != DEFAULT_SBS)
embers[i].m_SubBatchSize = opt.SubBatchSize();
embers[i].m_TemporalSamples = 1;//Force temporal samples to 1 for render.
embers[i].m_Quality *= T(opt.QualityScale());
embers[i].m_FinalRasW = size_t(T(embers[i].m_FinalRasW) * opt.SizeScale());
@ -282,7 +279,7 @@ bool EmberRender(EmberOptions& opt)
//TotalIterCount() is actually using ScaledQuality() which does not get reset upon ember assignment,
//so it ends up using the correct value for quality * strips.
iterCount = renderer->TotalIterCount(1);
comments = renderer->ImageComments(stats, opt.PrintEditDepth(), opt.HexPalette());
comments = renderer->ImageComments(stats, opt.PrintEditDepth(), true);
os.str("");
os << comments.m_NumIters << " / " << iterCount << " (" << std::fixed << std::setprecision(2) << ((double(stats.m_Iters) / double(iterCount)) * 100) << "%)";
VerbosePrint("\nIters ran/requested: " + os.str());
@ -356,21 +353,11 @@ int _tmain(int argc, _TCHAR* argv[])
{
#ifdef DO_DOUBLE
if (opt.Bits() == 64)
{
if (!opt.Sp())
b = EmberRender<double>(opt);
}
else
#endif
if (opt.Bits() == 33)
{
b = EmberRender<float>(opt);
}
else if (opt.Bits() == 32)
{
cout << "Bits 32/int histogram no longer supported. Using bits == 33 (float).\n";
b = EmberRender<float>(opt);
}
b = EmberRender<float>(opt);
}
return b ? 0 : 1;