diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 16:49:28 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 16:49:28 -0400 |
| commit | 626920dda38a512b27c5e8fd79b0c9b09be01898 (patch) | |
| tree | 89c54e31848048ee084005fd3a0a1316f5530966 /indra/llmath | |
| parent | f6b3b5e803b0c08d55ecd10eac3e9e75518760a9 (diff) | |
| parent | d8e52ec001c476a2320f2d5caceb813465d707e4 (diff) | |
Merge remote branch 'develop' into release/luau-scripting for Maint B
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llcalcparser.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h index ea71752ebc..ec7f6a2cb6 100644 --- a/indra/llmath/llcalcparser.h +++ b/indra/llmath/llcalcparser.h @@ -131,14 +131,14 @@ struct LLCalcParser : grammar<LLCalcParser> power = unary_expr[power.value = arg1] >> - *('^' >> assert_syntax(unary_expr[power.value = phoenix::bind(&powf)(power.value, arg1)])) + *('^' >> assert_syntax(unary_expr[power.value = phoenix::bind(&LLCalcParser::_pow)(self, power.value, arg1)])) ; term = power[term.value = arg1] >> *(('*' >> assert_syntax(power[term.value *= arg1])) | ('/' >> assert_syntax(power[term.value /= arg1])) | - ('%' >> assert_syntax(power[term.value = phoenix::bind(&fmodf)(term.value, arg1)])) + ('%' >> assert_syntax(power[term.value = phoenix::bind(&LLCalcParser::_fmod)(self, term.value, arg1)])) ) ; @@ -177,6 +177,8 @@ private: F32 _floor(const F32& a) const { return (F32)llfloor(a); } F32 _ceil(const F32& a) const { return (F32)llceil(a); } F32 _atan2(const F32& a,const F32& b) const { return atan2(a,b); } + F32 _pow(const F32& a, const F32& b) const { return powf(a, b); } + F32 _fmod(const F32&a, const F32& b) const { return fmodf(a, b); } LLCalc::calc_map_t* mConstants; LLCalc::calc_map_t* mVariables; |