Skip to content

Upgraded bevy dependency from 0.4 to 0.7. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schnippl0r wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Upgraded bevy dependency from 0.4 to 0.7. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd3c6f0
Upgraded bevy dependency from 0.4 to 0.6.
schnippl0r Apr 4, 2022
213fe87
Removed unecessary `resolver` setting.
schnippl0r Apr 4, 2022
b7cf748
Upgraded bevy dependency from 0.6 to 0.7.
schnippl0r May 1, 2022
fe60530
Set version number back to 0.4.0 instead of 0.5.0.
schnippl0r May 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "bevy_rng"
version = "0.3.0"
version = "0.4.0"
authors = ["Jean Mertz <[email protected]>"]
edition = "2018"
edition = "2021"
repository = "https://github.com/rustic-games/bevy_rng"
description = "A Bevy game engine random number generator plugin"
license-file = "LICENSE"
Expand All @@ -12,8 +12,8 @@ rand = { version = "0.8", default-features = false, features = ["getrandom"] }
rand_seeder = "0.2"
rand_xoshiro = "0.6"

bevy-stable = { package = "bevy", version = "0.4", default-features = false, optional = true }
bevy-nightly = { package = "bevy", version = "0.4", git = "https://github.com/bevyengine/bevy", rev = "c2a427f1a38db6b1d9798e631a7da7a8507fe18c", default-features = false, optional = true }
bevy-stable = { package = "bevy", version = "0.7", default-features = false, optional = true }
bevy-nightly = { package = "bevy", version = "0.8.0-dev", git = "https://github.com/bevyengine/bevy", rev = "b9102b8836bd2aa07df2732f5364b9ac90accb66", default-features = false, optional = true }

[features]
default = ["bevy-stable"]
37 changes: 21 additions & 16 deletions examples/rng.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,47 @@
#[cfg(all(feature = "bevy-nightly", not(feature = "bevy-stable")))]
use bevy_nightly as bevy;
#[cfg(all(feature = "bevy-stable", not(feature = "bevy-nightly")))]
use bevy_stable as bevy;

use bevy::app::ScheduleRunnerSettings;
use bevy::prelude::*;
use bevy_rng::*;
use std::time::Duration;

fn main() {
// Don't register the plugin (non-deterministic)...
App::build()
.add_resource(ScheduleRunnerSettings::run_once())
App::new()
.insert_resource(ScheduleRunnerSettings::run_once())
.add_plugins(MinimalPlugins)
.add_system(random_number_1.system())
.add_system(random_number_2.system())
.add_system(random_number_1)
.add_system(random_number_2)
.run();

// ...don't provide a seed (same as above)...
App::build()
.add_resource(ScheduleRunnerSettings::run_once())
App::new()
.insert_resource(ScheduleRunnerSettings::run_once())
.add_plugins(MinimalPlugins)
.add_plugin(RngPlugin::default())
.add_system(random_number_1.system())
.add_system(random_number_2.system())
.add_system(random_number_1)
.add_system(random_number_2)
.run();

// ...seed from u64 (deterministic)...
App::build()
.add_resource(ScheduleRunnerSettings::run_once())
App::new()
.insert_resource(ScheduleRunnerSettings::run_once())
.add_plugins(MinimalPlugins)
.add_plugin(RngPlugin::from(42))
.add_system(random_number_1.system())
.add_system(random_number_2.system())
.add_system(random_number_1)
.add_system(random_number_2)
.run();

// ...or from a string (same as above).
App::build()
.add_resource(ScheduleRunnerSettings::run_loop(Duration::from_millis(100)))
App::new()
.insert_resource(ScheduleRunnerSettings::run_loop(Duration::from_millis(100)))
.add_plugins(MinimalPlugins)
.add_plugin(RngPlugin::from("your seed here"))
.add_system(random_number_1.system())
.add_system(random_number_2.system())
.add_system(random_number_1)
.add_system(random_number_2)
.run();
}

Expand Down
10 changes: 5 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ enum Seed {
}

impl Plugin for RngPlugin {
fn build(&self, app: &mut AppBuilder) {
fn build(&self, app: &mut App) {
let rng = match &self.seed {
Some(Seed::String(seed)) => Seeder::from(seed.as_str()).make_rng(),
Some(Seed::Number(num)) => Xoshiro256StarStar::seed_from_u64(*num),
Expand All @@ -72,7 +72,7 @@ impl Plugin for RngPlugin {
#[cfg(all(feature = "bevy-nightly", not(feature = "bevy-stable")))]
app.insert_resource(RootRng { rng });
#[cfg(all(feature = "bevy-stable", not(feature = "bevy-nightly")))]
app.add_resource(RootRng { rng });
app.insert_resource(RootRng { rng });
}
}

Expand Down Expand Up @@ -105,9 +105,9 @@ impl DerefMut for Rng {
}
}

impl FromResources for Rng {
fn from_resources(resources: &Resources) -> Self {
let inner = match resources.get_mut::<RootRng>() {
impl FromWorld for Rng {
fn from_world(world: &mut World) -> Self {
let inner = match world.get_resource_mut::<RootRng>() {
Some(mut rng) => Xoshiro256StarStar::from_rng(&mut rng.deref_mut().rng)
.expect("failed to create rng"),
None => Xoshiro256StarStar::from_entropy(),
Expand Down