Skip to content

Commit 80d2ae0

Browse files
IDEDARYIDEDARY
committed
Updated to 0.18
1 parent a178650 commit 80d2ae0

13 files changed

Lines changed: 99 additions & 108 deletions

File tree

‎Cargo.toml‎

Lines changed: 45 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,40 @@
22
#=== WORKSPACE INFO ===#
33

44
[workspace]
5-
resolver = "2"
5+
exclude = [".gitattributes", ".github", ".gitignore", ".vscode", "docs/*", "promo/*"]
66
members = ["crate", "examples/*"]
7-
exclude = [".github", ".vscode", "docs/*", "promo/*", ".gitattributes", ".gitignore"]
7+
resolver = "2"
88

99
[workspace.package]
1010
authors = ["IDEDARY"]
11-
version = "0.5.0"
11+
categories = ["game-development", "gui", "mathematics"]
1212
edition = "2024"
13+
keywords = ["bevy", "bevy-lunex", "layout", "lunex", "ui"]
1314
license = "MIT OR Apache-2.0"
1415
repository = "https://github.com/bytestring-net/bevy-lunex"
15-
keywords = ["ui", "layout", "bevy", "lunex", "bevy-lunex"]
16-
categories = ["gui", "mathematics", "game-development"]
16+
version = "0.6.0"
1717

18-
#========================#
19-
#=== PROFILE SETTINGS ===#
18+
#========================#
19+
#=== PROFILE SETTINGS ===#
2020

2121
[profile.dev]
22-
debug = 0
23-
strip = "debuginfo"
22+
debug = 0
2423
opt-level = 1
24+
strip = "debuginfo"
2525

2626
[profile.dev.package."*"]
2727
opt-level = 3
2828

2929
[profile.release]
30-
opt-level = 3
31-
panic = 'abort'
32-
debug = 0
33-
strip = true
34-
lto = "thin"
3530
codegen-units = 1
31+
debug = 0
32+
lto = "thin"
33+
opt-level = 3
34+
panic = 'abort'
35+
strip = true
3636

37-
#===============================#
38-
#=== DEPENDENCIES & FEATURES ===#
37+
#===============================#
38+
#=== DEPENDENCIES & FEATURES ===#
3939

4040
[workspace.dependencies]
4141

@@ -46,49 +46,41 @@
4646
#=== GAME ENGINE SOURCE === #
4747

4848
## GAME ENGINE
49-
bevy_asset = { version = "^0.17.0", default-features = false }
50-
bevy_app = { version = "^0.17.0", default-features = false }
51-
bevy_color = { version = "^0.17.0", default-features = false }
52-
bevy_ecs = { version = "^0.17.0", default-features = false }
53-
bevy_math = { version = "^0.17.0", default-features = false }
54-
bevy_mesh = { version = "^0.17.0", default-features = false }
55-
bevy_text = { version = "^0.17.0", default-features = false }
56-
bevy_sprite = { version = "^0.17.0", default-features = false, features = [
57-
"bevy_text",
58-
] }
59-
bevy_sprite_render = { version = "^0.17.0", default-features = false }
60-
bevy_image = { version = "^0.17.0", default-features = false }
61-
bevy_render = { version = "^0.17.0", default-features = false }
62-
bevy_camera = { version = "^0.17.0", default-features = false }
63-
bevy_platform = { version = "^0.17.0", default-features = false }
64-
bevy_reflect = { version = "^0.17.0", default-features = false, features = [
65-
"functions",
66-
] }
67-
bevy_transform = { version = "^0.17.0", default-features = false }
68-
bevy_log = { version = "^0.17.0", default-features = false }
69-
bevy_gizmos = { version = "^0.17.0", default-features = false, features = [
70-
"bevy_render",
71-
] }
72-
bevy_window = { version = "^0.17.0", default-features = false }
73-
bevy_picking = { version = "^0.17.0", default-features = false }
74-
bevy_input = { version = "^0.17.0", default-features = false }
75-
bevy_time = { version = "^0.17.0", default-features = false }
76-
bevy_pbr = { version = "^0.17.0", default-features = false }
77-
bevy_winit = { version = "^0.17.0", default-features = false, features = [
78-
"custom_cursor",
79-
] }
80-
bevy_derive = { version = "^0.17.0", default-features = false }
81-
cosmic-text = { version = "0.14", features = ["shape-run-cache"] }
49+
bevy_app = { version = "0.18", default-features = false }
50+
bevy_asset = { version = "0.18", default-features = false }
51+
bevy_camera = { version = "0.18", default-features = false }
52+
bevy_color = { version = "0.18", default-features = false }
53+
bevy_derive = { version = "0.18", default-features = false }
54+
bevy_ecs = { version = "0.18", default-features = false }
55+
bevy_gizmos = { version = "0.18", default-features = false }
56+
bevy_image = { version = "0.18", default-features = false }
57+
bevy_input = { version = "0.18", default-features = false }
58+
bevy_log = { version = "0.18", default-features = false }
59+
bevy_math = { version = "0.18", default-features = false }
60+
bevy_mesh = { version = "0.18", default-features = false }
61+
bevy_pbr = { version = "0.18", default-features = false }
62+
bevy_picking = { version = "0.18", default-features = false }
63+
bevy_platform = { version = "0.18", default-features = false }
64+
bevy_reflect = { version = "0.18", default-features = false, features = ["functions"] }
65+
bevy_render = { version = "0.18", default-features = false }
66+
bevy_sprite = { version = "0.18", default-features = false, features = ["bevy_text"] }
67+
bevy_sprite_render = { version = "0.18", default-features = false }
68+
bevy_text = { version = "0.18", default-features = false }
69+
bevy_time = { version = "0.18", default-features = false }
70+
bevy_transform = { version = "0.18", default-features = false }
71+
bevy_window = { version = "0.18", default-features = false }
72+
bevy_winit = { version = "0.18", default-features = false, features = ["custom_cursor"] }
73+
cosmic-text = { version = "0.16", features = ["shape-run-cache"] }
8274

8375
#===============================#
8476
#=== GAME ENGINE EXTENSIONS === #
8577

86-
bevy_rich_text3d = { version = "^0.5" }
78+
bevy_rich_text3d = { version = "^0.6" }
8779

8880
#===========================#
8981
#=== RUST MISCELLANEOUS === #
90-
82+
83+
colored = { version = "^3.1.1" }
84+
getrandom = { version = "^0.3.3", features = ["wasm_js"] }
9185
radsort = { version = "^0.1.1" }
92-
colored = { version = "^3.0.0" }
9386
rand = { version = "^0.9.1" }
94-
getrandom = { version = "^0.3.3", features = ["wasm_js"]}

‎crate/src/lib.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,8 @@ impl ImageTextureConstructor for Image {}
163163
/// Provides utility costructor methods for [`Camera`]
164164
pub trait CameraTextureRenderConstructor {
165165
/// Just a utility constructor for camera that renders to a transparent texture
166-
fn clear_render_to(handle: Handle<Image>) -> Camera {
167-
use bevy_camera::RenderTarget;
166+
fn clear_render() -> Camera {
168167
Camera {
169-
target: RenderTarget::Image(handle.into()),
170168
clear_color: ClearColorConfig::Custom(Color::srgba(0.0, 0.0, 0.0, 0.0)),
171169
..Default::default()
172170
}

‎crate/src/picking.rs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use bevy_camera::RenderTarget;
12
use bevy_math::FloatExt;
23
use bevy_window::PrimaryWindow;
34
use bevy_picking::backend::prelude::*;
@@ -30,6 +31,7 @@ fn lunex_2d_picking(
3031
cameras: Query<(
3132
Entity,
3233
&Camera,
34+
&RenderTarget,
3335
&GlobalTransform,
3436
&Projection,
3537
)>,
@@ -64,16 +66,15 @@ fn lunex_2d_picking(
6466
pointer_location.location().map(|loc| (pointer, loc))
6567
}) {
6668
let mut blocked = false;
67-
let Some((cam_entity, camera, cam_transform, Projection::Orthographic(cam_ortho))) =
69+
let Some((cam_entity, camera, _, cam_transform, Projection::Orthographic(cam_ortho))) =
6870
cameras
6971
.iter()
70-
.filter(|(_, camera, _, _)| {
72+
.filter(|(_, camera, _, _, _)| {
7173
camera.is_active
7274
})
73-
.find(|(_, camera, _, _)| {
75+
.find(|(_, _, target, _, _)| {
7476

75-
camera
76-
.target
77+
target
7778
.normalize(primary_window)
7879
.is_some_and(|x| x == location.target)
7980
})

‎crate/src/states.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ fn observer_event_duplicator<'a, E: EntityEvent + Copy>(trigger: On<E>, mut comm
216216
{
217217
if let Ok(children) = query.get_mut(trigger.event_target()) {
218218
for target in children.iter() {
219-
let mut child_event = *trigger.event();
220-
*child_event.event_target_mut() = target;
221-
commands.trigger(child_event);
219+
let child_event = *trigger.event();
220+
//*child_event.event_target() = target;
221+
commands.entity(target).trigger(|_| child_event);
222222
}
223223
}
224224
}

‎examples/color2d/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
#=== EXAMPLE INFO ===#
33

44
[package]
5-
name = "color2d"
65
authors.workspace = true
7-
version.workspace = true
86
edition.workspace = true
9-
publish = false
7+
name = "color2d"
8+
publish = false
9+
version.workspace = true
1010

11-
#===============================#
12-
#=== DEPENDENCIES & FEATURES ===#
11+
#===============================#
12+
#=== DEPENDENCIES & FEATURES ===#
1313

1414
[dependencies]
15-
bevy = { version = "^0.17.0", default-features = true }
15+
bevy = { version = "0.18", default-features = true }
1616
bevy_lunex = { workspace = true }

‎examples/dualcamera/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
#=== EXAMPLE INFO ===#
33

44
[package]
5-
name = "dualcamera"
65
authors.workspace = true
7-
version.workspace = true
86
edition.workspace = true
9-
publish = false
7+
name = "dualcamera"
8+
publish = false
9+
version.workspace = true
1010

11-
#===============================#
12-
#=== DEPENDENCIES & FEATURES ===#
11+
#===============================#
12+
#=== DEPENDENCIES & FEATURES ===#
1313

1414
[dependencies]
15-
bevy = { version = "^0.17.0", default-features = true }
15+
bevy = { version = "0.18", default-features = true }
1616
bevy_lunex = { workspace = true }

‎examples/dualcamera/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ fn spawn_cameras(
5151
commands.spawn((
5252
Camera3d::default(),
5353
// Configure the camera
54+
RenderTarget::Image(canvas.clone().into()),
5455
Camera {
55-
target: RenderTarget::Image(canvas.into()),
5656
clear_color: ClearColorConfig::Custom(Color::srgba(0.0, 0.0, 0.0, 0.5)),
5757
order: -1,
5858
..Default::default()

‎examples/mesh2d/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
#=== EXAMPLE INFO ===#
33

44
[package]
5-
name = "mesh2d"
65
authors.workspace = true
7-
version.workspace = true
86
edition.workspace = true
9-
publish = false
7+
name = "mesh2d"
8+
publish = false
9+
version.workspace = true
1010

11-
#===============================#
12-
#=== DEPENDENCIES & FEATURES ===#
11+
#===============================#
12+
#=== DEPENDENCIES & FEATURES ===#
1313

1414
[dependencies]
15-
bevy = { version = "^0.17.0", default-features = true }
15+
bevy = { version = "0.18", default-features = true }
1616
bevy_lunex = { workspace = true }

‎examples/pixelated_dualcamera/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
#=== EXAMPLE INFO ===#
33

44
[package]
5-
name = "pixelated_dualcamera"
65
authors.workspace = true
7-
version.workspace = true
86
edition.workspace = true
9-
publish = false
7+
name = "pixelated_dualcamera"
8+
publish = false
9+
version.workspace = true
1010

11-
#===============================#
12-
#=== DEPENDENCIES & FEATURES ===#
11+
#===============================#
12+
#=== DEPENDENCIES & FEATURES ===#
1313

1414
[dependencies]
15-
bevy = { version = "^0.17.0", default-features = true }
15+
bevy = { version = "0.18", default-features = true }
1616
bevy_lunex = { workspace = true }

‎examples/pixelated_dualcamera/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ fn spawn_cameras(
5353
commands.spawn((
5454
Camera3d::default(),
5555
// Configure the camera
56+
RenderTarget::Image(canvas.clone().into()),
5657
Camera {
57-
target: RenderTarget::Image(canvas.into()),
5858
clear_color: ClearColorConfig::Custom(Color::srgba(0.0, 0.0, 0.0, 0.5)),
5959
order: -1,
6060
..Default::default()

0 commit comments

Comments
 (0)