FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Nasal math.clamp()

Browse Source 
Thanks to "Red Leader" from the forum for spotting
This commit is contained in:
Torsten Dreyer
2016-05-02 21:57:35 +02:00
parent 379a171d24
commit bba11c18d1
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/nasal/mathlib.c
+5 -6
View File
@@ -117,15 +117,14 @@ static naRef f_fmod(naContext c, naRef me, int argc, naRef* args)
static naRef f_clamp(naContext c, naRef me, int argc, naRef* args) static naRef f_clamp(naContext c, naRef me, int argc, naRef* args)
{ {
naRef a = naNumValue(argc > 0 ? args[0] : naNil()); naRef a = naNumValue(argc > 0 ? args[0] : naNil());
naRef b = naNumValue(argc > 1 ? args[1] : naNil()); naRef min = naNumValue(argc > 1 ? args[1] : naNil());
naRef x = naNumValue(argc > 2 ? args[2] : naNil()); naRef max = naNumValue(argc > 2 ? args[2] : naNil());
if(naIsNil(a) || naIsNil(b) || naIsNil(x)) if(naIsNil(a) || naIsNil(min) || naIsNil(max))
naRuntimeError(c, "non numeric arguments to clamp()"); naRuntimeError(c, "non numeric arguments to clamp()");
if (a.num < b.num) b.num = a.num; a.num = a.num < min.num ? min.num : ( a.num > max.num ? max.num : a.num );
if (b.num > x.num) b.num = x.num; return VALIDATE(a);
return VALIDATE(b);
} }
static naRef f_periodic(naContext c, naRef me, int argc, naRef* args) static naRef f_periodic(naContext c, naRef me, int argc, naRef* args)