Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-30 05:06:14 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add math helpers

Browse Source
This commit is contained in:
WarmUpTill
2023-03-11 19:04:20 +01:00
committed by WarmUpTill
parent b28c2b28b2
commit 4a3339c09c
8 changed files with 285 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/macro-core/macro-condition-variable.cpp
View File

@@ -36,15 +36,13 @@ const static std::map<MacroConditionVariable::Type, std::string>
static bool isNumber(const Variable &var)
{
double _;
return var.DoubleValue(_);
return var.DoubleValue().has_value();
}
static bool compareNumber(const Variable &var, double value, bool less)
{
double varValue;
if (!var.DoubleValue(varValue)) {
auto varValue = var.DoubleValue();
if (!varValue.has_value()) {
return false;
}
if (less) {
@@ -84,9 +82,9 @@ bool MacroConditionVariable::CompareVariables()
return false;
}
double val1, val2;
bool validNumbers = var1->DoubleValue(val1);
validNumbers = validNumbers && var2->DoubleValue(val2);
auto val1 = var1->DoubleValue();
auto val2 = var2->DoubleValue();
bool validNumbers = val1.has_value() && val2.has_value();
switch (_type) {
case MacroConditionVariable::Type::EQUALS_VARIABLE: