Skip to content

Commit ff7cdb0

Browse files
tychedeliatychedelia
authored
Merge pull request #1023 from tychedelia/0.16
Upgrade to 0.16
2 parents 0313577 + 8f3d4a5 commit ff7cdb0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1114
-1011
lines changed

‎Cargo.lock

Lines changed: 539 additions & 378 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,21 @@ members = [
1818
"scripts/run_all_examples",
1919
"scripts/set_version",
2020
]
21+
resolver = "2"
2122

2223
[workspace.package]
23-
edition = "2021"
24+
edition = "2024"
2425
license = "MIT OR Apache-2.0"
2526
version = "0.1.0"
2627
homepage = "https://nannou.cc"
2728
repository = "https://github.com/nannou-org/nannou.git"
2829

29-
# Required for wgpu v0.10 feature resolution.
30-
resolver = "2"
31-
3230
[workspace.dependencies]
3331
audrey = "0.3"
34-
bevy = { version = "0.15", default-features = false }
35-
bevy_common_assets = "0.12.0"
36-
bevy_egui = "0.33.0"
37-
bevy-inspector-egui = "0.30.0"
32+
bevy = { version = "0.16", default-features = false }
33+
bevy_common_assets = "0.13"
34+
bevy_egui = "0.34"
35+
bevy-inspector-egui = "0.31"
3836
bitflags = "2.9"
3937
bytemuck = "1.22"
4038
cpal = "0.13"
@@ -56,7 +54,7 @@ notosans = "0.1"
5654
num-traits = {version = "0.2", default-features = false }
5755
pennereq = "0.3"
5856
quote = "1"
59-
rand = {version = "0.8", default-features = false }
57+
rand = {version = "0.9.0", default-features = false }
6058
rayon = "1.10"
6159
ringbuf = "0.4"
6260
rosc = "0.11"
@@ -72,7 +70,7 @@ toml = "0.8"
7270
toml_edit = "0.22"
7371
usvg = "0.4"
7472
uuid = "1.8"
75-
video-rs = "0.8"
73+
video-rs = "0.10"
7674
walkdir = "2"
77-
wgpu = "23.0.1"
75+
wgpu = "24"
7876
wikipedia = "0.5"

‎bevy_nannou/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ pub mod prelude {
44
pub use bevy::color::palettes::css::*;
55
pub use bevy::color::prelude::*;
66
pub use bevy::core_pipeline::bloom::*;
7-
pub use bevy::image::{prelude::*, ImageAddressMode, ImageSampler, ImageSamplerDescriptor};
7+
pub use bevy::image::{ImageAddressMode, ImageSampler, ImageSamplerDescriptor, prelude::*};
88
pub use bevy::input::mouse::MouseWheel;
99
pub use bevy::prelude::{
10-
debug, default, error, info, light_consts, trace, warn, ClearColorConfig, Entity, Handle,
11-
Image, KeyCode, MonitorSelection, MouseButton, OrthographicProjection, TouchInput, Vec3,
12-
Window, WindowResizeConstraints,
10+
ClearColorConfig, Entity, Handle, Image, KeyCode, MonitorSelection, MouseButton,
11+
OrthographicProjection, TouchInput, Vec3, Window, WindowResizeConstraints, debug, default,
12+
error, info, light_consts, trace, warn,
1313
};
1414
pub use bevy::render::render_asset::*;
1515
pub use bevy::render::render_resource::*;
@@ -18,8 +18,8 @@ pub mod prelude {
1818

1919
pub use bevy_nannou_draw::color::*;
2020
pub use bevy_nannou_draw::draw::*;
21-
pub use bevy_nannou_draw::render::blend::*;
2221
pub use bevy_nannou_draw::render::NannouShaderModelPlugin;
22+
pub use bevy_nannou_draw::render::blend::*;
2323
pub use bevy_nannou_draw::text::*;
2424
pub use bevy_nannou_draw::*;
2525

‎bevy_nannou_derive/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use proc_macro::TokenStream;
22
use quote::quote;
3-
use syn::{parse_macro_input, parse_quote, ItemStruct, Lit, Meta, NestedMeta};
3+
use syn::{ItemStruct, Lit, Meta, NestedMeta, parse_macro_input, parse_quote};
44

55
#[proc_macro_attribute]
66
pub fn shader_model(attr: TokenStream, item: TokenStream) -> TokenStream {

‎bevy_nannou_draw/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ bevy = { workspace = true, default-features = false, features = [
1111
"bevy_pbr",
1212
"bevy_render",
1313
"bevy_ui", # needed for `BackgroundColor`
14+
"bevy_log",
1415
"tonemapping_luts",
1516
]}
1617
lyon.workspace = true

‎bevy_nannou_draw/src/draw/indirect.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
33
use crate::render::{ShaderModelHandle, ShaderStorageBufferHandle};
44
use crate::{
5-
draw::{drawing::Drawing, primitive::Primitive, Draw, DrawCommand},
6-
render::{queue_shader_model, PreparedShaderModel, ShaderModel},
5+
draw::{Draw, DrawCommand, drawing::Drawing, primitive::Primitive},
6+
render::{PreparedShaderModel, ShaderModel, queue_shader_model},
77
};
88
use bevy::render::extract_instances::ExtractedInstances;
99
use bevy::{
1010
core_pipeline::core_3d::Transparent3d,
11-
ecs::system::{lifetimeless::*, SystemParamItem},
11+
ecs::system::{SystemParamItem, lifetimeless::*},
1212
pbr::{RenderMeshInstances, SetMeshBindGroup, SetMeshViewBindGroup},
1313
prelude::*,
1414
render::{
15+
Render, RenderApp, RenderSet,
1516
extract_component::ExtractComponent,
16-
mesh::{allocator::MeshAllocator, RenderMesh, RenderMeshBufferInfo},
17-
render_asset::{prepare_assets, RenderAssets},
17+
mesh::{RenderMesh, RenderMeshBufferInfo, allocator::MeshAllocator},
18+
render_asset::{RenderAssets, prepare_assets},
1819
render_phase::{
1920
AddRenderCommand, PhaseItem, RenderCommand, RenderCommandResult, SetItemPipeline,
2021
TrackedRenderPass,
2122
},
2223
storage::{GpuShaderStorageBuffer, ShaderStorageBuffer},
23-
Render, RenderApp, RenderSet,
2424
},
2525
};
2626
use std::{hash::Hash, marker::PhantomData};

‎bevy_nannou_draw/src/draw/instanced.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
33
use crate::render::ShaderModelHandle;
44
use crate::{
5-
draw::{drawing::Drawing, primitive::Primitive, Draw, DrawCommand},
6-
render::{queue_shader_model, PreparedShaderModel, ShaderModel},
5+
draw::{Draw, DrawCommand, drawing::Drawing, primitive::Primitive},
6+
render::{PreparedShaderModel, ShaderModel, queue_shader_model},
77
};
88
use bevy::{
99
core_pipeline::core_3d::Transparent3d,
10-
ecs::system::{lifetimeless::*, SystemParamItem},
10+
ecs::system::{SystemParamItem, lifetimeless::*},
1111
pbr::{RenderMeshInstances, SetMeshBindGroup, SetMeshViewBindGroup},
1212
prelude::*,
1313
render::{
14+
Render, RenderApp, RenderSet,
1415
extract_component::ExtractComponent,
1516
extract_instances::ExtractedInstances,
16-
mesh::{allocator::MeshAllocator, RenderMesh, RenderMeshBufferInfo},
17-
render_asset::{prepare_assets, RenderAssets},
17+
mesh::{RenderMesh, RenderMeshBufferInfo, allocator::MeshAllocator},
18+
render_asset::{RenderAssets, prepare_assets},
1819
render_phase::{
1920
AddRenderCommand, PhaseItem, RenderCommand, RenderCommandResult, SetItemPipeline,
2021
TrackedRenderPass,
2122
},
22-
Render, RenderApp, RenderSet,
2323
},
2424
};
2525
use std::{hash::Hash, marker::PhantomData, ops::Range};

‎bevy_nannou_draw/src/draw/mod.rs

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,33 @@
22
//!
33
//! See the [Draw] for more details.
44
5-
use std::any::{Any, TypeId};
6-
use std::marker::PhantomData;
7-
use std::ops::{Deref, Range};
8-
use std::sync::{Arc, RwLock};
5+
use std::{
6+
any::{Any, TypeId},
7+
marker::PhantomData,
8+
ops::{Deref, Range},
9+
sync::{Arc, RwLock},
10+
};
911

10-
pub use self::background::Background;
11-
pub use self::drawing::{Drawing, DrawingContext};
1212
use self::primitive::Primitive;
13-
pub use self::theme::Theme;
14-
use crate::draw::indirect::Indirect;
15-
use crate::draw::instanced::Instanced;
16-
use crate::draw::mesh::MeshExt;
17-
use crate::render::{DefaultNannouShaderModel, ShaderModel};
18-
use bevy::asset::UntypedAssetId;
19-
use bevy::prelude::*;
20-
use bevy::render::render_resource as wgpu;
21-
use bevy::render::render_resource::{BlendComponent, BlendState};
22-
use bevy::render::storage::ShaderStorageBuffer;
23-
use bevy::utils::{HashMap, HashSet};
13+
pub use self::{
14+
background::Background,
15+
drawing::{Drawing, DrawingContext},
16+
theme::Theme,
17+
};
18+
use crate::{
19+
draw::{indirect::Indirect, instanced::Instanced, mesh::MeshExt},
20+
render::{DefaultNannouShaderModel, ShaderModel},
21+
};
22+
use bevy::{
23+
asset::UntypedAssetId,
24+
platform::collections::{HashMap, HashSet},
25+
prelude::*,
26+
render::{
27+
render_resource as wgpu,
28+
render_resource::{BlendComponent, BlendState},
29+
storage::ShaderStorageBuffer,
30+
},
31+
};
2432
use lyon::path::PathEvent;
2533
use uuid::Uuid;
2634

‎bevy_nannou_draw/src/draw/primitive/arrow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use bevy::prelude::*;
22
use lyon::tessellation::StrokeOptions;
33

4-
use crate::draw::primitive::path;
54
use crate::draw::primitive::Line;
65
use crate::draw::primitive::Primitive;
6+
use crate::draw::primitive::path;
77
use crate::draw::properties::spatial::{orientation, position};
88
use crate::draw::properties::{SetColor, SetOrientation, SetPosition, SetStroke};
99
use crate::draw::{self, Drawing};

‎bevy_nannou_draw/src/draw/primitive/ellipse.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ use lyon::tessellation::StrokeOptions;
44
use nannou_core::geom;
55

66
use crate::draw;
7-
use crate::draw::primitive::polygon::{self, PolygonInit, PolygonOptions, SetPolygon};
7+
use crate::draw::Drawing;
88
use crate::draw::primitive::Primitive;
9+
use crate::draw::primitive::polygon::{self, PolygonInit, PolygonOptions, SetPolygon};
910
use crate::draw::properties::spatial::{dimension, orientation, position};
1011
use crate::draw::properties::{
11-
spatial, SetColor, SetDimensions, SetOrientation, SetPosition, SetStroke,
12+
SetColor, SetDimensions, SetOrientation, SetPosition, SetStroke, spatial,
1213
};
13-
use crate::draw::Drawing;
1414
use crate::render::ShaderModel;
1515

1616
/// Properties related to drawing an **Ellipse**.

‎bevy_nannou_draw/src/draw/primitive/polygon.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use lyon::path::PathEvent;
33
use lyon::tessellation::StrokeOptions;
44

55
use crate::draw::drawing::DrawingContext;
6-
use crate::draw::primitive::path::{self, PathEventSource};
76
use crate::draw::primitive::Primitive;
7+
use crate::draw::primitive::path::{self, PathEventSource};
88
use crate::draw::properties::spatial::{orientation, position};
99
use crate::draw::properties::{SetColor, SetOrientation, SetPosition, SetStroke};
1010
use crate::draw::{self, Drawing};

‎bevy_nannou_draw/src/draw/primitive/quad.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use lyon::tessellation::StrokeOptions;
33

44
use nannou_core::geom;
55

6-
use crate::draw::primitive::polygon::{self, PolygonInit, PolygonOptions, SetPolygon};
76
use crate::draw::primitive::Primitive;
7+
use crate::draw::primitive::polygon::{self, PolygonInit, PolygonOptions, SetPolygon};
88
use crate::draw::properties::spatial::{dimension, orientation, position};
99
use crate::draw::properties::{
10-
spatial, SetColor, SetDimensions, SetOrientation, SetPosition, SetStroke,
10+
SetColor, SetDimensions, SetOrientation, SetPosition, SetStroke, spatial,
1111
};
1212
use crate::draw::{self, Drawing};
1313
use crate::render::ShaderModel;

‎bevy_nannou_draw/src/draw/primitive/rect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use lyon::tessellation::StrokeOptions;
33

44
use nannou_core::geom;
55

6-
use crate::draw::primitive::polygon::{self, PolygonInit, PolygonOptions, SetPolygon};
76
use crate::draw::primitive::Primitive;
7+
use crate::draw::primitive::polygon::{self, PolygonInit, PolygonOptions, SetPolygon};
88
use crate::draw::properties::spatial::{dimension, orientation, position};
99
use crate::draw::properties::tex_coords::SetTexCoords;
1010
use crate::draw::properties::{SetColor, SetDimensions, SetOrientation, SetPosition, SetStroke};

‎bevy_nannou_draw/src/draw/primitive/tri.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use lyon::tessellation::StrokeOptions;
33

44
use nannou_core::geom;
55

6-
use crate::draw::primitive::polygon::{self, PolygonInit, PolygonOptions, SetPolygon};
76
use crate::draw::primitive::Primitive;
7+
use crate::draw::primitive::polygon::{self, PolygonInit, PolygonOptions, SetPolygon};
88
use crate::draw::properties::spatial::{dimension, orientation, position};
99
use crate::draw::properties::{SetColor, SetDimensions, SetOrientation, SetPosition, SetStroke};
1010
use crate::draw::{self, Drawing};

0 commit comments

Comments
 (0)