Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade bevy to 0.15, purge bevy_mod_picking, github toolchain update, retained rendering fix #1

Merged
merged 7 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.72.0
toolchain: 1.83.0

- name: install dependencies
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
Expand Down
59 changes: 29 additions & 30 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,57 +3,57 @@ resolver = "2"
members = ["crates/*", "examples/*"]

[workspace.package]
version = "0.4.0"
rust-version = "1.78.0"
version = "0.5.0"
rust-version = "1.82.0"
edition = "2021"
license = "MIT OR Apache-2.0"
homepage = "https://github.com/urholaukkarinen/transform-gizmo"
repository = "https://github.com/urholaukkarinen/transform-gizmo"
authors = ["Urho Laukkarinen <[email protected]>"]

[workspace.dependencies]
transform-gizmo = { version = "0.4.0", path = "crates/transform-gizmo" }
transform-gizmo-egui = { version = "0.4.0", path = "crates/transform-gizmo-egui" }
transform-gizmo-bevy = { version = "0.4.0", path = "crates/transform-gizmo-bevy" }
transform-gizmo = { version = "0.5.0", path = "crates/transform-gizmo" }
transform-gizmo-egui = { version = "0.5.0", path = "crates/transform-gizmo-egui" }
transform-gizmo-bevy = { version = "0.5.0", path = "crates/transform-gizmo-bevy" }

egui = "0.29"
eframe = "0.29"
emath = "0.29"
epaint = "0.29"
ecolor = "0.29"
egui = "0.30"
eframe = "0.30"
emath = "0.30"
epaint = "0.30"
ecolor = "0.30"
glam = { version = "0.29.1", features = ["mint"] }
mint = "0.5"
enum_dispatch = "0.3.12"
ahash = "0.8.7"
enumset = "1.1.3"
bytemuck = "1.5"
uuid = "1.1"
bevy = "0.14"
bevy = "0.15"

bevy_app = { version = "0.14", default-features = false }
bevy_core = { version = "0.14", default-features = false }
bevy_core_pipeline = { version = "0.14", default-features = false }
bevy_reflect = { version = "0.14", default-features = false }
bevy_math = { version = "0.14", features = ["mint"], default-features = false }
bevy_render = { version = "0.14", default-features = false }
bevy_input = { version = "0.14", default-features = false }
bevy_asset = { version = "0.14", default-features = false }
bevy_utils = { version = "0.14", default-features = false }
bevy_pbr = { version = "0.14", default-features = false }
bevy_ecs = { version = "0.14", default-features = false }
bevy_log = { version = "0.14", default-features = false }
bevy_window = { version = "0.14", default-features = false }
bevy_transform = { version = "0.14", default-features = false }
bevy_app = { version = "0.15", default-features = false }
bevy_core = { version = "0.15", default-features = false }
bevy_core_pipeline = { version = "0.15", default-features = false }
bevy_reflect = { version = "0.15", default-features = false }
bevy_math = { version = "0.15", features = ["mint"], default-features = false }
bevy_render = { version = "0.15", default-features = false }
bevy_input = { version = "0.15", default-features = false }
bevy_asset = { version = "0.15", default-features = false }
bevy_utils = { version = "0.15", default-features = false }
bevy_pbr = { version = "0.15", default-features = false }
bevy_ecs = { version = "0.15", default-features = false }
bevy_log = { version = "0.15", default-features = false }
bevy_window = { version = "0.15", default-features = false }
bevy_transform = { version = "0.15", default-features = false }
bevy_derive = { version = "0.15", default-features = false }
bevy_image = { version = "0.15", default-features = false }
bevy_picking = {version = "0.15", default-features = false}

[profile.release]
opt-level = "s"
panic = "abort"

[workspace.lints.rust]
elided_lifetimes_in_paths = "allow"
future_incompatible = "deny"
nonstandard_style = "deny"
rust_2018_idioms = "warn"
rust_2021_prelude_collisions = "deny"
semicolon_in_expressions_from_macros = "deny"
trivial_numeric_casts = "deny"
Expand All @@ -64,7 +64,6 @@ unused_lifetimes = "deny"
unsafe_code = "deny"

[workspace.lints.clippy]
all = "deny"
as_ptr_cast_mut = "deny"
await_holding_lock = "deny"
bool_to_int_with_if = "deny"
Expand Down Expand Up @@ -133,7 +132,7 @@ match_same_arms = "deny"
match_wild_err_arm = "deny"
match_wildcard_for_single_variants = "deny"
mem_forget = "deny"
mismatched_target_os = "deny"
unexpected_cfgs = "deny"
mismatching_type_param_order = "deny"
missing_enforced_import_renames = "deny"
missing_safety_doc = "deny"
Expand Down
9 changes: 6 additions & 3 deletions crates/transform-gizmo-bevy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "transform-gizmo-bevy"
description = "bevy integration for transform-gizmo"
version.workspace = true
rust-version = "1.79.0"
rust-version = "1.82.0"
edition.workspace = true
license.workspace = true
homepage.workspace = true
Expand All @@ -27,6 +27,7 @@ bevy_core.workspace = true
bevy_core_pipeline.workspace = true
bevy_reflect.workspace = true
bevy_math.workspace = true
bevy_picking.workspace = true
bevy_render.workspace = true
bevy_input.workspace = true
bevy_asset.workspace = true
Expand All @@ -36,11 +37,13 @@ bevy_ecs.workspace = true
bevy_log.workspace = true
bevy_window.workspace = true
bevy_transform.workspace = true
bevy_derive.workspace = true
bevy_image.workspace = true
bytemuck.workspace = true
uuid.workspace = true

[dev-dependencies]
bevy = "0.14"
bevy = "0.15"

[lints]
workspace = true
workspace = true
26 changes: 10 additions & 16 deletions crates/transform-gizmo-bevy/examples/bevy_minimal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,26 @@ fn setup(
) {
// camera
commands.spawn((
Camera3dBundle {
transform: Transform::from_translation(Vec3::new(1.0, 3.0, -5.0))
.looking_at(Vec3::ZERO, Vec3::Y),
..default()
},
Camera3d::default(),
Transform::from_translation(Vec3::new(1.0, 3.0, -5.0)).looking_at(Vec3::ZERO, Vec3::Y),
Msaa::Sample2,
GizmoCamera,
));

// cube
commands.spawn((
PbrBundle {
mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
material: materials.add(Color::from(LIME)),
transform: Transform::from_translation(Vec3::new(0.0, 0.0, 0.0)),
..default()
},
Mesh3d(meshes.add(Cuboid::new(1.0, 1.0, 1.0))),
MeshMaterial3d(materials.add(Color::from(LIME))),
Transform::from_translation(Vec3::new(0.0, 0.0, 0.0)),
GizmoTarget::default(),
));

// light
commands.spawn(PointLightBundle {
point_light: PointLight {
commands.spawn((
PointLight {
shadows_enabled: true,
..default()
},
transform: Transform::from_xyz(4.0, 8.0, 4.0),
..default()
});
Transform::from_xyz(4.0, 8.0, 4.0),
));
}
4 changes: 3 additions & 1 deletion crates/transform-gizmo-bevy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,9 @@ fn draw_gizmos(
if is_new_asset {
let asset = draw_data_assets.add(bevy_draw_data);

draw_data_handles.handles.insert(*gizmo_uuid, asset.clone());
draw_data_handles
.handles
.insert(*gizmo_uuid, asset.clone().into());
}
}
}
Expand Down
Loading
Loading