Implemented automation events

Author: chrisws

raylib/func.h

@@ -2370,6 +2370,7 @@ static int cmd_loaddirectoryfilesex(int argc, slib_par_t *params, var_t *retval)
 static int cmd_loaddroppedfiles(int argc, slib_par_t *params, var_t *retval) {
   auto fnResult = LoadDroppedFiles();
   v_setfilepathlist(retval, fnResult);
+  UnloadDroppedFiles(fnResult);
   return 1;
 }
 

raylib/main.cpp

@@ -819,12 +819,14 @@ static void v_setwave(var_t *var, Wave &wave) {
 }
 
 static void v_setfilepathlist(var_t *var, FilePathList &filePathList) {
-  v_toarray1(var, filePathList.count);
+  map_init(var);
+  v_setint(map_add_var(var, "count", 0), filePathList.count);
+  var_t *v_paths = map_add_var(var, "paths", 0);
+  v_toarray1(v_paths, filePathList.count);
   for (unsigned index = 0; index < filePathList.count; index++) {
-    var_p_t elem = v_elem(var, index);
+    var_p_t elem = v_elem(v_paths, index);
     v_setstr(elem, filePathList.paths[index]);
   }
-  UnloadDirectoryFiles(filePathList);
 }
 
 static AutomationEvent get_param_automationevent(int argc, slib_par_t *params, int n) {

raylib/mkraylib.bas

@@ -197,6 +197,17 @@ func get_result_cast(byref fun)
   return result
 end
 
+'
+' When the result is returned in a map and fnResult value should be cleared
+'
+func get_cleanup_fn(byref fun)
+  local result = ""
+  select case lower(trim(fun.name))
+  case "loaddroppedfiles": result = "  UnloadDroppedFiles(fnResult);"
+  end select
+  return result
+end
+
 '
 ' returns whether the function returns a string
 '
@@ -417,6 +428,8 @@ sub print_func(byref fun)
     else
       print "  " + get_v_set_name(fun) + "(retval, fnResult);"
     endif
+    local cleanup_fn = get_cleanup_fn(fun)
+    if (len(cleanup_fn) > 0) then print cleanup_fn
   endif
   print "  return 1;"
   print "}"

raylib/samples/core_automation_events.bas

@@ -80,7 +80,8 @@ while (!rl.WindowShouldClose())
     droppedFiles = rl.LoadDroppedFiles()
 
     rem Supports loading .rgs style files (text or binary) and .png style palette images
-    if (rl.IsFileExtension(droppedFiles.paths[0], ".txt.rae")) then
+    if (rl.IsFileExtension(droppedFiles.paths[0], ".rae")) then
+      print "loading dropped file"
       rl.UnloadAutomationEventList(aelist)
       aelist = rl.LoadAutomationEventList(droppedFiles.paths[0])
 
@@ -93,9 +94,10 @@ while (!rl.WindowShouldClose())
 
       reset_player()
       reset_camera()
+    else
+      print "Dropped file is invalid: "; droppedFiles.paths[0]
     endif
-
-    rl.UnloadDroppedFiles(droppedFiles)   ' Unload filepaths from memory
+    'UnloadDroppedFiles called as part of Loaddroppedfiles
   endif
 
   REM Update player
@@ -250,13 +252,13 @@ while (!rl.WindowShouldClose())
     rl.DrawCircle(30, 175, 10, c.MAROON)
     if (((frameCounter/15)%2) == 1) then
       rl.DrawText(rl.TextFormat("RECORDING EVENTS... [%i]", aelist.count), 50, 170, 10, c.MAROON)
-    else if (eventPlaying) then
-      rl.DrawRectangle(10, 160, 290, 30, rl.fade(c.LIME, 0.3))
-      rl.DrawRectangleLines(10, 160, 290, 30, rl.fade(c.DARKGREEN, 0.8))
-      rl.DrawTriangle([20, 155 + 10], [20, 155 + 30], [40, 155 + 20], c.DARKGREEN)
-      if (((frameCounter/15)%2) == 1) then
-        rl.DrawText(rl.TextFormat("PLAYING RECORDED EVENTS... [%i]", currentPlayFrame), 50, 170, 10, c.DARKGREEN)
-      endif
+    endif
+  else if (eventPlaying) then
+    rl.DrawRectangle(10, 160, 290, 30, rl.fade(c.LIME, 0.3))
+    rl.DrawRectangleLines(10, 160, 290, 30, rl.fade(c.DARKGREEN, 0.8))
+    rl.DrawTriangle([20, 155 + 10], [20, 155 + 30], [40, 155 + 20], c.DARKGREEN)
+    if (((frameCounter/15)%2) == 1) then
+      rl.DrawText(rl.TextFormat("PLAYING RECORDED EVENTS... [%i]", currentPlayFrame), 50, 170, 10, c.DARKGREEN)
     endif
   endif
   rl.EndDrawing()