Skip to content

Commit fa782cf

Browse files
SUPERCILEXSUPERCILEX
authored
Slightly modernize codebase (djeedai#26)
1 parent ab1e792 commit fa782cf

File tree

13 files changed

+233
-316
lines changed

13 files changed

+233
-316
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ target/
22
Cargo.lock
33

44
.vs*
5-
.DS_Store
5+
.DS_Store
6+
.idea

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ commands
7474
sprite: Sprite {
7575
color: Color::RED,
7676
custom_size: Some(Vec2::new(size, size)),
77-
..Default::default()
77+
..default()
7878
},
79-
..Default::default()
79+
..default()
8080
})
8181
// Add an Animator component to control and execute the animation.
8282
.insert(Animator::new(tween));

‎examples/colormaterial_color.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,19 @@ use bevy::{
55
use bevy_tweening::{lens::*, *};
66
use std::time::Duration;
77

8-
fn main() -> Result<(), Box<dyn std::error::Error>> {
8+
fn main() {
99
App::default()
1010
.insert_resource(WindowDescriptor {
1111
title: "ColorMaterialColorLens".to_string(),
1212
width: 1200.,
1313
height: 600.,
1414
present_mode: bevy::window::PresentMode::Fifo, // vsync
15-
..Default::default()
15+
..default()
1616
})
1717
.add_plugins(DefaultPlugins)
1818
.add_plugin(TweeningPlugin)
1919
.add_startup_system(setup)
2020
.run();
21-
22-
Ok(())
2321
}
2422

2523
fn setup(
@@ -93,7 +91,7 @@ fn setup(
9391
transform: Transform::from_translation(Vec3::new(x, y, 0.))
9492
.with_scale(Vec3::splat(size)),
9593
material: unique_material.clone(),
96-
..Default::default()
94+
..default()
9795
})
9896
.insert(AssetAnimator::new(unique_material.clone(), tween));
9997
y -= size * spacing;

‎examples/menu.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@ use bevy_inspector_egui::WorldInspectorPlugin;
33
use bevy_tweening::{lens::*, *};
44
use std::time::Duration;
55

6-
fn main() -> Result<(), Box<dyn std::error::Error>> {
6+
fn main() {
77
App::default()
88
.insert_resource(WindowDescriptor {
99
title: "Menu".to_string(),
1010
width: 800.,
1111
height: 400.,
1212
present_mode: bevy::window::PresentMode::Fifo, // vsync
13-
..Default::default()
13+
..default()
1414
})
1515
.add_plugins(DefaultPlugins)
1616
.add_plugin(TweeningPlugin)
1717
.add_plugin(WorldInspectorPlugin::new())
1818
.add_startup_system(setup)
1919
.run();
20-
21-
Ok(())
2220
}
2321

2422
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
@@ -38,10 +36,10 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
3836
align_items: AlignItems::Center,
3937
align_self: AlignSelf::Center,
4038
justify_content: JustifyContent::Center,
41-
..Default::default()
39+
..default()
4240
},
4341
color: UiColor(Color::NONE),
44-
..Default::default()
42+
..default()
4543
})
4644
.insert(Name::new("menu"))
4745
.id();
@@ -73,11 +71,11 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
7371
align_items: AlignItems::Center,
7472
align_self: AlignSelf::Center,
7573
justify_content: JustifyContent::Center,
76-
..Default::default()
74+
..default()
7775
},
7876
color: UiColor(Color::rgb_u8(162, 226, 95)),
7977
transform: Transform::from_scale(Vec3::splat(0.01)),
80-
..Default::default()
78+
..default()
8179
})
8280
.insert(Name::new(format!("button:{}", text)))
8381
.insert(Parent(container))
@@ -96,7 +94,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
9694
horizontal: HorizontalAlign::Center,
9795
},
9896
),
99-
..Default::default()
97+
..default()
10098
});
10199
});
102100
}

‎examples/sequence.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@ use bevy::prelude::*;
22
use bevy_tweening::{lens::*, *};
33
use std::time::Duration;
44

5-
fn main() -> Result<(), Box<dyn std::error::Error>> {
5+
fn main() {
66
App::default()
77
.insert_resource(WindowDescriptor {
88
title: "Sequence".to_string(),
99
width: 600.,
1010
height: 600.,
1111
present_mode: bevy::window::PresentMode::Fifo, // vsync
12-
..Default::default()
12+
..default()
1313
})
1414
.add_plugins(DefaultPlugins)
1515
.add_plugin(TweeningPlugin)
1616
.add_startup_system(setup)
1717
.add_system(update_text)
1818
.run();
19-
20-
Ok(())
2119
}
2220

2321
#[derive(Component)]
@@ -69,7 +67,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
6967
alignment: text_alignment,
7068
},
7169
transform: Transform::from_translation(Vec3::new(0., 40., 0.)),
72-
..Default::default()
70+
..default()
7371
})
7472
.insert(RedProgress);
7573

@@ -90,7 +88,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
9088
alignment: text_alignment,
9189
},
9290
transform: Transform::from_translation(Vec3::new(0., -40., 0.)),
93-
..Default::default()
91+
..default()
9492
})
9593
.insert(BlueProgress);
9694

@@ -128,9 +126,9 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
128126
sprite: Sprite {
129127
color: Color::RED,
130128
custom_size: Some(Vec2::new(size, size)),
131-
..Default::default()
129+
..default()
132130
},
133-
..Default::default()
131+
..default()
134132
})
135133
.insert(RedSprite)
136134
.insert(Animator::new(seq));
@@ -179,7 +177,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
179177
sprite: Sprite {
180178
color: Color::BLUE,
181179
custom_size: Some(Vec2::new(size * 3., size)),
182-
..Default::default()
180+
..default()
183181
},
184182
..Default::default()
185183
})

‎examples/sprite_color.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
use bevy::prelude::*;
22
use bevy_tweening::{lens::*, *};
33

4-
fn main() -> Result<(), Box<dyn std::error::Error>> {
4+
fn main() {
55
App::default()
66
.insert_resource(WindowDescriptor {
77
title: "SpriteColorLens".to_string(),
88
width: 1200.,
99
height: 600.,
1010
present_mode: bevy::window::PresentMode::Fifo, // vsync
11-
..Default::default()
11+
..default()
1212
})
1313
.add_plugins(DefaultPlugins)
1414
.add_plugin(TweeningPlugin)
1515
.add_startup_system(setup)
1616
.run();
17-
18-
Ok(())
1917
}
2018

2119
fn setup(mut commands: Commands) {
@@ -77,9 +75,9 @@ fn setup(mut commands: Commands) {
7775
sprite: Sprite {
7876
color: Color::BLACK,
7977
custom_size: Some(Vec2::new(size, size)),
80-
..Default::default()
78+
..default()
8179
},
82-
..Default::default()
80+
..default()
8381
})
8482
.insert(Animator::new(tween));
8583

‎examples/text_color.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@ use bevy_tweening::{lens::*, *};
44
const WIDTH: f32 = 1200.;
55
const HEIGHT: f32 = 600.;
66

7-
fn main() -> Result<(), Box<dyn std::error::Error>> {
7+
fn main() {
88
App::default()
99
.insert_resource(WindowDescriptor {
1010
title: "TextColorLens".to_string(),
1111
width: WIDTH,
1212
height: HEIGHT,
1313
present_mode: bevy::window::PresentMode::Fifo, // vsync
14-
..Default::default()
14+
..default()
1515
})
1616
.add_plugins(DefaultPlugins)
1717
.add_plugin(TweeningPlugin)
1818
.add_startup_system(setup)
1919
.run();
20-
21-
Ok(())
2220
}
2321

2422
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
@@ -94,7 +92,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
9492
align_items: AlignItems::Center,
9593
align_self: AlignSelf::Center,
9694
justify_content: JustifyContent::Center,
97-
..Default::default()
95+
..default()
9896
},
9997
text: Text::with_section(
10098
*ease_name,
@@ -104,9 +102,9 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
104102
color: Color::WHITE,
105103
},
106104
// you can still use Default
107-
Default::default(),
105+
default(),
108106
),
109-
..Default::default()
107+
..default()
110108
})
111109
.insert(Animator::new(tween));
112110

‎examples/transform_rotation.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn main() {
1010
width: 1400.,
1111
height: 600.,
1212
present_mode: bevy::window::PresentMode::Fifo, // vsync
13-
..Default::default()
13+
..default()
1414
})
1515
.add_plugins(DefaultPlugins)
1616
.add_plugin(TweeningPlugin)
@@ -96,9 +96,9 @@ fn setup(mut commands: Commands) {
9696
sprite: Sprite {
9797
color: Color::RED,
9898
custom_size: Some(Vec2::new(size, size * 0.5)),
99-
..Default::default()
99+
..default()
100100
},
101-
..Default::default()
101+
..default()
102102
})
103103
.insert(Animator::new(tween));
104104
});

‎examples/transform_translation.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn main() {
1010
width: 1400.,
1111
height: 600.,
1212
present_mode: bevy::window::PresentMode::Fifo, // vsync
13-
..Default::default()
13+
..default()
1414
})
1515
.add_plugins(DefaultPlugins)
1616
.add_plugin(TweeningPlugin)
@@ -89,9 +89,9 @@ fn setup(mut commands: Commands) {
8989
sprite: Sprite {
9090
color: Color::RED,
9191
custom_size: Some(Vec2::new(size, size)),
92-
..Default::default()
92+
..default()
9393
},
94-
..Default::default()
94+
..default()
9595
})
9696
.insert(Animator::new(tween));
9797

‎examples/ui_position.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn main() {
1010
width: 1400.,
1111
height: 600.,
1212
present_mode: bevy::window::PresentMode::Fifo, // vsync
13-
..Default::default()
13+
..default()
1414
})
1515
.add_plugins(DefaultPlugins)
1616
.add_plugin(TweeningPlugin)
@@ -109,10 +109,10 @@ fn setup(mut commands: Commands) {
109109
align_items: AlignItems::Center,
110110
align_self: AlignSelf::Center,
111111
justify_content: JustifyContent::Center,
112-
..Default::default()
112+
..default()
113113
},
114114
color: UiColor(Color::RED),
115-
..Default::default()
115+
..default()
116116
})
117117
.insert(Animator::new(tween));
118118

0 commit comments

Comments
 (0)