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

--User changes

Browse Source 
-Make the default interpolation type be smooth.
 -Correctly label interpolation types in the combo in the animation table on the Flame tab.
  --Set the default combo index to be smooth.
This commit is contained in:
mfeemster 2016-03-12 14:42:56 -08:00
parent f22d0503d0
commit 020cfe9116
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Ember/Ember.h
View File

@ -219,7 +219,7 @@ public:
m_HighlightPower = -1; m_HighlightPower = -1;
m_Time = 0; m_Time = 0;
m_Background.Reset(); m_Background.Reset();
m_Interp = eInterp::EMBER_INTERP_LINEAR; m_Interp = eInterp::EMBER_INTERP_SMOOTH;
m_AffineInterp = eAffineInterp::AFFINE_INTERP_LOG; m_AffineInterp = eAffineInterp::AFFINE_INTERP_LOG;
//DE filter. //DE filter.
m_MinRadDE = 0; m_MinRadDE = 0;
@ -1367,7 +1367,7 @@ public:
m_Symmetry = 0; m_Symmetry = 0;
m_Rotate = 0; m_Rotate = 0;
m_PixelsPerUnit = 50; m_PixelsPerUnit = 50;
m_Interp = eInterp::EMBER_INTERP_LINEAR; m_Interp = eInterp::EMBER_INTERP_SMOOTH;
m_PaletteInterp = ePaletteInterp::INTERP_HSV; m_PaletteInterp = ePaletteInterp::INTERP_HSV;
m_Index = 0; m_Index = 0;
m_ParentFilename = ""; m_ParentFilename = "";

4
Source/EmberCommon/EmberCommon.h
View File

@ -130,8 +130,8 @@ static bool InitPaletteList(const string& filename)
if (!added || !paletteList.Size()) if (!added || !paletteList.Size())
{ {
cout << "Error parsing palette file " << filename << ". Reason: \n"; cout << "Error parsing palette file " << filename << ". Reason: \n"
cout << paletteList.ErrorReportString() << "\nReturning without executing.\n"; << paletteList.ErrorReportString() << "\nReturning without executing.\n";
return false; return false;
} }

4
Source/Fractorium/FractoriumParams.cpp
View File

@ -83,10 +83,12 @@ void Fractorium::InitParamsUI()
comboVals.push_back("Linear"); comboVals.push_back("Linear");
comboVals.push_back("Smooth"); comboVals.push_back("Smooth");
SetupCombo(table, this, row, 1, m_InterpTypeCombo, comboVals, SIGNAL(currentIndexChanged(int)), SLOT(OnInterpTypeComboCurrentIndexChanged(int))); SetupCombo(table, this, row, 1, m_InterpTypeCombo, comboVals, SIGNAL(currentIndexChanged(int)), SLOT(OnInterpTypeComboCurrentIndexChanged(int)));
m_InterpTypeCombo->SetCurrentIndexStealth(int(eInterp::EMBER_INTERP_SMOOTH));
comboVals.clear(); comboVals.clear();
comboVals.push_back("Step");
comboVals.push_back("Linear"); comboVals.push_back("Linear");
comboVals.push_back("Log");
SetupCombo( table, this, row, 1, m_AffineInterpTypeCombo, comboVals, SIGNAL(currentIndexChanged(int)), SLOT(OnAffineInterpTypeComboCurrentIndexChanged(int))); SetupCombo( table, this, row, 1, m_AffineInterpTypeCombo, comboVals, SIGNAL(currentIndexChanged(int)), SLOT(OnAffineInterpTypeComboCurrentIndexChanged(int)));
m_AffineInterpTypeCombo->SetCurrentIndexStealth(int(eAffineInterp::AFFINE_INTERP_LOG));
SetupSpinner<SpinBox, int>( table, this, row, 1, m_TemporalSamplesSpin, spinHeight, 1, 5000, 1, SIGNAL(valueChanged(int)), SLOT(OnTemporalSamplesChanged(int)), true, 1000); SetupSpinner<SpinBox, int>( table, this, row, 1, m_TemporalSamplesSpin, spinHeight, 1, 5000, 1, SIGNAL(valueChanged(int)), SLOT(OnTemporalSamplesChanged(int)), true, 1000);
SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_TemporalFilterWidthSpin, spinHeight, 1, 10, 1, SIGNAL(valueChanged(double)), SLOT(OnTemporalFilterWidthChanged(double)), true, 1); SetupSpinner<DoubleSpinBox, double>(table, this, row, 1, m_TemporalFilterWidthSpin, spinHeight, 1, 10, 1, SIGNAL(valueChanged(double)), SLOT(OnTemporalFilterWidthChanged(double)), true, 1);
comboVals = TemporalFilterCreator<float>::FilterTypes(); comboVals = TemporalFilterCreator<float>::FilterTypes();