Skip to content

Commit

Permalink
Merge pull request #173 from Walther/2023-01-08-tiny-fixes
Browse files Browse the repository at this point in the history
2023-01-08 tiny fixes
  • Loading branch information
Walther authored Jan 8, 2023
2 parents fb99aea + 858c393 commit d67835d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions clovers-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ path = "src/main.rs"
clovers = { path = "../clovers", features = ["serde-derive", "stl", "traces", "gl_tf"], default-features = false }

# External
clap = { version = "4.0.29", features = ["std", "derive"], default-features = false }
clap = { version = "4.0.32", features = ["std", "derive"], default-features = false }
human_format = "1.0.3"
humantime = "2.1.0"
image = { version = "0.24.5", features = ["png"], default-features = false }
img-parts = "0.3.0"
indicatif = { version = "0.17.2", features = ["rayon"], default-features = false }
indicatif = { git = "https://github.com/console-rs/indicatif", rev = "2954b1a24ac5f1900a7861992e4825bff643c9e2", features = ["rayon"], default-features = false }
rand = { version = "0.8.5", features = ["small_rng", "getrandom"], default-features = false }
rayon = "1.6.1"
serde = { version = "1.0.150", features = ["derive"], default-features = false }
serde = { version = "1.0.152", features = ["derive"], default-features = false }
serde_json = { version = "1.0", features = ["alloc"], default-features = false }
time = { version = "0.3.17", default-features = false }
tracing = "0.1.37"
Expand Down
2 changes: 2 additions & 0 deletions clovers-cli/src/draw_cpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use rand::rngs::SmallRng;
use rand::{Rng, SeedableRng};
use rayon::prelude::*;
use scenes::Scene;
use std::time::Duration;

/// The main drawing function, returns a `Vec<Color>` as a pixelbuffer.
pub fn draw(opts: RenderOpts, scene: Scene) -> Vec<Color> {
Expand All @@ -18,6 +19,7 @@ pub fn draw(opts: RenderOpts, scene: Scene) -> Vec<Color> {
bar.set_style(ProgressStyle::default_bar().template(
"Elapsed: {elapsed_precise}\nPixels: {bar} {pos}/{len}\nETA: {eta_precise}",
).unwrap());
bar.enable_steady_tick(Duration::from_millis(100));
}

let black = Color::new(0.0, 0.0, 0.0);
Expand Down
4 changes: 2 additions & 2 deletions clovers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ std = []
traces = ["tracing"]

[dependencies]
enum_dispatch = "0.3.8"
enum_dispatch = "0.3.9"
gltf = { version = "1.0.0", optional = true }
nalgebra = { version = "0.31.4", features = ["libm"], default-features = false }
rand = { version = "0.8.5", features = ["small_rng"], default-features = false }
rand_distr = "0.4.3"
serde = { version = "1.0.150", features = ["derive"], default-features = false, optional = true }
serde = { version = "1.0.152", features = ["derive"], default-features = false, optional = true }
stl_io = { version = "0.7.0", optional = true }
tracing = { version = "0.1.37", optional = true }

Expand Down

0 comments on commit d67835d

Please sign in to comment.