Merge remote-tracking branch 'origin/main' into feature/derive_macros

Cargo.toml

@@ -59,17 +59,17 @@ rhai = ["bevy_mod_scripting_rhai"]
 rhai_script_api = ["bevy_script_api/rhai"]
 
 [dependencies]
-bevy = { version = "0.10.1", default-features = false }
+bevy = { version = "0.11", default-features = false }
 bevy_mod_scripting_core = { path = "bevy_mod_scripting_core", version = "0.3.0" }
 bevy_mod_scripting_lua = { path = "languages/bevy_mod_scripting_lua", version = "0.3.0", optional = true }
 bevy_mod_scripting_rhai = { path = "languages/bevy_mod_scripting_rhai", version = "0.3.0", optional = true }
 bevy_script_api = { path = "bevy_script_api", version = "0.3.0", optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.10.1" }
+bevy = { version = "0.11" }
 clap = { version = "4.1", features = ["derive"] }
 rand = "0.8.5"
-bevy_console = "0.7.0"
+bevy_console = "0.8.0"
 rhai-rand = "0.1"
 
 [workspace]

api_gen_config.toml

@@ -6,12 +6,12 @@ use {
 		tealr::mlu::mlua::MetaMethod, 
 		docs::LuaDocFragment
 	},
-	crate::{common::bevy::GetWorld, lua::{RegisterForeignLuaType}},
+	crate::{common::bevy::GetWorld, lua::{RegisterForeignLuaType, util::LuaIndex}},
 };
 use std::ops::*;
 use crate::{script_ref::{ReflectedValue,ValueIndex},
 	sub_reflect::ReflectPathElem,
-	error::ReflectionError
+	error::ReflectionError,
 };
 use std::sync::Mutex;
 use bevy_mod_scripting_core::prelude::*;
@@ -145,10 +145,6 @@ source="bevy_ui"
 type="CalculatedClip"
 source="bevy_ui"
 
-[[types]]
-type="CalculatedSize"
-source="bevy_ui"
-
 [[types]]
 type="Node"
 source="bevy_ui"
@@ -493,26 +489,26 @@ source="bevy_asset"
 type="Vec2"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,f32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,f32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::f32::Vec2"
 
 [[types]]
 type="Vec3"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,f32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,f32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::f32::Vec3"
 
 [[types]]
 type="Vec3A"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,f32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,f32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::f32::Vec3A"
 
@@ -521,8 +517,8 @@ import_path="glam::f32::Vec3A"
 type="Vec4"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,f32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,f32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::f32::Vec4"
 
@@ -555,80 +551,80 @@ import_path="glam::bool::BVec4A"
 type="DVec2"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,f64)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,f64)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::f64::DVec2"
 
 [[types]]
 type="DVec3"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,f64)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,f64)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::f64::DVec3"
 
 [[types]]
 type="DVec4"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,f64)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,f64)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::f64::DVec4"
 
 [[types]]
 type="IVec2"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,i32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,i32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::i32::IVec2"
 
 [[types]]
 type="IVec3"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,i32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,i32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::i32::IVec3"
 
 [[types]]
 type="IVec4"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,i32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,i32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::i32::IVec4"
 
 [[types]]
 type="UVec2"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,u32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,u32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::u32::UVec2"
 
 [[types]]
 type="UVec3"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,u32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,u32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::u32::UVec3"
 
 [[types]]
 type="UVec4"
 source="bevy_math"
 lua_methods=[
-    "(MetaMethod::Index) => |_,s,idx: usize| {Ok(s.inner()?[idx])}",
-    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (usize,u32)| {s.val_mut(|s| Ok(s[idx] = val))?}"
+    "(MetaMethod::Index) => |_,s,idx: LuaIndex| {Ok(s.inner()?[*idx])}",
+    "mut (MetaMethod::NewIndex) => |_,s,(idx,val): (LuaIndex,u32)| {s.val_mut(|s| Ok(s[*idx] = val))?}"
 ]
 import_path="glam::u32::UVec4"
 
@@ -637,11 +633,11 @@ type="Mat3"
 source="bevy_math"
 lua_methods=[
 """    
-	mut (MetaMethod::Index) => |ctx,s,idx : usize| {
+	mut (MetaMethod::Index) => |ctx,s,idx : LuaIndex| {
 		Ok(LuaVec3::new_ref(
 				s.script_ref(ctx.get_world()?).sub_ref(ReflectPathElem::SubReflectionIndexed{
 					label:"col", 
-					index: idx,
+					index: *idx,
 					get: |idx,ref_| Err(ReflectionError::InsufficientProvenance{
 						path: "".to_owned(), 
 						msg: "Cannot get column of matrix with immutable reference".to_owned()
@@ -668,11 +664,11 @@ type="Mat2"
 source="bevy_math"
 lua_methods=[
 """    
-	mut (MetaMethod::Index) => |ctx,s,idx : usize| {
+	mut (MetaMethod::Index) => |ctx,s,idx : LuaIndex| {
 		Ok(LuaVec2::new_ref(
 				s.script_ref(ctx.get_world()?).sub_ref(ReflectPathElem::SubReflectionIndexed{
 					label:"col", 
-					index: idx,
+					index: *idx,
 					get: |idx,ref_| Err(ReflectionError::InsufficientProvenance{
 						path: "".to_owned(), 
 						msg: "Cannot get column of matrix with immutable reference".to_owned()
@@ -700,11 +696,11 @@ type="Mat3A"
 source="bevy_math"
 lua_methods=[
 """    
-	mut (MetaMethod::Index) => |ctx,s,idx : usize| {
+	mut (MetaMethod::Index) => |ctx,s,idx : LuaIndex| {
 		Ok(LuaVec3A::new_ref(
 				s.script_ref(ctx.get_world()?).sub_ref(ReflectPathElem::SubReflectionIndexed{
 					label:"col", 
-					index: idx,
+					index: *idx,
 					get: |idx,ref_| Err(ReflectionError::InsufficientProvenance{
 						path: "".to_owned(), 
 						msg: "Cannot get column of matrix with immutable reference".to_owned()
@@ -731,11 +727,11 @@ type="Mat4"
 source="bevy_math"
 lua_methods=[
 """    
-	mut (MetaMethod::Index) => |ctx,s,idx : usize| {
+	mut (MetaMethod::Index) => |ctx,s,idx : LuaIndex| {
 		Ok(LuaVec4::new_ref(
 				s.script_ref(ctx.get_world()?).sub_ref(ReflectPathElem::SubReflectionIndexed{
 					label:"col", 
-					index: idx,
+					index: *idx,
 					get: |idx,ref_| Err(ReflectionError::InsufficientProvenance{
 						path: "".to_owned(), 
 						msg: "Cannot get column of matrix with immutable reference".to_owned()
@@ -763,11 +759,11 @@ type="DMat2"
 source="bevy_math"
 lua_methods=[
 """    
-	mut (MetaMethod::Index) => |ctx,s,idx : usize| {
+	mut (MetaMethod::Index) => |ctx,s,idx : LuaIndex| {
 		Ok(LuaDVec2::new_ref(
 				s.script_ref(ctx.get_world()?).sub_ref(ReflectPathElem::SubReflectionIndexed{
 					label:"col", 
-					index: idx,
+					index: *idx,
 					get: |idx,ref_| Err(ReflectionError::InsufficientProvenance{
 						path: "".to_owned(), 
 						msg: "Cannot get column of matrix with immutable reference".to_owned()
@@ -794,11 +790,11 @@ type="DMat3"
 source="bevy_math"
 lua_methods=[
 """    
-	mut (MetaMethod::Index) => |ctx,s,idx : usize| {
+	mut (MetaMethod::Index) => |ctx,s,idx : LuaIndex| {
 		Ok(LuaDVec3::new_ref(
 				s.script_ref(ctx.get_world()?).sub_ref(ReflectPathElem::SubReflectionIndexed{
 					label:"col", 
-					index: idx,
+					index: *idx,
 					get: |idx,ref_| Err(ReflectionError::InsufficientProvenance{
 						path: "".to_owned(), 
 						msg: "Cannot get column of matrix with immutable reference".to_owned()
@@ -825,11 +821,11 @@ type="DMat4"
 source="bevy_math"
 lua_methods=[
 """    
-	mut (MetaMethod::Index) => |ctx,s,idx : usize| {
+	mut (MetaMethod::Index) => |ctx,s,idx : LuaIndex| {
 		Ok(LuaDVec4::new_ref(
 				s.script_ref(ctx.get_world()?).sub_ref(ReflectPathElem::SubReflectionIndexed{
 					label:"col", 
-					index: idx,
+					index: *idx,
 					get: |idx,ref_| Err(ReflectionError::InsufficientProvenance{
 						path: "".to_owned(), 
 						msg: "Cannot get column of matrix with immutable reference".to_owned()

assets/scripts/complex_game_loop.lua

@@ -1,31 +1,17 @@
 
 
-function on_pre_physics_one(id) 
-    print("on_pre_physics_one, Handling:")
+function on_pre_physics(id) 
+    print("on_pre_physics, Handling:")
     print(string.format("\t-> id: %d",id))
 end
 
-function on_pre_physics_two(id)
-    print("on_pre_physics_two, Handling:")
-    print(string.format("\t-> id: %d",id))
-end
-
-function on_post_physics_one(id)
-    print("on_post_physics_one, Handling:")
+function on_post_physics(id)
+    print("on_post_physics, Handling:")
     print(string.format("\t-> id: %d",id))
 end 
 
-function on_post_physics_two(id)
-    print("on_post_physics_two, Handling:")
-    print(string.format("\t-> id: %d",id))
-end 
 
-function on_post_update_one(id)
-    print("on_post_update_one, Handling:")
+function on_post_update(id)
+    print("on_post_update, Handling:")
     print(string.format("\t-> id: %d",id))
 end
-
-function on_post_update_two(id)
-    print("on_post_update_two, Handling:")
-    print(string.format("\t-> id: %d",id))
-end

assets/scripts/game_of_life.tl

@@ -30,15 +30,15 @@ global function on_update()
         prev_state[k] = (not(v == 0)) and 1 or 0
     end
 
-    for i=1,(dimensions[0] * dimensions[1]) do 
-        local north = prev_state[i - dimensions[0]] or 1
-        local south = prev_state[i + dimensions[0]] or 1 
+    for i=1,(dimensions[1] * dimensions[2]) do 
+        local north = prev_state[i - dimensions[1]] or 1
+        local south = prev_state[i + dimensions[1]] or 1 
         local east = prev_state[i + 1] or 1 
         local west = prev_state[i - 1] or 1
-        local northeast = prev_state[i - dimensions[0] + 1] or 1
-        local southeast = prev_state[i + dimensions[0] + 1] or 1
-        local northwest = prev_state[i - dimensions[0] - 1] or 1
-        local southwest = prev_state[i + dimensions[0] - 1] or 1
+        local northeast = prev_state[i - dimensions[1] + 1] or 1
+        local southeast = prev_state[i + dimensions[1] + 1] or 1
+        local northwest = prev_state[i - dimensions[1] - 1] or 1
+        local southwest = prev_state[i + dimensions[1] - 1] or 1
 
         local neighbours = north + south + east + west 
             + northeast + southeast + northwest + southwest

bevy_api_gen/Cargo.toml

@@ -26,7 +26,7 @@ path = "src/main.rs"
 
 
 [dependencies]
-rustdoc-types = "0.19.0"
+rustdoc-types = "0.22.0"
 clap = { version = "3.2.6", features = ["derive"] }
 serde_json = "1.0.81"
 toml = "0.5.9"

bevy_event_priority/Cargo.toml

@@ -21,5 +21,5 @@ name = "bevy_event_priority"
 path = "src/lib.rs"
 
 [dependencies]
-bevy = { version = "0.10.1", default-features = false}
+bevy = { version = "0.11", default-features = false}
 

bevy_mod_scripting_core/Cargo.toml

@@ -29,7 +29,7 @@ doc_always = []
 
 
 [dependencies]
-bevy = { version = "0.10.1", default-features = false, features=["bevy_asset","bevy_gltf","bevy_animation","bevy_core_pipeline","bevy_ui","bevy_pbr","bevy_render","bevy_text","bevy_sprite","filesystem_watcher"]}
+bevy = { version = "0.11", default-features = false, features=["bevy_asset","bevy_gltf","bevy_animation","bevy_core_pipeline","bevy_ui","bevy_pbr","bevy_render","bevy_text","bevy_sprite","filesystem_watcher"]}
 bevy_event_priority = {path = "../bevy_event_priority", version = "0.3.0" }
 thiserror = "1.0.31"
 paste = "1.0.7"

bevy_mod_scripting_core/src/error.rs

@@ -4,8 +4,8 @@ use thiserror::Error;
 pub enum ScriptError {
     #[error("Runtime error in script `{script}` {msg}")]
     RuntimeError { script: String, msg: String },
-    #[error("Failed to load script asset for `{script}`")]
-    FailedToLoad { script: String },
+    #[error("Failed to load script asset for `{script}` {msg}")]
+    FailedToLoad { script: String, msg: String },
     #[error("Syntax error for script `{script}` {msg}")]
     SyntaxError { script: String, msg: String },
     #[error("Callback method `{callback}` invalid for script `{script}` {msg}")]