Fix race condition for sound ending

scripts/ai.js

@@ -1,16 +1,8 @@
 var AI = {
-  tick() {
-    
-  },
-
-  sequence(list) {
-    
-  },
-  
   race(list) {
-    return function() {
+    return function(dt) {
       var good = false;
-      list.forEach(x => if (x()) good = true);
+      list.forEach(function(x) { if (x.call(this,dt)) good = true; }, this);
       return good;
     };
   },
@@ -19,20 +11,33 @@ var AI = {
     
   },
 
-  sync(list) {
-    return function() {
+  sequence(list) {
+    var i = 0;
+    return function(dt) {
+      while (i !== list.length) {
+        if (list[i].call(this,dt))
+	  i++;
+	else
+	  return false;
+      }
+      return true;
+    };
+  },
+
+  parallel(list) {
+    return function(dt) {
       var good = true;
-      list.forEach(x => if (!x()) good = false);
+      list.forEach(function(x){ if (!x.call(this,dt)) good = false; },this);
       return good;
     };
   },
 
-  moveto(pos) {
-    return function() {
-    var dir = pos.sub(this.pos);
+  moveto() {
+    return function(dt) {
+    var dir = this.randomloc.sub(this.pos);
     if (Vector.length(dir) < 10) return true;
     
-    this.velocity = Vector.normalize(pos.sub(this.pos)).scale(20);
+    this.velocity = Vector.norm(this.randomloc.sub(this.pos)).scale(20);
     return false;
     }
   },
@@ -40,8 +45,8 @@ var AI = {
   wait(secs) {
     secs ??= 1;
     var accum = 0;
-    return function() {
-      accum += Game.dt;
+    return function(dt) {
+      accum += dt;
       if (accum >= secs)
         return true;
 	

scripts/engine.js

@@ -470,6 +470,7 @@ Render.doc = {
 load("scripts/physics.js");
 load("scripts/input.js");
 load("scripts/sound.js");
+load("scripts/ai.js");
 
 function screen2world(screenpos) {
   if (Game.camera)

scripts/entity.js

@@ -62,6 +62,7 @@ var gameobject = {
     cry(file) {
       var p = Sound.play(file, Sound.bus.sfx);
       var killfn = p.kill.bind(p);
+      p.end = killfn;
       this.timers.push(killfn);
       return killfn;
     },

scripts/sound.js

@@ -17,17 +17,26 @@ var dsp_node = {
   kill() {
     if (this._dead) return;
     this._dead = true;
-    cmd(193, this.id); },
+    cmd(193, this.id);
+  },
+  end() {},
 };
 
 var dsp_source = Object.copy(dsp_node,{
   end(){},
   get loop() { return cmd(194,this.id); },
   set loop(x) { cmd(195,this.id, x);},
+  get frame() { return cmd(196,this.id); },
+  set frame(x) { cmd(199, this.id, x); },
+  frames() { return cmd(197,this.id); },
+  length() { return this.frames()/Sound.samplerate(); },
+  time() { return this.frame/Sound.samplerate(); },
+  pct() { return this.time()/this.length(); },
 });
 
 var Sound = {
   bus: {},
+  samplerate() { return cmd(198); },
   sounds: [], /* array of loaded sound files */
   play(file, bus) {
     if (!IO.exists(file)) {

source/engine/datastream.h

@@ -4,7 +4,6 @@
 #include <pl_mpeg.h>
 #include <stdint.h>
 #include "dsp.h"
-#include "utringbuffer.h"
 
 #include "sokol/sokol_gfx.h"
 

source/engine/jsffi.c

@@ -1265,6 +1265,18 @@ JSValue duk_cmd(JSContext *js, JSValueConst this, int argc, JSValueConst *argv)
     case 195:
       ((sound*)((dsp_node*)js2ptr(argv[1]))->data)->loop = js2bool(argv[2]);
       break;
+    case 196:
+      ret = num2js(((sound*)((dsp_node*)js2ptr(argv[1]))->data)->frame);
+      break;
+    case 197:
+      ret = num2js(((sound*)((dsp_node*)js2ptr(argv[1]))->data)->data->frames);    
+      break;
+    case 198:
+      ret = num2js(SAMPLERATE);
+      break;
+    case 199:
+      ((sound*)((dsp_node*)js2ptr(argv[1]))->data)->frame = js2number(argv[2]);
+      break;
   }
 
   if (str)

source/engine/script.c

@@ -211,14 +211,31 @@ void script_eval_w_env(const char *s, JSValue env, const char *file) {
   JS_FreeValue(js, v);
 }
 
-void call_env(JSValue env, const char *eval)
+struct callenv {
+  JSValue v;
+  const char *eval;
+};
+
+struct callenv *calls;
+
+void call_stack()
 {
-  if (!JS_IsObject(env)) return;
-  JSValue fn = JS_GetPropertyStr(js, env, eval);
-  JSValue v = JS_EvalThis(js, env, eval, strlen(eval), "script", JS_EVAL_FLAGS);
+  for (int i = 0; i < arrlen(calls); i++) {
+    JSValue v = JS_EvalThis(js, calls[i].v, calls[i].eval, strlen(calls[i].eval), calls[i].eval, JS_EVAL_FLAGS);
     js_print_exception(v);
     JS_FreeValue(js, v);
  }
+  arrfree(calls);
+}
+
+void call_env(JSValue env, const char *eval)
+{
+  if (!JS_IsObject(env)) { YughWarn("NOT AN ENV"); return; };
+  struct callenv c;
+  c.v = env;
+  c.eval = eval;
+  arrpush(calls, c);
+}
 
 void file_eval_env(const char *file, JSValue env)
 {

source/engine/script.h

@@ -16,7 +16,7 @@ extern struct callee stacktrace_callee;
 extern JSValue num_cache[100];
 
 JSValue jstr(const char *str);
-
+void call_stack();
 void js_stacktrace();
 void script_startup();
 void script_stop();

source/engine/yugine.c

@@ -162,6 +162,7 @@ int frame_fps() {
 static void process_frame()
 {
   double elapsed = stm_sec(stm_laptime(&frame_t));
+      call_stack();  
 //  ds_advance(bjork, elapsed);
     input_poll(0);
     /* Timers all update every frame - once per monitor refresh */
@@ -172,6 +173,7 @@ static void process_frame()
       double dt = stm_sec(stm_diff(frame_t, updatelast));
       updatelast = frame_t;
       prof_start(&prof_update);
+
       call_updates(dt * timescale);
       prof(&prof_update);