mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-01 13:56:06 -04:00
--User changes
-Fix stylesheets. -Make various fields in the options window be resettable via double click. -Get stylesheets working properly on Windows and Linux with Qt6. -Set default style to Fusion. --Code changes -Get build and deployment scripts working with latest versions of Qt6, AppImage, and various library dependencies. -Add two new macros so it would build with the latest gcc: SINGLETON_DERIVED_DECL_T and SINGLETON_DERIVED_IMPL_T. -Small changes to opencl.hpp. -Center progress bars on Linux. -Proper sizing of vertical header on the xaos visualization table on Linux.
This commit is contained in:
@ -49,7 +49,7 @@ public:
|
||||
bool IsModifiable(const string& filename);
|
||||
const map<string, vector<Palette<T>>>& Palettes() const;
|
||||
|
||||
SINGLETON_DERIVED_DECL(PaletteList<T>);
|
||||
SINGLETON_DERIVED_DECL_T(PaletteList, T);
|
||||
private:
|
||||
PaletteList();
|
||||
bool Save(const string& filename);
|
||||
|
@ -277,6 +277,14 @@ protected:
|
||||
x(const x& other) = delete; \
|
||||
const x& operator=(const x& other) = delete//Semicolon deliberately omitted to force it on the caller.
|
||||
|
||||
//Use this if the body of the destructor will be implemented in a cpp file and the type is templated.
|
||||
#define SINGLETON_DERIVED_DECL_T(x, T) \
|
||||
friend class Singleton<x<T>>; \
|
||||
public: \
|
||||
~x(); \
|
||||
x(const x& other) = delete; \
|
||||
const x& operator=(const x& other) = delete//Semicolon deliberately omitted to force it on the caller.
|
||||
|
||||
//Use this if the body of the destructor is empty and is will be implemented inline in the header file.
|
||||
#define SINGLETON_DERIVED_IMPL(x) \
|
||||
friend class Singleton<x>; \
|
||||
@ -285,6 +293,14 @@ protected:
|
||||
x(const x& other) = delete; \
|
||||
const x& operator=(const x& other) = delete
|
||||
|
||||
//Use this if the body of the destructor is empty and is will be implemented inline in the header file and the type is templated.
|
||||
#define SINGLETON_DERIVED_IMPL_T(x, T) \
|
||||
friend class Singleton<x<T>>; \
|
||||
public: \
|
||||
~x(){} \
|
||||
x(const x& other) = delete; \
|
||||
const x& operator=(const x& other) = delete
|
||||
|
||||
/// <summary>
|
||||
/// The calculations in some variations were changed from what they were in flam3/Apophysis to match Chaotica.
|
||||
/// Some users prefer the old functionality, so provide an option to retain it.
|
||||
|
@ -709,7 +709,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
SINGLETON_DERIVED_IMPL(VarFuncs<T>);
|
||||
SINGLETON_DERIVED_IMPL_T(VarFuncs, T);
|
||||
|
||||
private:
|
||||
/// <summary>
|
||||
|
@ -49,7 +49,7 @@ public:
|
||||
const vector<const Variation<T>*>& NonParametricVariations() const;
|
||||
const vector<const ParametricVariation<T>*>& ParametricVariations() const;
|
||||
|
||||
SINGLETON_DERIVED_DECL(VariationList<T>);
|
||||
SINGLETON_DERIVED_DECL_T(VariationList, T);
|
||||
|
||||
private:
|
||||
VariationList();
|
||||
|
Reference in New Issue
Block a user