john/cell
1
0
Fork 0
Code Issues 31 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Add all files needed for engine into main branch

Browse Source
This commit is contained in:
John Alanbrook
2023-04-22 21:44:26 +00:00
parent 1e8d76961d
commit 2ab0f33d3f
31 changed files with 6077 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/engine/ffi.c
View File

@@ -553,7 +553,8 @@ JSValue dukext2paths(char *ext)
JSValue duk_cmd(JSContext *js, JSValueConst this, int argc, JSValueConst *argv)
{
int cmd = js2int(argv[0]);
const char *str;
const char *str = NULL;
const char *str2 = NULL;
JSValue ret = JS_NULL;
switch(cmd) {
@@ -611,16 +612,23 @@ JSValue duk_cmd(JSContext *js, JSValueConst this, int argc, JSValueConst *argv)
return ret;
case 12:
sprite_loadtex(id2sprite(js2int(argv[1])), JS_ToCString(js, argv[2]), js2glrect(argv[3]));
str = JS_ToCString(js,argv[2]);
sprite_loadtex(id2sprite(js2int(argv[1])), str, js2glrect(argv[3]));
JS_FreeCString(js,str);
break;
case 13:
play_song(JS_ToCString(js, argv[1]), JS_ToCString(js, argv[2]));
str = JS_ToCString(js,argv[1]);
str2 = JS_ToCString(js,argv[2]);
play_song(str,str2);
JS_FreeCString(js,str);
JS_FreeCString(js,str2);
break;
case 14:
mini_sound(JS_ToCString(js, argv[1]));
str = JS_ToCString(js, argv[1]);
mini_sound(str);
JS_FreeCString(js,str);
break;
case 15:
@@ -712,10 +720,18 @@ JSValue duk_cmd(JSContext *js, JSValueConst this, int argc, JSValueConst *argv)
break;
case 38:
return JS_NewString(js, slurp_text(JS_ToCString(js, argv[1])));
str = JS_ToCString(js,argv[1]);
ret = JS_NewString(js, slurp_text(str));
JS_FreeCString(js,str);
return ret;
case 39:
return JS_NewInt64(js, slurp_write(JS_ToCString(js, argv[1]), JS_ToCString(js, argv[2])));
str = JS_ToCString(js,argv[1]);
str2 = JS_ToCString(js,argv[2]);
ret = JS_NewInt64(js, slurp_write(str, str2));
JS_FreeCString(js,str);
JS_FreeCString(js,str2);
return ret;
case 40:
id2go(js2int(argv[1]))->filter.categories = js2bitmask(argv[2]);
@@ -805,13 +821,19 @@ JSValue duk_cmd(JSContext *js, JSValueConst this, int argc, JSValueConst *argv)
return JS_NewFloat64(js, deltaT);
case 64:
return vec2js(tex_get_dimensions(texture_pullfromfile(JS_ToCString(js, argv[1]))));
str = JS_ToCString(js,argv[1]);
ret = vec2js(tex_get_dimensions(texture_pullfromfile(str)));
break;
case 65:
return JS_NewBool(js, file_exists(JS_ToCString(js, argv[1])));
str = JS_ToCString(js,argv[1]);
ret = JS_NewBool(js, file_exists(str));
break;
case 66:
return dukext2paths(JS_ToCString(js, argv[1]));
str = JS_ToCString(js,argv[1]);
ret = dukext2paths(str);
break;
case 67:
opengl_rendermode(LIT);
@@ -885,8 +907,9 @@ JSValue duk_cmd(JSContext *js, JSValueConst this, int argc, JSValueConst *argv)
return ints2js(phys2d_query_box_points(js2vec2(argv[1]), js2vec2(argv[2]), js2cpvec2arr(argv[3]), js2int(argv[4])));
case 87:
mini_music_play(JS_ToCString(js, argv[1]));
return JS_NULL;
str = JS_ToCString(js, argv[1]);
mini_music_play(str);
break;
case 88:
mini_music_pause();
@@ -897,10 +920,20 @@ JSValue duk_cmd(JSContext *js, JSValueConst this, int argc, JSValueConst *argv)
return JS_NULL;
case 90:
window_set_icon(JS_ToCString(js, argv[1]));
str = JS_ToCString(js, argv[1]);
window_set_icon(str);
break;
}
if (str)
JS_FreeCString(js,str);
if (str2)
JS_FreeCString(js,str2);
if (!JS_IsNull(ret))
return ret;
return JS_NULL;
}

1
source/engine/script.c
View File

@@ -38,7 +38,6 @@ void script_init() {
/* Load all prefabs into memory */
script_dofile("scripts/engine.js");
script_dofile("config.js");
//ftw(".", load_prefab, 10);
}
void script_run(const char *script) {

2
source/engine/texture.c
View File

@@ -122,7 +122,7 @@ struct Texture *texture_loadfromfile(const char *path)
{
struct Texture *new = texture_pullfromfile(path);
if (new == NULL) { new = texture_pullfromfile("./ph.png"); }
if (new == NULL) { new = texture_pullfromfile("./icons/no_tex.png"); }
if (new->id == 0) {
glGenTextures(1, &new->id);

2
source/engine/yugine.c
View File

@@ -187,7 +187,7 @@ int main(int argc, char **args) {
renderMS = 1.0/vidmode->refreshRate;
if (ed)
script_dofile("editor.js");
script_dofile("scripts/editor.js");
else
script_dofile("game.js");