Batch of Striker Ball Updates to Bones

demos/asset_packs/src/main.rs

@@ -47,13 +47,11 @@ fn main() {
     // Create a new session for the game menu. Each session is it's own bones world with it's own
     // plugins, systems, and entities.
     game.sessions
-        .create_with("menu", |builder: &mut SessionBuilder| {
-            // Install the default bones_framework plugin for this session
-            builder
-                .install_plugin(DefaultSessionPlugin)
-                // Add our menu system to the update stage
-                .add_system_to_stage(Update, menu_system);
-        });
+        .create("menu")
+        // Install the default bones_framework plugin for this session
+        .install_plugin(DefaultSessionPlugin)
+        // Add our menu system to the update stage
+        .add_system_to_stage(Update, menu_system);
 
     BonesBevyRenderer::new(game).app().run();
 }

demos/assets_minimal/src/main.rs

@@ -36,17 +36,13 @@ fn main() {
 
     // Create a new session for the game menu. Each session is it's own bones world with it's own
     // plugins, systems, and entities.
-    let mut menu_session_builder = SessionBuilder::new("menu");
-
-    // Install the default bones_framework plugin for this session
-    menu_session_builder
+    game.sessions
+        .create("menu")
+        // Install the default bones_framework plugin for this session
         .install_plugin(DefaultSessionPlugin)
         // Add our menu system to the update stage
         .add_system_to_stage(Update, menu_system);
 
-    // Finalize session and register with game sessions.
-    menu_session_builder.finish_and_add(&mut game.sessions);
-
     BonesBevyRenderer::new(game).app().run();
 }
 

demos/features/src/main.rs

@@ -139,18 +139,18 @@ struct MenuData {
 }
 
 /// Menu plugin
-pub fn menu_plugin(session: &mut SessionBuilder) {
+pub fn menu_plugin(session: &mut Session) {
     // Register our menu system
     session
         // Install the bones_framework default plugins for this session
         .install_plugin(DefaultSessionPlugin)
         // Initialize our menu data resource
-        .init_resource::<MenuData>();
+        .init_startup_resource::<MenuData>();
 
     // And add our systems.
     session
         .add_system_to_stage(Update, menu_system)
-        .add_startup_system(menu_startup);
+        .add_system_to_stage(CoreStage::Startup, menu_startup);
 }
 
 /// Setup the main menu.
@@ -280,10 +280,10 @@ fn menu_system(
 }
 
 /// Plugin for running the sprite demo.
-fn sprite_demo_plugin(session: &mut SessionBuilder) {
+fn sprite_demo_plugin(session: &mut Session) {
     session
         .install_plugin(DefaultSessionPlugin)
-        .add_startup_system(sprite_demo_startup)
+        .add_system_to_stage(CoreStage::Startup, sprite_demo_startup)
         .add_system_to_stage(Update, back_to_menu_ui)
         .add_system_to_stage(Update, move_sprite);
 }
@@ -344,10 +344,10 @@ fn move_sprite(
 }
 
 /// Plugin for running the tilemap demo.
-fn tilemap_demo_plugin(session: &mut SessionBuilder) {
+fn tilemap_demo_plugin(session: &mut Session) {
     session
         .install_plugin(DefaultSessionPlugin)
-        .add_startup_system(tilemap_startup_system)
+        .add_system_to_stage(CoreStage::Startup, tilemap_startup_system)
         .add_system_to_stage(Update, back_to_menu_ui);
 }
 
@@ -365,10 +365,9 @@ fn tilemap_startup_system(
 
     // Load our map and atlas info
     let map_info = assets.get(meta.tilemap_demo);
-    let atlas = assets.get(map_info.atlas);
 
     // Create a new map layer
-    let mut layer = TileLayer::new(map_info.map_size, atlas.tile_size, map_info.atlas);
+    let mut layer = TileLayer::new(map_info.map_size, map_info.atlas);
 
     // Load the layer up with the tiles from our metadata
     for tile in &map_info.tiles {
@@ -390,10 +389,10 @@ fn tilemap_startup_system(
 }
 
 /// Plugin for running the atlas demo.
-fn atlas_demo_plugin(session: &mut SessionBuilder) {
+fn atlas_demo_plugin(session: &mut Session) {
     session
         .install_plugin(DefaultSessionPlugin)
-        .add_startup_system(atlas_demo_startup)
+        .add_system_to_stage(CoreStage::Startup, atlas_demo_startup)
         .add_system_to_stage(Update, back_to_menu_ui);
 }
 
@@ -438,7 +437,7 @@ fn atlas_demo_startup(
     );
 }
 
-fn audio_demo_plugin(session: &mut SessionBuilder) {
+fn audio_demo_plugin(session: &mut Session) {
     session
         .install_plugin(DefaultSessionPlugin)
         .add_system_to_stage(Update, back_to_menu_ui)
@@ -464,7 +463,7 @@ fn audio_demo_ui(
         });
 }
 
-fn storage_demo_plugin(session: &mut SessionBuilder) {
+fn storage_demo_plugin(session: &mut Session) {
     session
         .install_plugin(DefaultSessionPlugin)
         .add_system_to_stage(Update, storage_demo_ui)
@@ -494,10 +493,10 @@ fn storage_demo_ui(
     });
 }
 
-fn path2d_demo_plugin(session: &mut SessionBuilder) {
+fn path2d_demo_plugin(session: &mut Session) {
     session
         .install_plugin(DefaultSessionPlugin)
-        .add_startup_system(path2d_demo_startup)
+        .add_system_to_stage(CoreStage::Startup, path2d_demo_startup)
         .add_system_to_stage(Update, back_to_menu_ui);
 }
 

demos/hello_world/src/main.rs

@@ -11,13 +11,11 @@ fn main() {
     // Create a new session for the game menu. Each session is it's own bones world with it's own
     // plugins, systems, and entities.
     game.sessions
-        .create_with("menu", |session: &mut SessionBuilder| {
-            session
-                // Install the default bones_framework plugin for this session
-                .install_plugin(DefaultSessionPlugin)
-                // Add our menu system to the update stage
-                .add_system_to_stage(Update, menu_system);
-        });
+        .create("menu")
+        // Install the default bones_framework plugin for this session
+        .install_plugin(DefaultSessionPlugin)
+        // Add our menu system to the update stage
+        .add_system_to_stage(Update, menu_system);
 
     BonesBevyRenderer::new(game).app().run();
 }

demos/scripting/assets/plugin1.plugin.lua

@@ -30,5 +30,5 @@ local function update()
   end
 end
 
-session:add_startup_system(startup)
+session:add_system_to_stage(CoreStage.Startup, startup)
 session:add_system_to_stage(CoreStage.Update, update)

demos/scripting/src/main.rs

@@ -19,12 +19,12 @@ fn main() {
     game.install_plugin(DefaultGamePlugin);
     game.shared_resource_mut::<AssetServer>()
         .register_default_assets();
+    Transform::register_schema();
     GameMeta::register_schema();
 
     game.sessions
-        .create_with("launch", |builder: &mut SessionBuilder| {
-            builder.add_startup_system(launch_game_session);
-        });
+        .create("launch")
+        .add_system_to_stage(CoreStage::Startup, launch_game_session);
 
     let mut renderer = BonesBevyRenderer::new(game);
     renderer.app_namespace = (
@@ -42,16 +42,15 @@ fn launch_game_session(
 ) {
     session_ops.delete = true;
     // Build game session and add to `Sessions`
-    sessions.create_with("game", |builder: &mut SessionBuilder| {
-        builder
-            .install_plugin(DefaultSessionPlugin)
-            // Install the plugin that will load our lua plugins and run them in the game session
-            .install_plugin(LuaPluginLoaderSessionPlugin(
-                // Tell it to install the lua plugins specified in our game meta
-                Arc::new(meta.plugins.iter().copied().collect()),
-            ))
-            .add_startup_system(game_startup);
-    });
+    sessions
+        .create("game")
+        .install_plugin(DefaultSessionPlugin)
+        // Install the plugin that will load our lua plugins and run them in the game session
+        .install_plugin(LuaPluginLoaderSessionPlugin(
+            // Tell it to install the lua plugins specified in our game meta
+            Arc::new(meta.plugins.iter().copied().collect()),
+        ))
+        .add_system_to_stage(CoreStage::Startup, game_startup);
 }
 
 fn game_startup(

framework_crates/bones_asset/src/lib.rs

@@ -282,6 +282,13 @@ impl<T> From<Option<T>> for Maybe<T> {
     }
 }
 
+impl<T> From<T> for Maybe<T> {
+    #[inline]
+    fn from(value: T) -> Self {
+        Maybe::Set(value)
+    }
+}
+
 fn maybe_loader(
     ctx: &mut MetaAssetLoadCtx,
     ptr: SchemaRefMut<'_>,

framework_crates/bones_bevy_renderer/src/render.rs

@@ -430,7 +430,7 @@ pub fn extract_bones_tilemaps(
                 let tile = tiles.get(*tile_ent).unwrap();
 
                 let tile_pos = tile_layer.pos(tile_pos_idx as u32);
-                let tile_offset = tile_pos.as_vec2() * tile_layer.tile_size;
+                let tile_offset = tile_pos.as_vec2() * atlas.tile_size;
 
                 let sprite_idx = tile.idx;
                 let y = sprite_idx / atlas.columns;

framework_crates/bones_ecs/examples/pos_vel.rs

@@ -23,17 +23,14 @@ fn main() {
     let mut world = World::new();
 
     // Build SystemStages to store the systems that we will run more than once.
-    let mut stages_builder = SystemStagesBuilder::with_core_stages();
+    let mut stages = SystemStages::with_core_stages();
 
     // Add our systems to the system stages
-    stages_builder
-        .add_startup_system(startup_system)
+    stages
+        .add_system_to_stage(CoreStage::Startup, startup_system)
         .add_system_to_stage(CoreStage::Update, pos_vel_system)
         .add_system_to_stage(CoreStage::PostUpdate, print_system);
 
-    // Finish build to get `SystemStages`.
-    let mut stages = stages_builder.finish();
-
     // Run our game loop for 10 frames
     for _ in 0..10 {
         stages.run(&mut world);

framework_crates/bones_ecs/src/resources.rs

@@ -201,9 +201,40 @@ impl UntypedResources {
         )
     }
 
+    /// Iterates through owned and shared resource cells removing them if the predicate returns `false`.
+    ///
+    /// See also: [`Self::retain_owned_resources`].
+    pub fn retain_resources<F>(&self, mut predicate: F)
+    where
+        F: FnMut(SchemaId) -> bool,
+    {
+        for (schema_id, resource_cell) in self.resources.read_only_view().iter() {
+            let is_retained = predicate(*schema_id);
+            if !is_retained {
+                resource_cell.remove();
+            }
+        }
+    }
+
+    /// Iterates through resource cells removing them if the predicate returns `false`.
+    ///
+    /// Doesn't include shared resources. See also: [`Self::retain_resources`].
+    pub fn retain_owned_resources<F>(&self, mut predicate: F)
+    where
+        F: FnMut(SchemaId) -> bool,
+    {
+        for (schema_id, resource_cell) in self.resources.read_only_view().iter() {
+            let is_shared = self.shared_resources.contains_key(schema_id);
+            let is_retained = predicate(*schema_id);
+            if !is_shared && !is_retained {
+                resource_cell.remove();
+            }
+        }
+    }
+
     /// Removes all resourcse that are not shared resources.
-    pub fn clear_owned_resources(&mut self) {
-        for (schema_id, resource_cell) in self.resources.iter_mut() {
+    pub fn clear_owned_resources(&self) {
+        for (schema_id, resource_cell) in self.resources.read_only_view().iter() {
             let is_shared = self.shared_resources.contains_key(schema_id);
             if !is_shared {
                 resource_cell.remove();
@@ -297,8 +328,8 @@ impl Resources {
     }
 
     /// Removes all resources that are not shared. Shared resources are preserved.
-    pub fn clear_owned_resources(&mut self) {
-        self.untyped.clear_owned_resources();
+    pub fn clear_owned_resources(&self) {
+        self.untyped().clear_owned_resources();
     }
 }
 
@@ -547,7 +578,7 @@ impl UntypedResourceSet {
     ///
     /// If `remove_empty` is set, if resource cell is empty, it will remove the
     /// resource from cell on world.
-    pub fn insert_on_world(&self, world: &mut World, remove_empty: bool) {
+    pub fn insert_on_world(&self, world: &World, remove_empty: bool) {
         for resource in self.resources.iter() {
             let resource_cell = world.resources.untyped().get_cell(resource.schema());
 
@@ -604,7 +635,7 @@ mod test {
 
     #[test]
     fn resources_clear_owned_values() {
-        let mut r = Resources::new();
+        let r = Resources::new();
 
         // insert A as non-shared resource
         r.insert(A(String::from("foo")));