Skip to content

Commit

Permalink
deps: Update nalgebra to 0.33 (#146)
Browse files Browse the repository at this point in the history
  • Loading branch information
waywardmonkeys authored Jun 24, 2024
1 parent 130a148 commit 94b5239
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 21 deletions.
15 changes: 7 additions & 8 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ieee754 = "0.2"
image = { version = "0.24", default-features = false, features = ["png"] }
libc = "0.2"
log = "0.4"
nalgebra = "0.32"
nalgebra = "0.33"
notify = "6.0"
num-traits = "0.2"
ordered-float = "4"
Expand Down
2 changes: 1 addition & 1 deletion demos/web-editor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ crate-type = ["cdylib"]
[dependencies]
bincode = "1.3.3"
wasm-bindgen = "0.2.92"
nalgebra = "0.32"
nalgebra = "0.33"

fidget = {path = "../../fidget", default-features = false, features = ["rhai", "mesh", "render"]}

Expand Down
2 changes: 1 addition & 1 deletion fidget/src/core/shape/bounds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl<const N: usize> Bounds<N>
where
Const<N>: DimNameAdd<U1>,
DefaultAllocator:
Allocator<f32, DimNameSum<Const<N>, U1>, DimNameSum<Const<N>, U1>>,
Allocator<DimNameSum<Const<N>, U1>, DimNameSum<Const<N>, U1>>,
<Const<N> as DimNameAdd<Const<1>>>::Output: DimNameSub<U1>,
{
/// Returns a homogeneous transform matrix for these bounds
Expand Down
13 changes: 5 additions & 8 deletions fidget/src/render/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ impl<const N: usize> RenderConfig<N>
where
nalgebra::Const<N>: nalgebra::DimNameAdd<nalgebra::U1>,
DefaultAllocator:
Allocator<f32, DimNameSum<Const<N>, U1>, DimNameSum<Const<N>, U1>>,
Allocator<DimNameSum<Const<N>, U1>, DimNameSum<Const<N>, U1>>,
DefaultAllocator:
nalgebra::allocator::Allocator<
f32,
<<Const<N> as DimNameAdd<Const<1>>>::Output as DimNameSub<
Const<1>,
>>::Output,
Expand Down Expand Up @@ -89,12 +88,11 @@ where
Const<1>,
>>::Output,
<DefaultAllocator as nalgebra::allocator::Allocator<
f32,
<<Const<N> as DimNameAdd<Const<1>>>::Output as DimNameSub<
Const<1>,
>>::Output,
U1,
>>::Buffer,
>>::Buffer<f32>,
>::from_element(-1.0);

// Build a matrix which transforms from pixel coordinates to [-1, +1]
Expand Down Expand Up @@ -129,7 +127,7 @@ pub(crate) struct AlignedRenderConfig<const N: usize>
where
nalgebra::Const<N>: nalgebra::DimNameAdd<nalgebra::U1>,
DefaultAllocator:
Allocator<f32, DimNameSum<Const<N>, U1>, DimNameSum<Const<N>, U1>>,
Allocator<DimNameSum<Const<N>, U1>, DimNameSum<Const<N>, U1>>,
{
pub image_size: usize,
pub orig_image_size: usize,
Expand All @@ -146,17 +144,16 @@ type NPlusOneMatrix<const N: usize> = nalgebra::Matrix<
<Const<N> as DimNameAdd<Const<1>>>::Output,
<Const<N> as DimNameAdd<Const<1>>>::Output,
<DefaultAllocator as nalgebra::allocator::Allocator<
f32,
<Const<N> as DimNameAdd<Const<1>>>::Output,
<Const<N> as DimNameAdd<Const<1>>>::Output,
>>::Buffer,
>>::Buffer<f32>,
>;

impl<const N: usize> AlignedRenderConfig<N>
where
nalgebra::Const<N>: nalgebra::DimNameAdd<nalgebra::U1>,
DefaultAllocator:
Allocator<f32, DimNameSum<Const<N>, U1>, DimNameSum<Const<N>, U1>>,
Allocator<DimNameSum<Const<N>, U1>, DimNameSum<Const<N>, U1>>,
<Const<N> as DimNameAdd<Const<1>>>::Output: DimNameSub<Const<1>>,
{
#[inline]
Expand Down
3 changes: 1 addition & 2 deletions workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ getrandom = { version = "0.2", default-features = false, features = ["std"] }
once_cell = { version = "1" }
proc-macro2 = { version = "1" }
quote = { version = "1" }
syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full"] }
syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "full"] }
syn = { version = "2", features = ["extra-traits", "full"] }

[target.x86_64-unknown-linux-gnu.dependencies]
ahash = { version = "0.8" }
Expand Down

0 comments on commit 94b5239

Please sign in to comment.