--Bug fixes

-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

View File

@ -1585,21 +1585,26 @@ void TestOperations()
void TestArbitrary()
{
vector<string> stringVec;
vector<string> stringVec, withoutVec;
auto varList = VariationList<float>::Instance();
auto& vars = varList->AllVars();
stringVec.push_back(" = vIn.x - ");
stringVec.push_back(" = vIn.y - ");
stringVec.push_back("sqrt(");
stringVec.push_back("atan2(");
stringVec.push_back("sin(");
stringVec.push_back("cos(");
stringVec.push_back("if (!");
withoutVec.push_back("=");
withoutVec.push_back("<");
withoutVec.push_back(">");
//stringVec.push_back(" = vIn.x - ");
//stringVec.push_back(" = vIn.y - ");
//stringVec.push_back("sqrt(");
//stringVec.push_back("atan2(");
//stringVec.push_back("sin(");
//stringVec.push_back("cos(");
//stringVec.push_back("sincos(");
auto varVec = FindVarsWith<float>(vars, stringVec, true, true);
//auto varVec = FindVarsWith<float>(vars, stringVec, true, true);
auto varVec = FindVarsWithWithout<float>(vars, stringVec, withoutVec);
for (auto& it : varVec)
{
cout << "Variation " << it->Name() << " contained the desired strings." << endl;
cout << "Variation " << it->Name() << " contained the desired w/wo strings." << endl;
}
}