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

--User changes

Browse Source 
-Add Ctrl+g shortcut for generating a sequence.

--Bug fixes
 -Fix indendation for variations because of type icon.
 -Fix bug when duplicating flame where the new flame wasn't being properly selected.
 -Fix bug where clearing a flame was changing size and quality when it shouldn't have.
 -Fix bug where reading an Xml palette was failing on linux.

--Code changes
 -No longer pad string with null terminator in ReadFile() because std::string already does it.
This commit is contained in:
Person
2024-05-08 07:31:55 -06:00
parent 45d936b60c
commit 4c0f03a52a
10 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Fractorium/FractoriumMenus.cpp
View File

@ -164,10 +164,12 @@ void FractoriumEmberController<T>::CopyFlameInCurrentFile()
{
StopAllPreviewRenderers();
auto ember = m_Ember;
auto insertEmberIndex = m_Fractorium->ui.LibraryTree->currentIndex().row() + 1;
auto model = m_Fractorium->ui.LibraryTree->selectionModel();
auto sel = model->selectedIndexes();
auto insertEmberIndex = sel.size() > 0 ? sel[0].row() + 1 : 0;
ember.m_Name = EmberFile<T>::DefaultEmberName(m_EmberFile.Size() + 1).toStdString();
ember.m_Index = insertEmberIndex;//Will be overwritten below in UpdateLibraryTree().
m_EmberFile.m_Embers.insert(Advance(m_EmberFile.m_Embers.begin(), insertEmberIndex), ember);//Will invalidate the pointers contained in the EmberTreeWidgetItems, UpdateLibraryTree() will resync.
ember.m_Index = insertEmberIndex;//Will be overwritten below in FillLibraryTree().
m_EmberFile.m_Embers.insert(Advance(m_EmberFile.m_Embers.begin(), insertEmberIndex), ember);//Will invalidate the pointers contained in the EmberTreeWidgetItems, FillLibraryTree() has the effect of resyncing because index, name and pointer are assigned.
m_EmberFile.MakeNamesUnique();
FillLibraryTree(insertEmberIndex);
SetEmber(insertEmberIndex, false);
@ -1013,6 +1015,9 @@ void FractoriumEmberController<T>::ClearFlame()
newXform.m_ColorX = m_Rand.Frand01<T>();
newXform.AddVariation(m_VariationList->GetVariationCopy(eVariationId::VAR_LINEAR));
m_Ember.Clear();
m_Ember.m_FinalRasW = m_Fractorium->m_WidthSpin->value();
m_Ember.m_FinalRasH = m_Fractorium->m_HeightSpin->value();
m_Ember.m_Quality = m_Fractorium->m_QualitySpin->value();
m_Ember.AddXform(newXform);
FillXforms();//Must do this first because the palette setup in FillParamTablesAndPalette() uses the xforms combo.
FillParamTablesAndPalette();