Skip to content

Depend on cart's BSN branch #232

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jul 18, 2025
Merged

Depend on cart's BSN branch #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06798c9
Update to `0294fa89db4e213ac8e186eed6966a7ea7459d1a`
tim-blackbird Jul 18, 2025
e04b549
Depend on cart's BSN branch
tim-blackbird Jul 18, 2025
230e458
argh
tim-blackbird Jul 18, 2025
696f7da
this time for real
tim-blackbird Jul 18, 2025
87e50f9
Update to latest commit + enable bevy_feathers + remove unintended ch…
tim-blackbird Jul 18, 2025
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
11 changes: 6 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
resolver = "2"
resolver = "3"
members = ["crates/*", "bevy_editor_panes/*", "bevy_widgets/*"]
exclude = ["templates/"]
default-members = ["crates/bevy_editor_launcher"]
Expand Down Expand Up @@ -27,12 +27,13 @@ unsafe_op_in_unsafe_fn = "warn"
unused_qualifications = "warn"

[workspace.dependencies]
bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "a3d406dd497205253e34ace757ab0076d50eec14", features = [
bevy = { git = "https://github.com/cart/bevy.git", rev = "ab733198b8b59ec90194797f4a1d46a12043ebfc", features = [
"wayland",
"experimental_bevy_feathers",
] }
bevy_render = { git = "https://github.com/bevyengine/bevy.git", rev = "a3d406dd497205253e34ace757ab0076d50eec14" }
bevy_derive = { git = "https://github.com/bevyengine/bevy.git", rev = "a3d406dd497205253e34ace757ab0076d50eec14" }
bevy_macro_utils = { git = "https://github.com/bevyengine/bevy.git", rev = "a3d406dd497205253e34ace757ab0076d50eec14" }
bevy_render = { git = "https://github.com/cart/bevy.git", rev = "ab733198b8b59ec90194797f4a1d46a12043ebfc" }
bevy_derive = { git = "https://github.com/cart/bevy.git", rev = "ab733198b8b59ec90194797f4a1d46a12043ebfc" }
bevy_macro_utils = { git = "https://github.com/cart/bevy.git", rev = "ab733198b8b59ec90194797f4a1d46a12043ebfc" }
thiserror = "2.0"
serde = { version = "1", features = ["derive"] }
tracing-test = "0.2.5"
Expand Down
2 changes: 1 addition & 1 deletion bevy_editor_panes/bevy_3d_viewport/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ fn render_target_picking_passthrough(
pointer_id: pointer_id_from_entity(pane_root),
};

commands.send_event(event_copy);
commands.write_event(event_copy);
}
}
}
Expand Down
32 changes: 16 additions & 16 deletions bevy_widgets/bevy_scroll_box/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,13 @@ fn spawn_scroll_bar<'a>(
query_computed_node.get(handle_entity).unwrap().size().y
/ scrollbox_size
};
scrollbox.position.offset_y =
scrollbox.position.y =
-((norm_cursor_pos.y - norm_handle_size / 2.0) * content_size);
scrollbox.position.offset_y = scrollbox
scrollbox.position.y = scrollbox
.position
.offset_y
.y
.clamp(-(content_size - (norm_handle_size * content_size)), 0.0);
content_node.top = Val::Px(scrollbox.position.offset_y);
content_node.top = Val::Px(scrollbox.position.y);
}
ScrollBarHandleDirection::Horizontal => {
let content_size = content_computed.size().x;
Expand All @@ -218,13 +218,13 @@ fn spawn_scroll_bar<'a>(
query_computed_node.get(handle_entity).unwrap().size().x
/ scrollbox_size
};
scrollbox.position.offset_x =
scrollbox.position.x =
-((norm_cursor_pos.x - norm_handle_size / 2.0) * content_size);
scrollbox.position.offset_x = scrollbox
scrollbox.position.x = scrollbox
.position
.offset_x
.x
.clamp(-(content_size - (norm_handle_size * content_size)), 0.0);
content_node.left = Val::Px(scrollbox.position.offset_x);
content_node.left = Val::Px(scrollbox.position.x);
}
}
}
Expand Down Expand Up @@ -264,12 +264,12 @@ fn on_scroll(

if keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight) {
let max_scroll = (content_sizes.x - scrollbox_sizes.x).max(0.0);
scrollbox.position.offset_x =
(scrollbox.position.offset_x + scroll_delta).clamp(-max_scroll, 0.0);
scrollbox.position.x =
(scrollbox.position.x + scroll_delta).clamp(-max_scroll, 0.0);
} else {
let max_scroll = (content_sizes.y - scrollbox_sizes.y).max(0.);
scrollbox.position.offset_y =
(scrollbox.position.offset_y + scroll_delta).clamp(-max_scroll, 0.0);
scrollbox.position.y =
(scrollbox.position.y + scroll_delta).clamp(-max_scroll, 0.0);
}

return; // We only want to scroll 1 ScrollBox
Expand All @@ -287,15 +287,15 @@ fn update_scroll_box(
.first()
.expect("Scrollbox children 0 should be a ScrollBoxContent");
let mut content_node = query_node.get_mut(*scroll_content).unwrap();
content_node.top = Val::Px(scrollbox.position.offset_y);
content_node.top = Val::Px(scrollbox.position.y);
}

if scrollbox.overflow.x == OverflowAxis::Scroll {
let scroll_content = children
.first()
.expect("Scrollbox children 0 should be a ScrollBoxContent");
let mut content_node = query_node.get_mut(*scroll_content).unwrap();
content_node.left = Val::Px(scrollbox.position.offset_x);
content_node.left = Val::Px(scrollbox.position.x);
}
}
}
Expand Down Expand Up @@ -329,7 +329,7 @@ fn update_scroll_bars(
(100.0, 0.0)
} else {
let height = (scrollbox_height / content_height * 100.0).clamp(5.0, 100.0);
let pos = (-scrollbox.position.offset_y / content_height * 100.0).clamp(0.0, 100.0);
let pos = (-scrollbox.position.y / content_height * 100.0).clamp(0.0, 100.0);
(height, pos)
};

Expand Down Expand Up @@ -370,7 +370,7 @@ fn update_scroll_bars(
(100.0, 0.0)
} else {
let width = (scrollbox_width / content_width * 100.0).clamp(5.0, 100.0);
let pos = (-scrollbox.position.offset_x / content_width * 100.0).clamp(0.0, 100.0);
let pos = (-scrollbox.position.x / content_width * 100.0).clamp(0.0, 100.0);
(width, pos)
};

Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_editor_cam/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bevy.workspace = true
bevy_derive.workspace = true

[dev-dependencies]
bevy = { workspace = true, features = ["jpeg", "ktx2", "zstd"] }
bevy = { workspace = true, features = ["jpeg", "ktx2", "zstd_rust"] }
rand = "0.8"

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_editor_cam/src/extensions/independent_skybox.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl IndependentSkybox {
impl Default for IndependentSkybox {
fn default() -> Self {
Self {
skybox: Default::default(),
skybox: Handle::default(),
brightness: 500.0,
skybox_cam_order_offset: -1_000,
fov: Default::default(),
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_editor_core/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn on_release(
},
);
commands.trigger_targets(event.clone(), trigger.target());
commands.send_event(event);
commands.write_event(event);
}
}

Expand Down
8 changes: 4 additions & 4 deletions crates/bevy_infinite_grid/src/render/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::borrow::Cow;

use bevy::{
asset::{load_internal_asset, weak_handle},
asset::{load_internal_asset, uuid_handle},
core_pipeline::{core_2d::Transparent2d, core_3d::Transparent3d},
ecs::{
query::ROQueryItem,
Expand Down Expand Up @@ -37,7 +37,7 @@ use bevy::{

use crate::InfiniteGridSettings;

const GRID_SHADER_HANDLE: Handle<Shader> = weak_handle!("7cd38dd1-d707-481e-b38c-0eccb706e629");
const GRID_SHADER_HANDLE: Handle<Shader> = uuid_handle!("7cd38dd1-d707-481e-b38c-0eccb706e629");

pub fn render_app_builder(app: &mut App) {
load_internal_asset!(app, GRID_SHADER_HANDLE, "grid.wgsl", Shader::from_wgsl);
Expand Down Expand Up @@ -531,7 +531,7 @@ impl SpecializedRenderPipeline for InfiniteGridPipeline {
vertex: VertexState {
shader: GRID_SHADER_HANDLE,
shader_defs: vec![],
entry_point: Cow::Borrowed("vertex"),
entry_point: Some(Cow::Borrowed("vertex")),
buffers: vec![],
},
primitive: PrimitiveState {
Expand Down Expand Up @@ -567,7 +567,7 @@ impl SpecializedRenderPipeline for InfiniteGridPipeline {
fragment: Some(FragmentState {
shader: GRID_SHADER_HANDLE,
shader_defs: vec![],
entry_point: Cow::Borrowed("fragment"),
entry_point: Some(Cow::Borrowed("fragment")),
targets: vec![Some(ColorTargetState {
format,
blend: Some(BlendState::ALPHA_BLENDING),
Expand Down
6 changes: 4 additions & 2 deletions crates/bevy_proto_bsn/examples/bsn_edit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use bevy::prelude::*;
use bevy_proto_bsn::*;

#[derive(Resource, Default)]
#[derive(Resource)]
struct EditorState {
bsn: Handle<Bsn>,
}
Expand All @@ -21,7 +21,9 @@ fn main() {
.add_plugins(DefaultPlugins)
.add_plugins(BsnPlugin)
.register_type::<Counter>()
.init_resource::<EditorState>()
.insert_resource(EditorState {
bsn: Handle::default(),
})
.add_systems(
Startup,
|mut commands: Commands,
Expand Down
11 changes: 1 addition & 10 deletions crates/bevy_proto_bsn/src/construct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ use alloc::borrow::Cow;
use bevy::{
ecs::{
bundle::{BundleFromComponents, DynamicBundle},
component::{
ComponentId, Components, ComponentsRegistrator, RequiredComponents, StorageType,
},
component::{ComponentId, Components, ComponentsRegistrator, StorageType},
system::EntityCommands,
world::error::EntityMutableFetchError,
},
Expand Down Expand Up @@ -195,13 +193,6 @@ unsafe impl<B: Bundle> Bundle for ConstructTuple<B> {
B::component_ids(components, ids);
}

fn register_required_components(
components: &mut ComponentsRegistrator,
required_components: &mut RequiredComponents,
) {
B::register_required_components(components, required_components);
}

fn get_component_ids(components: &Components, ids: &mut impl FnMut(Option<ComponentId>)) {
B::get_component_ids(components, ids);
}
Expand Down
6 changes: 3 additions & 3 deletions crates/bevy_proto_bsn/src/construct_reflect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::pbr::RenderVisibleMeshEntities, ReflectConstruct>();
app.register_type_data::<bevy::pbr::VisibleMeshEntities, ReflectConstruct>();
app.register_type_data::<bevy::pbr::DistanceFog, ReflectConstruct>();
app.register_type_data::<bevy::pbr::environment_map::EnvironmentMapLight, ReflectConstruct>();
app.register_type_data::<bevy::prelude::EnvironmentMapLight, ReflectConstruct>();
app.register_type_data::<bevy::pbr::irradiance_volume::IrradianceVolume, ReflectConstruct>();
app.register_type_data::<bevy::pbr::LightProbe, ReflectConstruct>();
app.register_type_data::<bevy::pbr::AmbientLight, ReflectConstruct>();
Expand Down Expand Up @@ -240,7 +240,7 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::ui::BorderColor, ReflectConstruct>();
app.register_type_data::<bevy::ui::BorderRadius, ReflectConstruct>();
app.register_type_data::<bevy::ui::BoxShadow, ReflectConstruct>();
app.register_type_data::<bevy::ui::BoxShadowSamples, ReflectConstruct>();
app.register_type_data::<bevy::ui_render::BoxShadowSamples, ReflectConstruct>();
app.register_type_data::<bevy::ui::CalculatedClip, ReflectConstruct>();
app.register_type_data::<bevy::ui::ComputedNode, ReflectConstruct>();
app.register_type::<bevy::ui::ComputedNodeTarget>();
Expand All @@ -252,7 +252,7 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::ui::Node, ReflectConstruct>();
app.register_type_data::<bevy::ui::Outline, ReflectConstruct>();
app.register_type_data::<bevy::ui::ScrollPosition, ReflectConstruct>();
app.register_type_data::<bevy::ui::TextShadow, ReflectConstruct>();
app.register_type_data::<bevy::ui::widget::TextShadow, ReflectConstruct>();
app.register_type::<bevy::ui::UiTransform>();
app.register_type::<bevy::ui::UiGlobalTransform>();
app.register_type_data::<bevy::ui::ZIndex, ReflectConstruct>();
Expand Down
27 changes: 12 additions & 15 deletions crates/bevy_undo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ impl<T: Component + Reflect + FromReflect> EditorChange for ReflectedComponentCh
.entity_mut(e)
.insert(<T as FromReflect>::from_reflect(&self.old_value).unwrap())
.insert(OneFrameUndoIgnore::default());
world.send_event(UndoRedoApplied::<T> {
world.write_event(UndoRedoApplied::<T> {
entity: e,
_phantom: std::marker::PhantomData,
});
Expand Down Expand Up @@ -794,7 +794,7 @@ impl<T: Component + Reflect + FromReflect> EditorChange for ReflectedAddedCompon
.resource_mut::<UndoIgnoreStorage>()
.storage
.insert(dst, OneFrameUndoIgnore::default());
world.send_event(UndoRedoApplied::<T> {
world.write_event(UndoRedoApplied::<T> {
entity: dst,
_phantom: std::marker::PhantomData,
});
Expand Down Expand Up @@ -915,7 +915,7 @@ impl<T: Component + Reflect + FromReflect> EditorChange for ReflectedRemovedComp
.entity_mut(dst)
.insert(<T as FromReflect>::from_reflect(&self.old_value).unwrap())
.insert(OneFrameUndoIgnore::default());
world.send_event(UndoRedoApplied::<T> {
world.write_event(UndoRedoApplied::<T> {
entity: dst,
_phantom: std::marker::PhantomData,
});
Expand Down Expand Up @@ -1261,11 +1261,8 @@ fn apply_for_every_typed_field<D: Reflect + TypePath>(
);
}
}
bevy::reflect::ReflectMut::Map(s) => {
for field_idx in 0..s.len() {
let (_key, value) = s.get_at_mut(field_idx).unwrap();
apply_for_every_typed_field(value, applyer, max_recursion - 1);
}
bevy::reflect::ReflectMut::Map(_s) => {
unimplemented!("See: https://github.com/bevyengine/bevy/pull/19802");
}
bevy::reflect::ReflectMut::Enum(s) => {
for field_idx in 0..s.field_len() {
Expand Down Expand Up @@ -1535,7 +1532,7 @@ mod tests {
app.update();

let test_id = app.world_mut().spawn_empty().id();
app.world_mut().send_event(NewChange {
app.world_mut().write_event(NewChange {
change: Arc::new(AddedEntity { entity: test_id }),
});

Expand All @@ -1560,7 +1557,7 @@ mod tests {

assert!(app.world_mut().get_entity(test_id).is_ok());

app.world_mut().send_event(UndoRedo::Undo);
app.world_mut().write_event(UndoRedo::Undo);

app.update();
app.update();
Expand All @@ -1572,7 +1569,7 @@ mod tests {
assert!(app.world_mut().get::<Name>(test_id).is_none());
assert!(app.world_mut().get_entity(test_id).is_ok());

app.world_mut().send_event(UndoRedo::Undo);
app.world_mut().write_event(UndoRedo::Undo);
app.update();
app.update();

Expand All @@ -1589,10 +1586,10 @@ mod tests {
let test_id_1 = app.world_mut().spawn(UndoMarker).id();
let test_id_2 = app.world_mut().spawn(UndoMarker).id();

app.world_mut().send_event(NewChange {
app.world_mut().write_event(NewChange {
change: Arc::new(AddedEntity { entity: test_id_1 }),
});
app.world_mut().send_event(NewChange {
app.world_mut().write_event(NewChange {
change: Arc::new(AddedEntity { entity: test_id_2 }),
});

Expand All @@ -1606,14 +1603,14 @@ mod tests {
app.cleanup();

app.world_mut().entity_mut(test_id_1).despawn();
app.world_mut().send_event(NewChange {
app.world_mut().write_event(NewChange {
change: Arc::new(RemovedEntity { entity: test_id_1 }),
});

app.update();
app.update();

app.world_mut().send_event(UndoRedo::Undo);
app.world_mut().write_event(UndoRedo::Undo);

app.update();
app.update();
Expand Down