finalize game of life for both languages

makspll · makspll · commit 4b91ac639e9d · 2025-01-23T23:31:55.000Z
diff --git a/Cargo.toml b/Cargo.toml
@@ -111,10 +111,15 @@ debug = true
 inherits = "release"
 debug = true
 
-# [[example]]
-# name = "game_of_life"
-# path = "examples/game_of_life.rs"
-# required-features = ["lua54", "bevy/file_watcher", "bevy/multi_threaded"]
+[[example]]
+name = "game_of_life"
+path = "examples/game_of_life.rs"
+required-features = [
+    "lua54",
+    "rhai",
+    "bevy/file_watcher",
+    "bevy/multi_threaded",
+]
 
 [workspace.lints.clippy]
 panic = "deny"
diff --git a/assets/scripts/game_of_life.lua b/assets/scripts/game_of_life.lua
@@ -1,7 +1,7 @@
 LifeState = world.get_type_by_name("LifeState")
 Settings = world.get_type_by_name("Settings")
 
-world.info("Lua: The game_of_life.lua script just got loaded")
+info("Lua: The game_of_life.lua script just got loaded")
 
 math.randomseed(os.time())
 
@@ -12,8 +12,8 @@ function fetch_life_state()
 end  
 
 function on_script_loaded()
-    world.info("Lua: Hello! I am initiating the game of life simulation state with randomness!")
-    world.info("Lua: Click on the screen to set cells alive after running the `gol start` command")
+    info("Lua: Hello! I am initiating the game of life simulation state with randomness!")
+    info("Lua: Click on the screen to set cells alive after running the `gol start` command")
     
     local life_state = fetch_life_state()
     local cells = life_state.cells
@@ -27,8 +27,7 @@ end
 
 function on_click(x,y)
     -- get the settings
-    world.info("Lua: Clicked at x: " .. x .. " y: " .. y)
-    print(entity)
+    info("Lua: Clicked at x: " .. x .. " y: " .. y)
     local life_state = fetch_life_state()
     local cells = life_state.cells
 
@@ -110,7 +109,7 @@ function on_update()
 end
 
 function on_script_unloaded()
-    world.info("Lua: I am being unloaded, goodbye!")
+    info("Lua: I am being unloaded, goodbye!")
 
     -- set state to 0's
     local life_state = fetch_life_state()
diff --git a/assets/scripts/game_of_life.rhai b/assets/scripts/game_of_life.rhai
@@ -1,45 +1,100 @@
+info.call("Rhai: the game_of_life.rhai script just got loaded");
+
+
+fn fetch_life_state() {
+    let LifeState = world.get_type_by_name.call("LifeState");
+    let Settings = world.get_type_by_name.call("Settings");
+    for (v,i) in world.query.call().component.call(LifeState).build.call(){
+        return v.components.call()[0]
+    }
+}
+
+
 fn on_script_loaded() {
-    world.info("Game of Life script loaded");
-    // let LifeState = world.get_type_by_name("LifeState");
-    // let life_state = world.get_component(entity,LifeState);
-    // let cells = life_state.cells;
-
-    // // set some cells alive
-    // for x in 1..10000 {
-    //     let index = rand(0..cells.len());
-    //     cells[index] = 255;
-    // }
+    let LifeState = world.get_type_by_name.call("LifeState");
+    let Settings = world.get_type_by_name.call("Settings");
+
+    info.call("Rhai: Hello! I am initiating the game of life simulation state with randomness!");
+    info.call("Rhai: Click on the screen to set cells alive after running the `gol start` command");
+
+    let life_state = fetch_life_state!();
+    let cells = life_state.cells;
+    let cells_len = cells.len.call();
+    let x = 0;
+    while x < 1000 {
+        let index = to_int(floor(rand.call()*cells_len)) ;
+        cells[index] = 255;
+        x += 1;
+    }
 }
 
-fn on_update() {
+fn on_click(x,y) {
+    let Settings = world.get_type_by_name.call("Settings");
+    let LifeState = world.get_type_by_name.call("LifeState");
+
+    info.call("Rhai: Clicked at x: "+ x + ", y: " + y );
+    let life_state = fetch_life_state!();
+    let cells = life_state.cells;
+
+    let settings = world.get_resource.call(Settings);
+    let dimensions = settings.physical_grid_dimensions;
+    let screen = settings.display_grid_dimensions;
+
+    let dimension_x = dimensions["_0"];
+    let dimension_y = dimensions["_1"];
 
-    let LifeState = world.get_type_by_name("LifeState");
-    let Settings = world.get_type_by_name("Settings");
+    let screen_x = screen["_0"];
+    let screen_y = screen["_1"];
 
-    let life_state = world.get_component(entity,LifeState);
+    let cell_width = screen_x / dimension_x;
+    let cell_height = screen_y / dimension_y;
+    
+    let cell_x = to_int(x / cell_width);
+    let cell_y = to_int(y / cell_height);
+
+    let index = cell_y * dimension_x + cell_x;
+    let cell_offsets_x = [0, 1, 0, 1, -1, 0, -1, 1, -1];
+    let cell_offsets_y = [0, 0, 1, 1, 0, -1, -1, -1, 1];
+    for (v,i) in cell_offsets_x {
+        let offset_x = cell_offsets_x[i];
+        let offset_y = cell_offsets_y[i];
+        let new_index = index + offset_x + offset_y * dimension_x;
+        if new_index >= 0 && new_index < (dimension_x * dimension_y) {
+            cells[new_index] = 255;
+        }
+    }
+
+}
+
+fn on_update() {
+    let LifeState = world.get_type_by_name.call("LifeState");
+    let Settings = world.get_type_by_name.call("Settings");
+
+    let life_state = fetch_life_state!();
     let cells = life_state.cells;
 
 
     // note that here we do not make use of RhaiProxyable and just go off pure reflection
-    let settings = world.get_resource(Settings);
+    let settings = world.get_resource.call(Settings);
     let dimensions = settings.physical_grid_dimensions;
-
+    let dimension_x = dimensions["_0"];
+    let dimension_y = dimensions["_1"];
     
     // primitives are passed by value to rhai, keep a hold of old state but turn 255's into 1's
     let prev_state = [];
     for (v,k) in life_state.cells {
         prev_state.push(life_state.cells[k] != 0);
     }
 
-    for i in 0..(dimensions[0] * dimensions[1]) {
-        let north = prev_state.get(i - dimensions[0]);
-        let south = prev_state.get(i + dimensions[0]);
+    for i in 0..(dimension_x * dimension_y) {
+        let north = prev_state.get(i - dimension_x);
+        let south = prev_state.get(i + dimension_x);
         let east = prev_state.get(i + 1);
         let west = prev_state.get(i - 1);
-        let northeast = prev_state.get(i - dimensions[0] + 1);
-        let southeast = prev_state.get(i + dimensions[0] + 1);
-        let northwest = prev_state.get(i - dimensions[0] - 1);
-        let southwest = prev_state.get(i + dimensions[0] - 1);
+        let northeast = prev_state.get(i - dimension_x + 1);
+        let southeast = prev_state.get(i + dimension_x + 1);
+        let northwest = prev_state.get(i - dimension_x - 1);
+        let southwest = prev_state.get(i + dimension_x - 1);
         
         let neighbours = 0;
         if north == () || north {neighbours+=1}
@@ -60,5 +115,18 @@ fn on_update() {
             cells[i] = 0;
         }
     }
+}
+
+fn on_script_unloaded() {
+    let LifeState = world.get_type_by_name.call("LifeState");
+    let Settings = world.get_type_by_name.call("Settings");
 
+    info.call("Rhai: I am being unloaded, goodbye!");
+
+    // set state to 0's
+    let life_state = fetch_life_state();
+    let cells = life_state.cells;
+    for i in 0..cells.len.call() {
+        cells[i] = 0;
+    }
 }
diff --git a/crates/bevy_mod_scripting_core/src/handler.rs b/crates/bevy_mod_scripting_core/src/handler.rs
@@ -16,7 +16,7 @@ use bevy::{
         system::{Resource, SystemState},
         world::World,
     },
-    log::{debug, trace},
+    log::trace,
     prelude::{EventReader, Events, Query, Ref},
 };
 
@@ -127,15 +127,18 @@ pub(crate) fn event_handler_internal<L: IntoCallbackLabel, P: IntoScriptPluginPa
                     }
                     _ => (),
                 }
-                debug!(
-                    "Handling event for script {} on entity {:?}",
-                    script_id, entity
+                trace!(
+                    "{}: Handling event for script {} on entity {:?}",
+                    P::LANGUAGE,
+                    script_id,
+                    entity
                 );
                 let script = match res_ctxt.scripts.scripts.get(script_id) {
                     Some(s) => s,
                     None => {
                         trace!(
-                            "Script `{}` on entity `{:?}` is either still loading or doesn't exist, ignoring.",
+                            "{}: Script `{}` on entity `{:?}` is either still loading or doesn't exist, ignoring.",
+                            P::LANGUAGE,
                             script_id, entity
                         );
                         continue;
diff --git a/crates/languages/bevy_mod_scripting_lua/src/lib.rs b/crates/languages/bevy_mod_scripting_lua/src/lib.rs
@@ -209,7 +209,14 @@ pub fn lua_handler(
     let handler: Function = match context.globals().raw_get(callback_label.as_ref()) {
         Ok(handler) => handler,
         // not subscribed to this event type
-        Err(_) => return Ok(ScriptValue::Unit),
+        Err(_) => {
+            bevy::log::trace!(
+                "Script {} is not subscribed to callback {}",
+                script_id,
+                callback_label.as_ref()
+            );
+            return Ok(ScriptValue::Unit);
+        }
     };
 
     let input = MultiValue::from_vec(
diff --git a/crates/languages/bevy_mod_scripting_rhai/src/lib.rs b/crates/languages/bevy_mod_scripting_rhai/src/lib.rs
@@ -18,9 +18,9 @@ use bevy_mod_scripting_core::{
 };
 use bindings::{
     reference::{ReservedKeyword, RhaiReflectReference, RhaiStaticReflectReference},
-    script_value::IntoDynamic,
+    script_value::{FromDynamic, IntoDynamic},
 };
-use rhai::{CallFnOptions, Engine, FnPtr, Scope, AST};
+use rhai::{CallFnOptions, Dynamic, Engine, EvalAltResult, Scope, AST};
 
 pub use rhai;
 pub mod bindings;
@@ -224,23 +224,38 @@ pub fn rhai_callback_handler(
         .iter()
         .try_for_each(|init| init(script_id, entity, context))?;
 
-    if context
-        .scope
-        .get_value::<FnPtr>(callback.as_ref())
-        .is_none()
-    {
-        // not subscribed to this handler
-        return Ok(ScriptValue::Unit);
-    };
-
     // we want the call to be able to impact the scope
     let options = CallFnOptions::new().rewind_scope(false);
-    let out = runtime.call_fn_with_options::<ScriptValue>(
+    let args = args
+        .into_iter()
+        .map(|v| v.into_dynamic())
+        .collect::<Result<Vec<_>, _>>()?;
+
+    bevy::log::trace!(
+        "Calling callback {} in script {} with args: {:?}",
+        callback,
+        script_id,
+        args
+    );
+    match runtime.call_fn_with_options::<Dynamic>(
         options,
         &mut context.scope,
         &context.ast,
         callback.as_ref(),
         args,
-    )?;
-    Ok(out)
+    ) {
+        Ok(v) => Ok(ScriptValue::from_dynamic(v)?),
+        Err(e) => {
+            if let EvalAltResult::ErrorFunctionNotFound(_, _) = e.unwrap_inner() {
+                bevy::log::trace!(
+                    "Script {} is not subscribed to callback {} with the provided arguments.",
+                    script_id,
+                    callback
+                );
+                Ok(ScriptValue::Unit)
+            } else {
+                Err(ScriptError::from(e))
+            }
+        }
+    }
 }
diff --git a/crates/xtask/src/main.rs b/crates/xtask/src/main.rs
@@ -138,16 +138,6 @@ impl Features {
         )
     }
 
-    fn non_exclusive_features() -> Self {
-        Self(
-            <Feature as strum::VariantArray>::VARIANTS
-                .iter()
-                .filter(|f| !f.to_feature_group().is_exclusive())
-                .cloned()
-                .collect(),
-        )
-    }
-
     fn to_cargo_args(&self) -> Vec<String> {
         if self.0.is_empty() {
             vec![]
diff --git a/examples/game_of_life.rs b/examples/game_of_life.rs
@@ -15,14 +15,17 @@ use bevy_console::{make_layer, AddConsoleCommand, ConsoleCommand, ConsoleOpen, C
 use bevy_mod_scripting::ScriptFunctionsPlugin;
 use bevy_mod_scripting_core::{
     asset::ScriptAsset,
-    bindings::{function::namespace::NamespaceBuilder, script_value::ScriptValue},
+    bindings::{
+        function::namespace::{GlobalNamespace, NamespaceBuilder},
+        script_value::ScriptValue,
+    },
     callback_labels,
     event::ScriptCallbackEvent,
     handler::event_handler,
     script::ScriptComponent,
 };
 use bevy_mod_scripting_lua::LuaScriptingPlugin;
-// use bevy_mod_scripting_rhai::RhaiScriptingPlugin;
+use bevy_mod_scripting_rhai::RhaiScriptingPlugin;
 use clap::Parser;
 
 // CONSOLE SETUP
@@ -98,7 +101,7 @@ fn game_of_life_app(app: &mut App) -> &mut App {
         .add_plugins((
             // for scripting
             LuaScriptingPlugin::default(),
-            // RhaiScriptingPlugin::default(),
+            RhaiScriptingPlugin::default(),
             ScriptFunctionsPlugin,
         ))
         .register_type::<LifeState>()
@@ -114,9 +117,9 @@ fn game_of_life_app(app: &mut App) -> &mut App {
                 send_on_update.after(update_rendered_state),
                 (
                     event_handler::<OnUpdate, LuaScriptingPlugin>,
-                    // event_handler::<OnUpdate, RhaiScriptingPlugin>,
+                    event_handler::<OnUpdate, RhaiScriptingPlugin>,
                     event_handler::<OnClick, LuaScriptingPlugin>,
-                    // event_handler::<OnClick, RhaiScriptingPlugin>,
+                    event_handler::<OnClick, RhaiScriptingPlugin>,
                 )
                     .after(send_on_update),
             ),
@@ -168,9 +171,11 @@ pub fn load_script_assets(
 
 pub fn register_script_functions(app: &mut App) -> &mut App {
     let world = app.world_mut();
-    NamespaceBuilder::<World>::new_unregistered(world).register("info", |s: String| {
-        bevy::log::info!(s);
-    });
+    NamespaceBuilder::<GlobalNamespace>::new_unregistered(world)
+        .register("info", |s: String| {
+            bevy::log::info!(s);
+        })
+        .register("rand", || rand::random::<f32>());
     app
 }
 
@@ -274,10 +279,7 @@ callback_labels!(
 
 /// Sends events allowing scripts to drive update logic
 pub fn send_on_update(mut events: EventWriter<ScriptCallbackEvent>) {
-    events.send(ScriptCallbackEvent::new_for_all(
-        OnUpdate,
-        vec![ScriptValue::Unit],
-    ));
+    events.send(ScriptCallbackEvent::new_for_all(OnUpdate, vec![]));
 }
 
 pub fn send_on_click(
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/wsl.nu b/wsl.nu
