fix syntax
This commit is contained in:
60
prosperon.c
60
prosperon.c
@@ -7,10 +7,10 @@ colorf js2color(JSContext *js,JSValue v) {
|
||||
|
||||
colorf color = {1,1,1,1}; // Default to white
|
||||
|
||||
if (JS_IsArray(js, v)) {
|
||||
if (JS_IsArray(v)) {
|
||||
// Handle array format: [r, g, b, a]
|
||||
JSValue c[4];
|
||||
for (int i = 0; i < 4; i++) c[i] = JS_GetPropertyUint32(js,v,i);
|
||||
for (int i = 0; i < 4; i++) c[i] = JS_GetPropertyNumber(js,v,i);
|
||||
|
||||
color.r = js2number(js,c[0]);
|
||||
color.g = js2number(js,c[1]);
|
||||
@@ -31,10 +31,10 @@ colorf js2color(JSContext *js,JSValue v) {
|
||||
JSValue color2js(JSContext *js, colorf color)
|
||||
{
|
||||
JSValue arr = JS_NewArray(js);
|
||||
JS_SetPropertyUint32(js, arr,0,number2js(js,(double)color.r));
|
||||
JS_SetPropertyUint32(js, arr,1,number2js(js,(double)color.g));
|
||||
JS_SetPropertyUint32(js, arr,2,number2js(js,(double)color.b));
|
||||
JS_SetPropertyUint32(js, arr,3,number2js(js,(double)color.a));
|
||||
JS_SetPropertyNumber(js, arr,0,number2js(js,(double)color.r));
|
||||
JS_SetPropertyNumber(js, arr,1,number2js(js,(double)color.g));
|
||||
JS_SetPropertyNumber(js, arr,2,number2js(js,(double)color.b));
|
||||
JS_SetPropertyNumber(js, arr,3,number2js(js,(double)color.a));
|
||||
return arr;
|
||||
}
|
||||
|
||||
@@ -43,9 +43,9 @@ HMM_Vec2 js2vec2(JSContext *js,JSValue v)
|
||||
HMM_Vec2 v2;
|
||||
|
||||
// Check if it's an array
|
||||
if (JS_IsArray(js, v)) {
|
||||
{ JSValue val = JS_GetPropertyUint32(js,v,0); v2.X = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyUint32(js,v,1); v2.Y = js2number(js, val); JS_FreeValue(js,val); }
|
||||
if (JS_IsArray(v)) {
|
||||
{ JSValue val = JS_GetPropertyNumber(js,v,0); v2.X = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyNumber(js,v,1); v2.Y = js2number(js, val); JS_FreeValue(js,val); }
|
||||
} else {
|
||||
// Try to get x,y properties from object
|
||||
JSValue x_val = JS_GetPropertyStr(js, v, "x");
|
||||
@@ -64,9 +64,9 @@ HMM_Vec2 js2vec2(JSContext *js,JSValue v)
|
||||
HMM_Vec3 js2vec3(JSContext *js,JSValue v)
|
||||
{
|
||||
HMM_Vec3 v3;
|
||||
{ JSValue val = JS_GetPropertyUint32(js, v,0); v3.x = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyUint32(js, v,1); v3.y = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyUint32(js, v,2); v3.z = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyNumber(js, v,0); v3.x = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyNumber(js, v,1); v3.y = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyNumber(js, v,2); v3.z = js2number(js, val); JS_FreeValue(js,val); }
|
||||
return v3;
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ float *js2floats(JSContext *js, JSValue v, size_t *len)
|
||||
*len = JS_ArrayLength(js,v);
|
||||
float *arr = malloc(sizeof(float)* *len);
|
||||
for (int i = 0; i < *len; i++)
|
||||
{ JSValue val = JS_GetPropertyUint32(js,v,i); arr[i] = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyNumber(js,v,i); arr[i] = js2number(js, val); JS_FreeValue(js,val); }
|
||||
return arr;
|
||||
}
|
||||
|
||||
@@ -84,14 +84,14 @@ double *js2doubles(JSContext *js, JSValue v, size_t *len)
|
||||
*len = JS_ArrayLength(js,v);
|
||||
double *arr = malloc(sizeof(double)* *len);
|
||||
for (int i = 0; i < *len; i++)
|
||||
{ JSValue val = JS_GetPropertyUint32(js,v,i); arr[i] = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyNumber(js,v,i); arr[i] = js2number(js, val); JS_FreeValue(js,val); }
|
||||
return arr;
|
||||
}
|
||||
|
||||
HMM_Vec3 js2vec3f(JSContext *js, JSValue v)
|
||||
{
|
||||
HMM_Vec3 vec;
|
||||
if (JS_IsArray(js, v))
|
||||
if (JS_IsArray(v))
|
||||
return js2vec3(js,v);
|
||||
else
|
||||
vec.x = vec.y = vec.z = js2number(js,v);
|
||||
@@ -101,9 +101,9 @@ HMM_Vec3 js2vec3f(JSContext *js, JSValue v)
|
||||
JSValue vec32js(JSContext *js, HMM_Vec3 v)
|
||||
{
|
||||
JSValue array = JS_NewArray(js);
|
||||
JS_SetPropertyUint32(js, array,0,number2js(js,v.x));
|
||||
JS_SetPropertyUint32(js, array,1,number2js(js,v.y));
|
||||
JS_SetPropertyUint32(js, array,2,number2js(js,v.z));
|
||||
JS_SetPropertyNumber(js, array,0,number2js(js,v.x));
|
||||
JS_SetPropertyNumber(js, array,1,number2js(js,v.y));
|
||||
JS_SetPropertyNumber(js, array,2,number2js(js,v.z));
|
||||
return array;
|
||||
}
|
||||
|
||||
@@ -115,10 +115,10 @@ JSValue vec3f2js(JSContext *js, HMM_Vec3 v)
|
||||
JSValue quat2js(JSContext *js, HMM_Quat q)
|
||||
{
|
||||
JSValue arr = JS_NewArray(js);
|
||||
JS_SetPropertyUint32(js, arr, 0, number2js(js,q.x));
|
||||
JS_SetPropertyUint32(js, arr,1,number2js(js,q.y));
|
||||
JS_SetPropertyUint32(js, arr,2,number2js(js,q.z));
|
||||
JS_SetPropertyUint32(js, arr,3,number2js(js,q.w));
|
||||
JS_SetPropertyNumber(js, arr, 0, number2js(js,q.x));
|
||||
JS_SetPropertyNumber(js, arr,1,number2js(js,q.y));
|
||||
JS_SetPropertyNumber(js, arr,2,number2js(js,q.z));
|
||||
JS_SetPropertyNumber(js, arr,3,number2js(js,q.w));
|
||||
return arr;
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ HMM_Vec4 js2vec4(JSContext *js, JSValue v)
|
||||
{
|
||||
HMM_Vec4 v4;
|
||||
for (int i = 0; i < 4; i++)
|
||||
{ JSValue val = JS_GetPropertyUint32(js, v,i); v4.e[i] = js2number(js, val); JS_FreeValue(js,val); }
|
||||
{ JSValue val = JS_GetPropertyNumber(js, v,i); v4.e[i] = js2number(js, val); JS_FreeValue(js,val); }
|
||||
return v4;
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ double arr_vec_length(JSContext *js,JSValue v)
|
||||
|
||||
double sum = 0;
|
||||
for (int i = 0; i < len; i++)
|
||||
{ JSValue val = JS_GetPropertyUint32(js, v, i); double num = js2number(js, val); JS_FreeValue(js,val); sum += pow(num, 2); }
|
||||
{ JSValue val = JS_GetPropertyNumber(js, v, i); double num = js2number(js, val); JS_FreeValue(js,val); sum += pow(num, 2); }
|
||||
|
||||
return sqrt(sum);
|
||||
}
|
||||
@@ -155,7 +155,7 @@ JSValue vec42js(JSContext *js, HMM_Vec4 v)
|
||||
{
|
||||
JSValue array = JS_NewArray(js);
|
||||
for (int i = 0; i < 4; i++)
|
||||
JS_SetPropertyUint32(js, array,i,number2js(js,v.e[i]));
|
||||
JS_SetPropertyNumber(js, array,i,number2js(js,v.e[i]));
|
||||
return array;
|
||||
}
|
||||
|
||||
@@ -165,7 +165,7 @@ HMM_Vec2 *js2cpvec2arr(JSContext *js,JSValue v) {
|
||||
arrsetlen(arr,n);
|
||||
|
||||
for (int i = 0; i < n; i++) {
|
||||
JSValue ii = JS_GetPropertyUint32(js,v,i);
|
||||
JSValue ii = JS_GetPropertyNumber(js,v,i);
|
||||
arr[i] = js2vec2(js,ii);
|
||||
JS_FreeValue(js,ii);
|
||||
}
|
||||
@@ -193,7 +193,7 @@ rect js2rect(JSContext *js,JSValue v) {
|
||||
static JSValue floats2array(JSContext *js, float *vals, size_t len) {
|
||||
JSValue arr = JS_NewArray(js);
|
||||
for (size_t i = 0; i < len; i++) {
|
||||
JS_SetPropertyUint32(js, arr, i, number2js(js, vals[i]));
|
||||
JS_SetPropertyNumber(js, arr, i, number2js(js, vals[i]));
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
@@ -211,15 +211,15 @@ lrtb js2lrtb(JSContext *js, JSValue v)
|
||||
JSValue vec22js(JSContext *js,HMM_Vec2 v)
|
||||
{
|
||||
JSValue array = JS_NewArray(js);
|
||||
JS_SetPropertyUint32(js, array,0,number2js(js,v.x));
|
||||
JS_SetPropertyUint32(js, array,1,number2js(js,v.y));
|
||||
JS_SetPropertyNumber(js, array,0,number2js(js,v.x));
|
||||
JS_SetPropertyNumber(js, array,1,number2js(js,v.y));
|
||||
return array;
|
||||
}
|
||||
|
||||
JSValue vecarr2js(JSContext *js,HMM_Vec2 *points, int n) {
|
||||
JSValue array = JS_NewArray(js);
|
||||
for (int i = 0; i < n; i++)
|
||||
JS_SetPropertyUint32(js, array,i,vec22js(js,points[i]));
|
||||
JS_SetPropertyNumber(js, array,i,vec22js(js,points[i]));
|
||||
|
||||
return array;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user