Skip to content

Commit

Permalink
Move Scripting Binary Target to the Runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
zicklag committed Oct 30, 2020
1 parent 0547b23 commit 158288a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions arsenal_runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ edition = "2018"

[dependencies]
bevy = { path = "../lib/bevy" }
arsenal_scripting = { path = "../arsenal_scripting" }
12 changes: 11 additions & 1 deletion arsenal_runtime/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
use bevy::prelude::*;

fn main() {
todo!("Migrate for Bevy");
App::build()
.add_default_plugins()
.add_plugin(arsenal_scripting::ScriptingPlugin::new(
&std::env::args()
.skip(1)
.next()
.unwrap_or(".".to_string()),
))
.run();
}
2 changes: 1 addition & 1 deletion arsenal_scripting/src/bindings/bevy.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
//! Bindings to Bevy's core systems and components

pub mod transform;
// pub mod transform;
13 changes: 0 additions & 13 deletions arsenal_scripting/src/main.rs

This file was deleted.

2 changes: 1 addition & 1 deletion lib/bevy
Submodule bevy updated 51 files
+25 −4 .github/workflows/ci.yml
+105 −12 CHANGELOG.md
+11 −0 Cargo.toml
+1 −0 crates/bevy_app/Cargo.toml
+1 −0 crates/bevy_app/src/app.rs
+20 −1 crates/bevy_app/src/app_builder.rs
+3 −2 crates/bevy_app/src/lib.rs
+103 −0 crates/bevy_app/src/plugin_group.rs
+4 −1 crates/bevy_asset/Cargo.toml
+51 −0 crates/bevy_asset/src/io/android_asset_io.rs
+7 −4 crates/bevy_asset/src/io/file_asset_io.rs
+6 −2 crates/bevy_asset/src/io/mod.rs
+11 −3 crates/bevy_asset/src/lib.rs
+1 −0 crates/bevy_ecs/Cargo.toml
+2 −0 crates/bevy_ecs/hecs/Cargo.toml
+68 −29 crates/bevy_ecs/hecs/src/archetype.rs
+444 −0 crates/bevy_ecs/hecs/src/dynamic_query.rs
+6 −6 crates/bevy_ecs/hecs/src/entities.rs
+58 −11 crates/bevy_ecs/hecs/src/entity_builder.rs
+9 −3 crates/bevy_ecs/hecs/src/lib.rs
+180 −355 crates/bevy_ecs/hecs/src/query.rs
+6 −6 crates/bevy_ecs/hecs/src/query_one.rs
+97 −8 crates/bevy_ecs/hecs/src/world.rs
+4 −2 crates/bevy_ecs/src/lib.rs
+1 −2 crates/bevy_ecs/src/system/into_system.rs
+0 −2 crates/bevy_ecs/src/system/mod.rs
+89 −258 crates/bevy_ecs/src/system/query.rs
+33 −24 crates/bevy_ecs/src/system/system.rs
+11 −0 crates/bevy_gilrs/src/gilrs_system.rs
+6 −3 crates/bevy_gilrs/src/lib.rs
+46 −2 crates/bevy_gltf/src/loader.rs
+28 −47 crates/bevy_input/src/gamepad.rs
+2 −0 crates/bevy_input/src/lib.rs
+1 −19 crates/bevy_render/src/texture/sampler_descriptor.rs
+9 −3 crates/bevy_render/src/texture/texture.rs
+3 −0 crates/bevy_scene/Cargo.toml
+14 −9 crates/bevy_scene/src/dynamic_scene.rs
+14 −9 crates/bevy_scene/src/scene_spawner.rs
+1 −1 crates/bevy_transform/src/components/parent.rs
+8 −14 crates/bevy_transform/src/hierarchy/child_builder.rs
+18 −32 crates/bevy_transform/src/hierarchy/hierarchy_maintenance_system.rs
+1 −1 crates/bevy_transform/src/hierarchy/world_child_builder.rs
+4 −0 docs/linux_dependencies.md
+50 −0 examples/app/plugin_group.rs
+39 −36 examples/ecs/dynamic_components.rs
+26 −37 examples/ecs/dynamic_systems.rs
+1 −2 examples/input/gamepad_input.rs
+0 −50 src/add_default_plugins.rs
+58 −0 src/default_plugins.rs
+2 −2 src/lib.rs
+1 −1 src/prelude.rs

0 comments on commit 158288a

Please sign in to comment.