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

--User changes

Browse Source 
-Add a new option --statevars to EmberGenome to list the variations which change state.
 -Allow for filtering in the Variations Dialog based on the same types listed in the EmberGenome options.

--Code changes
 -More correctly populate VariationList::m_ParametricVariations and VariationList::m_NonParametricVariations to account for variations which have params only used for precalc.
 -Consolidate some of the code in VariationList which searches by name.
This commit is contained in:
mfeemster
2016-05-18 16:48:40 -07:00
parent 33cc2a4326
commit cffeceec99
9 changed files with 462 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/EmberGenome/EmberGenome.cpp
View File

@ -67,9 +67,12 @@ bool EmberGenome(EmberOptions& opt)
auto varList = VariationList<T>::Instance();
if (opt.AllVars() || opt.SumVars() || opt.AssignVars() || opt.PpSumVars() || opt.PpAssignVars() ||
opt.DcVars() || opt.ParVars() || opt.NonParVars() ||
opt.DcVars() || opt.StateVars() || opt.ParVars() || opt.NonParVars() ||
opt.RegVars() || opt.PreVars() || opt.PostVars())
{
vector<string> assign{ "outPoint->m_X =", "outPoint->m_Y =", "outPoint->m_Z =",
"outPoint->m_X=", "outPoint->m_Y=", "outPoint->m_Z=" };
if (opt.AllVars())
{
auto& vars = varList->AllVars();
@ -80,18 +83,14 @@ bool EmberGenome(EmberOptions& opt)
else if (opt.SumVars())
{
auto& reg = varList->RegVars();
auto matches = FindVarsWithout<T>(varList->RegVars(), vector<string> { "outPoint->m_X =", "outPoint->m_Y =", "outPoint->m_Z =",
"outPoint->m_X=", "outPoint->m_Y=", "outPoint->m_Z="
});
auto matches = FindVarsWithout<T>(varList->RegVars(), assign);
for (auto& v : matches)
cout << v->Name() << "\n";
}
else if (opt.AssignVars())
{
auto matches = FindVarsWith<T>(varList->RegVars(), vector<string> { "outPoint->m_X =", "outPoint->m_Y =", "outPoint->m_Z =",
"outPoint->m_X=", "outPoint->m_Y=", "outPoint->m_Z="
});
auto matches = FindVarsWith<T>(varList->RegVars(), assign);
for (auto& v : matches)
cout << v->Name() << "\n";
@ -130,18 +129,26 @@ bool EmberGenome(EmberOptions& opt)
for (auto& v : matches)
cout << v->Name() << "\n";
}
else if (opt.StateVars())
{
auto& all = varList->AllVars();
for (auto& v : all)
if (!v->StateOpenCLString().empty())
cout << v->Name() << "\n";
}
else if (opt.ParVars())
{
auto& par = varList->ParametricVariations();
auto& parVars = varList->ParametricVariations();
for (auto& v : par)
for (auto& v : parVars)
cout << v->Name() << "\n";
}
else if (opt.NonParVars())
{
auto& par = varList->NonParametricVariations();
auto& vars = varList->NonParametricVariations();
for (auto& v : par)
for (auto& v : vars)
cout << v->Name() << "\n";
}
else