krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 14:54:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Added partial cos and sine implementations

Browse Source
This commit is contained in:
Add00
2023-07-31 19:02:55 -04:00
parent 027d093e21
commit 81fe278c96
2 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
repl/lib_standard.c
View File

@@ -9,6 +9,7 @@
#define STD_MATH_PI 3.14159265358979323846f
#define STD_MATH_E 2.71828182845904523536f
#define STD_MATH_LIMIT 20
static int nativeClock(Toy_Interpreter* interpreter, Toy_LiteralArray* arguments) {
//no arguments
@@ -669,34 +670,40 @@ static int nativeSin(Toy_Interpreter* interpreter, Toy_LiteralArray* arguments)
}
//get the argument
Toy_Literal valueLiteral = Toy_popLiteralArray(arguments);
Toy_Literal radiansLiteral = Toy_popLiteralArray(arguments);
//parse the argument (if it's an identifier)
Toy_Literal valueLiteralIdn = valueLiteral;
if (TOY_IS_IDENTIFIER(valueLiteral) && Toy_parseIdentifierToValue(interpreter, &valueLiteral)) {
Toy_freeLiteral(valueLiteralIdn);
Toy_Literal radiansLiteralIdn = radiansLiteral;
if (TOY_IS_IDENTIFIER(radiansLiteral) && Toy_parseIdentifierToValue(interpreter, &radiansLiteral)) {
Toy_freeLiteral(radiansLiteralIdn);
}
//check the argument type
if (!(TOY_IS_INTEGER(valueLiteral) || TOY_IS_FLOAT(valueLiteral))) {
interpreter->errorOutput("Incorrect argument type passed to lerp\n");
Toy_freeLiteral(valueLiteral);
if (!(TOY_IS_INTEGER(radiansLiteral) || TOY_IS_FLOAT(radiansLiteral))) {
interpreter->errorOutput("Incorrect argument type passed to sin\n");
Toy_freeLiteral(radiansLiteral);
return -1;
}
// cast ints to floats to handle all types of numbers
float value = TOY_IS_INTEGER(valueLiteral)? TOY_AS_INTEGER(valueLiteral) : TOY_AS_FLOAT(valueLiteral);
float radians = TOY_IS_INTEGER(radiansLiteral)? TOY_AS_INTEGER(radiansLiteral) : TOY_AS_FLOAT(radiansLiteral);
// calculate the result
// using Taylor series approximation
float result = 0;
float power = value;
int sign = 1;
float result = radians;
float numerator = radians;
float denominator = 1;
for (int n = 1; n <= 10; n += 2) {
result += sign * power / n;
power = power * value * value;
sign = -sign;
for (int i = 1; i <= STD_MATH_LIMIT; i++) {
numerator *= radians * radians;
denominator *= (2 * i) * (2 * i + 1);
float value = numerator / denominator;
if (i & 0x01)
result -= value;
else
result += value;
}
//return the result
@@ -705,7 +712,7 @@ static int nativeSin(Toy_Interpreter* interpreter, Toy_LiteralArray* arguments)
//cleanup
Toy_freeLiteral(resultLiteral);
Toy_freeLiteral(valueLiteral);
Toy_freeLiteral(radiansLiteral);
return 1;
}
@@ -717,35 +724,29 @@ static int nativeCos(Toy_Interpreter* interpreter, Toy_LiteralArray* arguments)
}
//get the argument
Toy_Literal valueLiteral = Toy_popLiteralArray(arguments);
Toy_Literal radiansLiteral = Toy_popLiteralArray(arguments);
//parse the argument (if it's an identifier)
Toy_Literal valueLiteralIdn = valueLiteral;
if (TOY_IS_IDENTIFIER(valueLiteral) && Toy_parseIdentifierToValue(interpreter, &valueLiteral)) {
Toy_freeLiteral(valueLiteralIdn);
Toy_Literal radiansLiteralIdn = radiansLiteral;
if (TOY_IS_IDENTIFIER(radiansLiteral) && Toy_parseIdentifierToValue(interpreter, &radiansLiteral)) {
Toy_freeLiteral(radiansLiteralIdn);
}
//check the argument type
if (!(TOY_IS_INTEGER(valueLiteral) || TOY_IS_FLOAT(valueLiteral))) {
if (!(TOY_IS_INTEGER(radiansLiteral) || TOY_IS_FLOAT(radiansLiteral))) {
interpreter->errorOutput("Incorrect argument type passed to lerp\n");
Toy_freeLiteral(valueLiteral);
Toy_freeLiteral(radiansLiteral);
return -1;
}
// cast ints to floats to handle all types of numbers
float value = TOY_IS_INTEGER(valueLiteral)? TOY_AS_INTEGER(valueLiteral) : TOY_AS_FLOAT(valueLiteral);
float radians = TOY_IS_INTEGER(radiansLiteral)? TOY_AS_INTEGER(radiansLiteral) : TOY_AS_FLOAT(radiansLiteral);
// calculate the result
// using Taylor series approximation
float result = 0;
float power = value;
int sign = 1;
for (int n = 0; n <= 10; n += 2) {
result += sign * power;
power = power * value * value / ((n + 1) * (n + 2));
sign = -sign;
}
// TODO
float result = -1;
//return the result
Toy_Literal resultLiteral = TOY_TO_FLOAT_LITERAL(result);
@@ -753,7 +754,7 @@ static int nativeCos(Toy_Interpreter* interpreter, Toy_LiteralArray* arguments)
//cleanup
Toy_freeLiteral(resultLiteral);
Toy_freeLiteral(valueLiteral);
Toy_freeLiteral(radiansLiteral);
return 1;
}
@@ -2325,8 +2326,8 @@ int Toy_hookStandard(Toy_Interpreter* interpreter, Toy_Literal identifier, Toy_L
{"lerp", nativeLerp},
{"toRad", nativeToRad},
{"toDeg", nativeToDeg},
// {"sin", nativeSin},
// {"cos", nativeCos},
{"sin", nativeSin},
{"cos", nativeCos},
//compound utils
{"concat", nativeConcat}, //array, dictionary, string

12
test/scripts/lib/standard.toy
View File

@@ -157,6 +157,7 @@ import standard;
assert typeof lerp(0, 10, 0) == float, "typeof lerp result failed";
}
// test toRad
{
assert toRad(0) == 0, "toRad 0° failed";
@@ -164,6 +165,7 @@ import standard;
assert toRad(360) == 2 * PI, "toRad 360° failed";
}
// test toDeg
{
assert toDeg(0) == 0, "toDeg 0 failed";
@@ -171,6 +173,16 @@ import standard;
assert toDeg(2 * PI) == 360, "toDeg 2π failed";
}
// test sin
{
assert sin(PI) == 0, "sin π failed";
}
// test cos
{
assert cos(PI) == -1, "cos π failed";
}
//test concat
{