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

--Bug fixes

Browse Source 
-Fix some potential OpenCL compilation bugs on circlecrop, circlecrop2, oscilloscope2, Truchet_hex_crop.
 -Prevent the minus key from changing the current xform when being pressed in a textbox.

--Code changes
 -Cleanup some casting in depth_blur, depth_blur2.
This commit is contained in:
Person
2019-06-24 19:43:15 -07:00
parent d234f635ea
commit ee1d5eb44d
6 changed files with 87 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Source/EmberCommon/EmberCommon.h
View File

@ -736,6 +736,38 @@ bool SearchVar(const Variation<T>* var, const vector<string>& stringVec, bool ma
return ret;
}
template <typename T>
bool SearchVarWWO(const Variation<T>* var, const vector<string>& withVec, const vector<string>& withoutVec)
{
bool ret = false;
size_t i, j, k;
bool onegood = false;
auto cl = var->OpenCLFuncsString() + "\n" + var->OpenCLString();
vector<string> clsplits = Split(cl, '\n');
for (i = 0; i < clsplits.size(); i++)
{
for (j = 0; j < withVec.size(); j++)
{
if (clsplits[i].find(withVec[j]) != std::string::npos)
{
for (k = 0; k < withoutVec.size(); k++)
{
if (clsplits[i].find(withoutVec[k]) != std::string::npos)
{
return false;
}
}
onegood = true;
}
}
}
return onegood;
//return i == clsplits.size() && j == withVec.size() && k == withoutVec.size();
}
/// <summary>
/// Find all variations whose OpenCL string contains any of the search strings in stringVec.
/// This is useful for finding variations with certain characteristics since it's not possible
@ -766,6 +798,23 @@ static vector<const Variation<T>*> FindVarsWith(const vector<const Variation<T>*
return vec;
}
template <typename T>
static vector<const Variation<T>*> FindVarsWithWithout(const vector<const Variation<T>*>& vars, const vector<string>& withVec, const vector<string>& withoutVec)
{
vector<const Variation<T>*> vec;
auto vl = VariationList<T>::Instance();
for (auto& v : vars)
{
if (SearchVarWWO<T>(v, withVec, withoutVec))
{
vec.push_back(v);
}
}
return vec;
}
/// <summary>
/// Find all variations whose OpenCL string does not contain any of the search strings in stringVec.
/// This is useful for finding variations without certain characteristics since it's not possible