kristoferssolo/hexlab
1
0
Fork 0
mirror of https://github.com/kristoferssolo/hexlab.git synced 2025-10-21 19:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(rand): remove rand_chacha dependency

Browse Source
This commit is contained in:
Kristofers Solo 2024-12-12 20:59:01 +02:00
parent 292b7b5df4
commit 44dbbbbacf
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2300,7 +2300,6 @@ dependencies = [
"bevy", "bevy",
"hexx", "hexx",
"rand", "rand",
"rand_chacha",
"serde", "serde",
"thiserror 2.0.3", "thiserror 2.0.3",
] ]
@ -3300,7 +3299,6 @@ checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [ dependencies = [
"ppv-lite86", "ppv-lite86",
"rand_core", "rand_core",
"serde",
] ]
[[package]] [[package]]

3
Cargo.toml
View File

@ -21,7 +21,6 @@ exclude = ["/.github", "/.gitignore", "/tests", "*.png", "*.md"]
bevy = { version = "0.15", optional = true } bevy = { version = "0.15", optional = true }
hexx = { version = "0.19" } hexx = { version = "0.19" }
rand = "0.8" rand = "0.8"
rand_chacha = "0.3"
serde = { version = "1.0", features = ["derive"], optional = true } serde = { version = "1.0", features = ["derive"], optional = true }
thiserror = "2.0" thiserror = "2.0"
@ -30,7 +29,7 @@ thiserror = "2.0"
[features] [features]
default = [] default = []
serde = ["dep:serde", "hexx/serde", "rand_chacha/serde"] serde = ["dep:serde", "hexx/serde"]
bevy = ["bevy_reflect"] bevy = ["bevy_reflect"]
bevy_reflect = ["dep:bevy", "hexx/bevy_reflect"] bevy_reflect = ["dep:bevy", "hexx/bevy_reflect"]
full = ["serde", "bevy"] full = ["serde", "bevy"]

6
src/generator.rs
View File

@ -1,8 +1,7 @@
#[cfg(feature = "bevy_reflect")] #[cfg(feature = "bevy_reflect")]
use bevy::prelude::*; use bevy::prelude::*;
use hexx::{EdgeDirection, Hex}; use hexx::{EdgeDirection, Hex};
use rand::{seq::SliceRandom, thread_rng, Rng, RngCore, SeedableRng}; use rand::{rngs::StdRng, seq::SliceRandom, thread_rng, Rng, RngCore, SeedableRng};
use rand_chacha::ChaCha8Rng;
use std::collections::HashSet; use std::collections::HashSet;
use crate::HexMaze; use crate::HexMaze;
@ -29,8 +28,9 @@ pub fn generate_backtracking(maze: &mut HexMaze, start_pos: Option<Hex>, seed: O
let mut rng: Box<dyn RngCore> = seed.map_or_else( let mut rng: Box<dyn RngCore> = seed.map_or_else(
|| Box::new(thread_rng()) as Box<dyn RngCore>, || Box::new(thread_rng()) as Box<dyn RngCore>,
|seed| Box::new(ChaCha8Rng::seed_from_u64(seed)) as Box<dyn RngCore>, |seed| Box::new(StdRng::seed_from_u64(seed)) as Box<dyn RngCore>,
); );
recursive_backtrack(maze, start, &mut visited, &mut rng); recursive_backtrack(maze, start, &mut visited, &mut rng);
} }