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

1.0.0.19 Re-release

Browse Source 
--Bug fixes
 -Blur Cuve never worked with strips.
 -Images with temporal filter width values below 0.6 would sometimes create blank images.
This commit is contained in:
Person
2020-03-18 19:34:56 -07:00
parent 0fa575246e
commit d2893010f0
19 changed files with 123 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Fractorium/FinalRenderEmberController.cpp
View File

@ -267,7 +267,7 @@ FinalRenderEmberController<T>::FinalRenderEmberController(FractoriumFinalRenderD
Output("Image " + ToString<qulonglong>(m_FinishedImageCount.load() + 1) + ":\n" + ComposePath(QString::fromStdString(it.m_Name)));
it.m_TemporalSamples = 1;//No temporal sampling.
m_Renderer->SetEmber(it);
m_Renderer->SetEmber(it, eProcessAction::FULL_RENDER, true);
m_Renderer->PrepFinalAccumVector(m_FinalImage);//Must manually call this first because it could be erroneously made smaller due to strips if called inside Renderer::Run().
m_Stats.Clear();
m_RenderTimer.Tic();//Toc() is called in RenderComplete().
@ -298,7 +298,7 @@ FinalRenderEmberController<T>::FinalRenderEmberController(FractoriumFinalRenderD
m_ImageCount = 1;
m_Ember->m_TemporalSamples = 1;
m_Fractorium->m_Controller->ParamsToEmber(*m_Ember, true);//Update color and filter params from the main window controls, which only affect the filter and/or final accumulation stage.
m_Renderer->SetEmber(*m_Ember, isBump ? eProcessAction::KEEP_ITERATING : eProcessAction::FULL_RENDER);
m_Renderer->SetEmber(*m_Ember, isBump ? eProcessAction::KEEP_ITERATING : eProcessAction::FULL_RENDER, true);
m_Renderer->PrepFinalAccumVector(m_FinalImage);//Must manually call this first because it could be erroneously made smaller due to strips if called inside Renderer::Run().
m_Stats.Clear();
Output(ComposePath(QString::fromStdString(m_Ember->m_Name)));
@ -1130,7 +1130,7 @@ void FinalRenderPreviewRenderer<T>::PreviewRenderFunc(uint start, uint end)
m_PreviewRenderer.EarlyClip(d->EarlyClip());
m_PreviewRenderer.YAxisUp(d->YAxisUp());
m_PreviewRenderer.Callback(nullptr);
m_PreviewRenderer.SetEmber(m_PreviewEmber);
m_PreviewRenderer.SetEmber(m_PreviewEmber, eProcessAction::FULL_RENDER, true);
m_PreviewRenderer.PrepFinalAccumVector(m_PreviewFinalImage);//Must manually call this first because it could be erroneously made smaller due to strips if called inside Renderer::Run().
auto strips = VerifyStrips(m_PreviewEmber.m_FinalRasH, d->Strips(),
[&](const string & s) {}, [&](const string & s) {}, [&](const string & s) {});

2
Source/Fractorium/FractoriumEmberController.cpp
View File

@ -391,7 +391,7 @@ void TreePreviewRenderer<T>::PreviewRenderFunc(uint start, uint end)
m_PreviewEmber.m_TemporalSamples = 1;
m_PreviewEmber.m_Quality = 25;
m_PreviewEmber.m_Supersample = 1;
m_PreviewRenderer.SetEmber(m_PreviewEmber);
m_PreviewRenderer.SetEmber(m_PreviewEmber, eProcessAction::FULL_RENDER, true);
if (m_PreviewRenderer.Run(m_PreviewFinalImage) == eRenderStatus::RENDER_OK)
{

2
Source/Fractorium/FractoriumRender.cpp
View File

@ -373,7 +373,7 @@ bool FractoriumEmberController<T>::Render()
}
i = 0;
m_Renderer->SetEmber(m_Ember, action);
m_Renderer->SetEmber(m_Ember, action, true);
if (solo != -1)
while (auto xform = m_Ember.GetTotalXform(i, forceFinal))

10
Source/Fractorium/Main.cpp
View File

@ -8,9 +8,9 @@
/// </summary>
void ExportUserData()
{
auto exec = new QProcess();
exec->setWorkingDirectory(QCoreApplication::applicationDirPath());
exec->start("/bin/sh", QStringList() << "fractorium-sh");
auto exec = new QProcess();
exec->setWorkingDirectory(QCoreApplication::applicationDirPath());
exec->start("/bin/sh", QStringList() << "fractorium-sh");
}
#endif
@ -56,8 +56,8 @@ int main(int argc, char* argv[])
Fractorium w;
w.show();
#ifdef __APPLE__
// exporting user data
ExportUserData();
// exporting user data
ExportUserData();
#endif
a.installEventFilter(&w);
rv = a.exec();