mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-19 06:35:21 -04:00
--User changes
-Edits will not save back to the file in memory on render completion when preview renderer is running. --Bug fixes -dc_perlin was crashing on Nvidia when using SP. -Duplicate images were randomly getting added to the file in memory. -Crash when opening an Xml with less than 2 flames in it. --Code changes -Use raw array of floats in OpenCL for perlin noise, rather than float3/double3. -Add some default cases to dc_perlin. -Redo singleton pattern yet again. Deriving from a templated Singleton<T> class was creating a separate instance per module. Now only one instance of each type will ever be created and it will be wrapped in a shared_ptr which guarantees its deletion as main() exits.
This commit is contained in:
@ -21,10 +21,7 @@ template <typename T>
|
||||
class EMBER_API VariationList
|
||||
{
|
||||
public:
|
||||
static VariationList<T>& Instance();
|
||||
~VariationList();
|
||||
VariationList<T>(const VariationList<T>& varList) = delete;
|
||||
VariationList<T>& operator = (const VariationList<T>& varList) = delete;
|
||||
const Variation<T>* GetVariation(size_t index) const;
|
||||
const Variation<T>* GetVariation(size_t index, eVariationType varType) const;
|
||||
Variation<T>* GetVariationCopy(size_t index, T weight = 1) const;
|
||||
@ -48,6 +45,8 @@ public:
|
||||
const vector<Variation<T>*>& PreVars() const;
|
||||
const vector<Variation<T>*>& PostVars() const;
|
||||
|
||||
SINGLETON_INSTANCE_DECL(VariationList);//Implemented in VariationList.cpp
|
||||
|
||||
private:
|
||||
VariationList();
|
||||
Variation<T>* MakeCopyWithWeight(const Variation<T>* var, T weight) const;
|
||||
|
Reference in New Issue
Block a user