WIP, correct api gen, TODO: examples

makspll · Jul 17, 2023 · 0af6d4f · 0af6d4f
1 parent 0405296
commit 0af6d4f
Show file tree

Hide file tree

Showing 21 changed files with 759 additions and 465 deletions.
diff --git a/api_gen_config.toml b/api_gen_config.toml
@@ -145,10 +145,6 @@ source="bevy_ui"
 type="CalculatedClip"
 source="bevy_ui"
 
-[[types]]
-type="CalculatedSize"
-source="bevy_ui"
-
 [[types]]
 type="Node"
 source="bevy_ui"

diff --git a/bevy_api_gen/Cargo.toml b/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"

diff --git a/bevy_mod_scripting_core/src/lib.rs b/bevy_mod_scripting_core/src/lib.rs
@@ -136,8 +136,9 @@ pub trait AddScriptHostHandler {
     ///
     /// Note: this is identical to adding the script_event_handler system manually, so if you require setting schedules etc, you should use that directly.
     /// ```rust,ignore
-    /// self.add_system(
-    ///     script_event_handler::<T, MAX, MIN>.in_set(set).in_schedule(MySchedule::SomeSchedule)
+    /// self.add_systems(
+    ///     MySchedule,
+    ///     script_event_handler::<T, MAX, MIN>.in_set(set)
     /// );
     /// ```
     /// Think of handler system sets as a way to run certain types of events at specific points in your engine.

diff --git a/bevy_script_api/src/common/bevy/mod.rs b/bevy_script_api/src/common/bevy/mod.rs
@@ -8,8 +8,9 @@ use crate::ScriptRef;
 use bevy::{
     ecs::system::Command,
     prelude::{
-        AppTypeRegistry, BuildWorldChildren, Children, DespawnChildrenRecursive, DespawnRecursive,
-        Entity, Parent, ReflectComponent, ReflectDefault, ReflectResource,
+        despawn_with_children_recursive, AppTypeRegistry, BuildWorldChildren, Children,
+        DespawnChildrenRecursive, DespawnRecursive, Entity, Parent, ReflectComponent,
+        ReflectDefault, ReflectResource,
     },
     reflect::{
         DynamicArray, DynamicEnum, DynamicList, DynamicMap, DynamicStruct, DynamicTuple,
@@ -141,12 +142,12 @@ impl ScriptWorld {
 
     pub fn despawn_children_recursive(&self, entity: Entity) {
         let mut w = self.write();
-        DespawnChildrenRecursive { entity }.write(&mut w);
+        DespawnChildrenRecursive { entity }.apply(&mut w);
     }
 
     pub fn despawn_recursive(&self, entity: Entity) {
         let mut w = self.write();
-        DespawnRecursive { entity }.write(&mut w);
+        DespawnRecursive { entity }.apply(&mut w);
     }
 
     pub fn get_type_by_name(&self, type_name: &str) -> Option<ScriptTypeRegistration> {
@@ -183,8 +184,7 @@ impl ScriptWorld {
             bevy::reflect::TypeInfo::List(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicList::default()),
             bevy::reflect::TypeInfo::Array(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicArray::new(Box::new([]))),
             bevy::reflect::TypeInfo::Map(_) => component_data.insert(&mut w.entity_mut(entity), &DynamicMap::default()),
-            bevy::reflect::TypeInfo::Value(_) |
-            bevy::reflect::TypeInfo::Dynamic(_) => component_data.insert(&mut w.entity_mut(entity),
+            bevy::reflect::TypeInfo::Value(_) => component_data.insert(&mut w.entity_mut(entity),
                 comp_type.data::<ReflectDefault>().ok_or_else(||
                     ScriptError::Other(format!("Component {} is a value or dynamic type with no `ReflectDefault` type_data, cannot instantiate sensible value",comp_type.short_name())))?
                     .default()

diff --git a/bevy_script_api/src/common/std.rs b/bevy_script_api/src/common/std.rs
@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use bevy::reflect::FromReflect;
+use bevy::reflect::{FromReflect, TypePath};
 
 use crate::{error::ReflectionError, ScriptRef, ValueIndex};
 
@@ -26,7 +26,7 @@ impl<T> std::fmt::Debug for ScriptVec<T> {
     }
 }
 
-impl<T: std::fmt::Display + FromReflect> std::fmt::Display for ScriptVec<T> {
+impl<T: std::fmt::Display + FromReflect + TypePath> std::fmt::Display for ScriptVec<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let str = self
             .ref_
@@ -39,7 +39,7 @@ impl<T: std::fmt::Display + FromReflect> std::fmt::Display for ScriptVec<T> {
     }
 }
 
-impl<T: FromReflect> ScriptVec<T> {
+impl<T: FromReflect + TypePath> ScriptVec<T> {
     pub fn new_ref(ref_: ScriptRef) -> Self {
         Self {
             ref_,
@@ -116,7 +116,7 @@ impl<T: FromReflect> Iterator for ScriptVecIterator<T> {
     }
 }
 
-impl<T: FromReflect> IntoIterator for ScriptVec<T> {
+impl<T: FromReflect + TypePath> IntoIterator for ScriptVec<T> {
     type Item = ScriptRef;
 
     type IntoIter = ScriptVecIterator<T>;