mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-06-30 21:36:33 -04:00
--Code changes
-Split VariationList into .h/cpp files. --Make VariationList.cpp the only place where the variations files are included from. This speeds up the build, but variations can no longer be directly instantiated. --Variations are no longer exported.
This commit is contained in:
@ -48,7 +48,8 @@ FractoriumEmberControllerBase::~FractoriumEmberControllerBase()
|
||||
/// <param name="fractorium">Pointer to the main window.</param>
|
||||
template <typename T>
|
||||
FractoriumEmberController<T>::FractoriumEmberController(Fractorium* fractorium)
|
||||
: FractoriumEmberControllerBase(fractorium)
|
||||
: FractoriumEmberControllerBase(fractorium),
|
||||
m_VariationList(VariationList<T>::Instance())
|
||||
{
|
||||
bool b = false;
|
||||
m_PreviewRun = false;
|
||||
|
@ -499,7 +499,7 @@ private:
|
||||
Xform<T> m_CopiedFinalXform;
|
||||
Palette<T> m_TempPalette;
|
||||
PaletteList<T> m_PaletteList;
|
||||
VariationList<T> m_VariationList;
|
||||
VariationList<T>& m_VariationList;
|
||||
unique_ptr<SheepTools<T, float>> m_SheepTools;
|
||||
unique_ptr<GLEmberController<T>> m_GLController;
|
||||
unique_ptr<EmberNs::Renderer<T, float>> m_PreviewRenderer;
|
||||
|
@ -282,7 +282,7 @@ void FractoriumEmberController<T>::AddFinalXform()
|
||||
{
|
||||
Xform<T> final;
|
||||
auto combo = m_Fractorium->ui.CurrentXformCombo;
|
||||
final.AddVariation(new LinearVariation<T>());//Just a placeholder so other parts of the code don't see it as being empty.
|
||||
final.AddVariation(m_VariationList.GetVariationCopy(eVariationId::VAR_LINEAR));//Just a placeholder so other parts of the code don't see it as being empty.
|
||||
m_Ember.SetFinalXform(final);
|
||||
int index = int(m_Ember.TotalXformCount() - 1);//Set index to the last item.
|
||||
FillXforms(index);
|
||||
|
@ -10,7 +10,8 @@
|
||||
/// <param name="f">The window flags. Default: 0.</param>
|
||||
FractoriumVariationsDialog::FractoriumVariationsDialog(FractoriumSettings* settings, QWidget* p, Qt::WindowFlags f)
|
||||
: QDialog(p, f),
|
||||
m_Settings(settings)
|
||||
m_Settings(settings),
|
||||
m_VariationList(VariationList<float>::Instance())
|
||||
{
|
||||
ui.setupUi(this);
|
||||
auto table = ui.VariationsTable;
|
||||
|
@ -41,7 +41,7 @@ private:
|
||||
void GuiToData();
|
||||
void Populate();
|
||||
void SetCheckFromMap(QTableWidgetItem* cb, const Variation<float>* var);
|
||||
VariationList<float> m_VariationList;
|
||||
VariationList<float>& m_VariationList;
|
||||
QMap<QString, QVariant> m_Vars;
|
||||
FractoriumSettings* m_Settings;
|
||||
Ui::VariationsDialog ui;
|
||||
|
Reference in New Issue
Block a user