mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 18:40:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged mfeemster/fractorium into master

Browse Source
This commit is contained in:
Michel Mastriani 2019-05-21 20:50:24 -03:00
commit 6f42938bd7
5 changed files with 50 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Fractorium/FractoriumEmberController.h
View File

@ -311,7 +311,7 @@ protected:
unique_ptr<EmberNs::RendererBase> m_Renderer; unique_ptr<EmberNs::RendererBase> m_Renderer;
QTIsaac<ISAAC_SIZE, ISAAC_INT> m_Rand; QTIsaac<ISAAC_SIZE, ISAAC_INT> m_Rand;
Fractorium* m_Fractorium; Fractorium* m_Fractorium;
Palette<float> m_TempPalette, m_PreviosTempPalette; Palette<float> m_TempPalette, m_PreviousTempPalette;
std::unique_ptr<QTimer> m_RenderTimer; std::unique_ptr<QTimer> m_RenderTimer;
std::unique_ptr<QTimer> m_RenderRestartTimer; std::unique_ptr<QTimer> m_RenderRestartTimer;
shared_ptr<PaletteList<float>> m_PaletteList; shared_ptr<PaletteList<float>> m_PaletteList;

7
Source/Fractorium/FractoriumPalette.cpp
View File

@ -386,9 +386,7 @@ void FractoriumEmberController<T>::PaletteEditorButtonClicked()
auto ed = m_Fractorium->m_PaletteEditor; auto ed = m_Fractorium->m_PaletteEditor;
map<size_t, float> colorIndices; map<size_t, float> colorIndices;
bool forceFinal = m_Fractorium->HaveFinal(); bool forceFinal = m_Fractorium->HaveFinal();
m_PreviousTempPalette = m_TempPalette; // it's necessary because m_TempPalette is changed when the user make changes in palette editor
m_PreviosTempPalette = m_TempPalette; // it's necessary because m_TempPalette is changed when the user make changes in palette editor
ed->SetPalette(m_TempPalette); ed->SetPalette(m_TempPalette);
while (auto xform = m_Ember.GetTotalXform(i, forceFinal)) while (auto xform = m_Ember.GetTotalXform(i, forceFinal))
@ -397,7 +395,6 @@ void FractoriumEmberController<T>::PaletteEditorButtonClicked()
ed->SetColorIndices(colorIndices); ed->SetColorIndices(colorIndices);
ed->SetPreviousColorIndices(colorIndices); // also necessary because the colors are changed in palette editor ed->SetPreviousColorIndices(colorIndices); // also necessary because the colors are changed in palette editor
ed->SetPaletteFile(m_CurrentPaletteFilePath); ed->SetPaletteFile(m_CurrentPaletteFilePath);
#ifdef __linux__ #ifdef __linux__
ed->show(); ed->show();
#else #else
@ -446,7 +443,7 @@ void FractoriumEmberController<T>::SyncPalette(bool accepted)
size_t i = 0; size_t i = 0;
auto ed = m_Fractorium->m_PaletteEditor; auto ed = m_Fractorium->m_PaletteEditor;
Palette<float> edPal; Palette<float> edPal;
Palette<float> prevPal = m_PreviosTempPalette; Palette<float> prevPal = m_PreviousTempPalette;
map<size_t, float> colorIndices; map<size_t, float> colorIndices;
bool forceFinal = m_Fractorium->HaveFinal(); bool forceFinal = m_Fractorium->HaveFinal();