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

12
Source/Fractorium/FractoriumMenus.cpp
View File

@ -755,15 +755,11 @@ void Fractorium::OnActionAddBothSymmetry(bool checked) { m_Controller->AddBothSy
template <typename T>
void FractoriumEmberController<T>::Flatten()
{
UpdateXform([&] (Xform<T>* xform)
{
m_Ember.Flatten(XmlToEmber<T>::m_FlattenNames);
FillVariationTreeWithXform(xform);
}, eXformUpdate::UPDATE_CURRENT, false);//Don't update render, it'll update below.
UpdateAll([&](Ember<T>& ember)
{
ember.Flatten(XmlToEmber<T>::m_FlattenNames);
}, true, eProcessAction::FULL_RENDER, m_Fractorium->ApplyAll());
FillVariationTreeWithXform(CurrentXform());
}
void Fractorium::OnActionFlatten(bool checked) { m_Controller->Flatten(); }
@ -774,15 +770,11 @@ void Fractorium::OnActionFlatten(bool checked) { m_Controller->Flatten(); }
template <typename T>
void FractoriumEmberController<T>::Unflatten()
{
UpdateXform([&] (Xform<T>* xform)
{
m_Ember.Unflatten();
FillVariationTreeWithXform(xform);
}, eXformUpdate::UPDATE_CURRENT, false);//Don't update render, it'll update below.
UpdateAll([&](Ember<T>& ember)
{
ember.Unflatten();
}, true, eProcessAction::FULL_RENDER, m_Fractorium->ApplyAll());
FillVariationTreeWithXform(CurrentXform());
}
void Fractorium::OnActionUnflatten(bool checked) { m_Controller->Unflatten(); }