mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-02 14:26:17 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--User changes

Browse Source 
-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:
mfeemster
2016-04-13 20:59:57 -07:00
parent 7715910362
commit 0fbea60026
29 changed files with 264 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/EmberGenome/EmberGenome.cpp
View File

@ -64,13 +64,13 @@ bool EmberGenome(EmberOptions& opt)
return true;
}
VariationList<T>& varList(VariationList<T>::Instance());
auto varList = VariationList<T>::Instance();
if (opt.AllVars() || opt.RegVars() || opt.PreVars() || opt.PostVars())
{
if (opt.AllVars())
{
auto& vars = varList.AllVars();
auto& vars = varList->AllVars();
for (auto& v : vars)
cout << v->Name() << "\n";
@ -82,13 +82,13 @@ bool EmberGenome(EmberOptions& opt)
vector<Variation<T>*> vars;
if (opt.RegVars())
vars.insert(vars.end(), varList.RegVars().begin(), varList.RegVars().end());
vars.insert(vars.end(), varList->RegVars().begin(), varList->RegVars().end());
if (opt.PreVars())
vars.insert(vars.end(), varList.PreVars().begin(), varList.PreVars().end());
vars.insert(vars.end(), varList->PreVars().begin(), varList->PreVars().end());
if (opt.PostVars())
vars.insert(vars.end(), varList.PostVars().begin(), varList.PostVars().end());
vars.insert(vars.end(), varList->PostVars().begin(), varList->PostVars().end());
for (auto& v : vars)
cout << v->Name() << "\n";
@ -192,16 +192,16 @@ bool EmberGenome(EmberOptions& opt)
noVars.push_back(eVariationId::VAR_SPLITS);
//Loop over the novars and set ivars to the complement.
for (i = 0; i < varList.Size(); i++)
for (i = 0; i < varList->Size(); i++)
{
for (j = 0; j < noVars.size(); j++)
{
if (noVars[j] == varList.GetVariation(i)->VariationId())
if (noVars[j] == varList->GetVariation(i)->VariationId())
break;
}
if (j == noVars.size())
vars.push_back(varList.GetVariation(i)->VariationId());
vars.push_back(varList->GetVariation(i)->VariationId());
}
}
else
@ -214,7 +214,7 @@ bool EmberGenome(EmberOptions& opt)
{
if (parser.Aton(token.c_str(), val))
{
if (val < varList.Size())
if (val < varList->Size())
vars.push_back(static_cast<eVariationId>(val));
}
}
@ -227,22 +227,22 @@ bool EmberGenome(EmberOptions& opt)
{
if (parser.Aton(token.c_str(), val))
{
if (val < varList.Size())
if (val < varList->Size())
noVars.push_back(static_cast<eVariationId>(val));
}
}
//Loop over the novars and set ivars to the complement.
for (i = 0; i < varList.Size(); i++)
for (i = 0; i < varList->Size(); i++)
{
for (j = 0; j < noVars.size(); j++)
{
if (noVars[j] == varList.GetVariation(i)->VariationId())
if (noVars[j] == varList->GetVariation(i)->VariationId())
break;
}
if (j == noVars.size())
vars.push_back(varList.GetVariation(i)->VariationId());
vars.push_back(varList->GetVariation(i)->VariationId());
}
}
}