Misc intermediate fixes, more work on these to follow.

--Bug fixes:
-Fix crash when using smooth interpolation in EmberGenome.
-Print error and exit EmberGenome when sequencing if times are not
sorted.

--Code changes:
-Another attempt at Singleton. This reverts the design to what it was
before with a fix to the code that was causing it not to behave like a
singleton should.
This commit is contained in:
Matt Feemster
2016-04-21 15:33:00 -07:00
parent d639921d68
commit cac7308776
9 changed files with 45 additions and 57 deletions

View File

@ -18,10 +18,10 @@ namespace EmberNs
/// Template argument expected to be float or double.
/// </summary>
template <typename T>
class EMBER_API VariationList
class EMBER_API VariationList: public Singleton<VariationList<T>>
{
public:
~VariationList();
//~VariationList();
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;
@ -45,7 +45,7 @@ public:
const vector<Variation<T>*>& PreVars() const;
const vector<Variation<T>*>& PostVars() const;
SINGLETON_INSTANCE_DECL(VariationList);//Implemented in VariationList.cpp
SINGLETON_DERIVED_DECL(VariationList<T>);
private:
VariationList();