Skip to content

Commit

Permalink
feat: update nalgebra & parry3d
Browse files Browse the repository at this point in the history
  • Loading branch information
SignalWalker committed Sep 23, 2024
1 parent 893da4d commit 8cfce53
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 23 deletions.
118 changes: 107 additions & 11 deletions Cargo.lock

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

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ members = ["samples/*", "lib/*"]
[dependencies]
eightfold-common = { path = "./lib/common" }

nalgebra = "^0.32"
nalgebra = "^0.33"
simba = "^0.9"
num-traits = "^0.2"
thiserror = "^1.0"

Expand All @@ -36,7 +37,7 @@ stablevec = { path = "./lib/stablevec" }
tracing = { optional = true, version = "^0.1" }

# spatial
parry3d = { optional = true, version = "^0.13" }
parry3d = { optional = true, version = "^0.17" }

# mesh
hedron = { optional = true, path = "./lib/hedron" }
Expand Down
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
"rust-analyzer"
"rustfmt"
"clippy"
"rust-src"
];
};
crane = (inputs.crane.mkLib pkgs).overrideToolchain toolchain;
Expand Down
23 changes: 15 additions & 8 deletions samples/voxelize/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,26 @@ edition = "2021"
publish = false

[dependencies]
eightfold = { path = "../..", features = [ "render", "tracing" ] }
eightfold = { path = "../..", features = ["render", "tracing"] }
hedron = { path = "../../lib/hedron", features = [] }

nalgebra = "^0.32"
nalgebra = "^0.33"
num-traits = "^0.2"

tracing = "^0.1"
tracing-subscriber = { version = "^0.3", features = [ "time", "env-filter", "parking_lot", "local-time", "json" ] }
tracing-subscriber = { version = "^0.3", features = [
"time",
"env-filter",
"parking_lot",
"local-time",
"json",
] }
time = { version = "^0.3", features = ["formatting", "local-offset", "macros"] }
thiserror = "^1.0"

static_assertions = "^1.1"

clap = { version = "^4", features = [ "derive", "env" ] }
clap = { version = "^4", features = ["derive", "env"] }

wgpu = { version = "^0.14" }

Expand All @@ -32,13 +38,14 @@ pollster = "^0.2"

# gltf
gltf = { optional = true, version = "^1" }
url = { optional = true, version = "^2", features = [ ] } # for reading URIs from within glTF documents
url = { optional = true, version = "^2", features = [
] } # for reading URIs from within glTF documents

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator = { optional = true, version = "^0.5" }
tikv-jemalloc-ctl = { optional = true, version = "^0.5" }

[features]
default = [ "jemalloc", "gltf" ]
gltf = [ "dep:gltf", "dep:url" ]
jemalloc = [ "dep:tikv-jemallocator", "dep:tikv-jemalloc-ctl" ]
default = ["jemalloc", "gltf"]
gltf = ["dep:gltf", "dep:url"]
jemalloc = ["dep:tikv-jemallocator", "dep:tikv-jemalloc-ctl"]
2 changes: 1 addition & 1 deletion src/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ use eightfold_common::ArrayIndex;
pub use error::*;
pub use iter::*;
pub use merge::*;
use nalgebra::ClosedMul;
pub use node::*;
use num_traits::AsPrimitive;
pub use proxy::*;
pub use sample::*;
use simba::scalar::ClosedMul;
pub use slice::*;
#[cfg(feature = "tracing")]
use tracing::instrument;
Expand Down
2 changes: 1 addition & 1 deletion src/tree/sample.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::ops::{Shl, ShlAssign, Shr, ShrAssign};

use eightfold_common::ArrayIndex;
use nalgebra::ClosedMul;
use simba::scalar::ClosedMul;

use crate::{Error, NodePoint, Octree};

Expand Down

0 comments on commit 8cfce53

Please sign in to comment.