mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-02 22:34:52 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.0.0.2 12/05/2016

Browse Source 
--User changes
 -Add many tooltips to help clarify functionality.
 -Select multiple flames in library for del/move. Still only one allowed to be set as the current.
 -Show checkbox for current flame. Remember this is not necessarily what's selected.
 -User can now drag a square to select xforms, which keeps in sync with checkboxes.
 -Remove --nframes from command line. Replace with new params: --loopframes, --interpframes, --interploops.
 -Add two new options to EmberGenome: --cwloops --cwinterploops to specify whether rotation should go clockwise instead of the default counter clockwise.
 -Add these to Fractorium as checkboxes.
 -Apply All now also works for toggling animate flag on xforms.
 -Options dialog now allows user to set whether double click toggles spinners, or right click does.

--Bug fixes
 -Selecting final and non-final xforms, and then dragging the non-final did not drag the final with it.
 -Selecting all xforms when a final was present, then deleting crashed the program.
 -Remove support for ppm files in the command line programs, it's an outdated format.
 -Switching between SP and DP kept reapplying the palette adjustments.

--Code changes
 -Move build system to Visual Studio 2015 and Qt 5.6.
 -SSE used during addition of points to the histogram.
 -Remove last remnants of old flam3 C code and replace with C++.
 -Remove unused code involving tbb::task_group.
 -Make settings object a global shared_ptr singleton, so it doesn't have to be passed around.
This commit is contained in:
Person
2016-12-05 19:04:33 -08:00
parent 53ec438a25
commit 5cdfe0b6b9
83 changed files with 4892 additions and 1156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Fractorium/FinalRenderEmberController.cpp
View File

@ -14,7 +14,7 @@ FinalRenderEmberControllerBase::FinalRenderEmberControllerBase(FractoriumFinalRe
m_FinalRenderDialog(finalRenderDialog)
{
m_FinishedImageCount.store(0);
m_Settings = m_Fractorium->m_Settings;
m_Settings = FractoriumSettings::DefInstance();
}
/// <summary>
@ -28,8 +28,8 @@ void FinalRenderEmberController<T>::CancelRender()
{
if (m_Result.isRunning())
{
tbb::task_group g;
g.run([&]
//tbb::task_group g;
std::thread th([&]
{
m_Run = false;
@ -61,7 +61,7 @@ void FinalRenderEmberController<T>::CancelRender()
}
}
});
g.wait();
Join(th);
while (m_Result.isRunning())
QApplication::processEvents();