@@ -60,11 +60,8 @@ fn setup(
60
60
mut materials : ResMut < Assets < StandardMaterial > > ,
61
61
) {
62
62
commands. spawn ( (
63
- Camera3dBundle {
64
- transform : Transform :: from_xyz ( 2.0 , 6.0 , 6.0 )
65
- . looking_at ( Vec3 :: new ( 0.0 , 0.0 , 0.0 ) , Vec3 :: Y ) ,
66
- ..default ( )
67
- } ,
63
+ Camera3d :: default ( ) ,
64
+ Transform :: from_xyz ( 2.0 , 6.0 , 6.0 ) . looking_at ( Vec3 :: new ( 0.0 , 0.0 , 0.0 ) , Vec3 :: Y ) ,
68
65
PanOrbitCamera :: default ( ) ,
69
66
EnvironmentMapLight {
70
67
diffuse_map : asset_server. load ( "environment_maps/pisa_diffuse_rgb9e5_zstd.ktx2" ) ,
@@ -74,32 +71,29 @@ fn setup(
74
71
} ,
75
72
) ) ;
76
73
77
- commands. spawn ( DirectionalLightBundle {
78
- directional_light : DirectionalLight {
74
+ commands. spawn ( (
75
+ DirectionalLight {
79
76
shadows_enabled : true ,
80
77
..default ( )
81
78
} ,
82
- cascade_shadow_config : CascadeShadowConfigBuilder {
79
+ CascadeShadowConfigBuilder {
83
80
num_cascades : 1 ,
84
81
maximum_distance : 1.6 ,
85
82
..default ( )
86
- }
87
- . into ( ) ,
88
- ..default ( )
89
- } ) ;
83
+ } . build ( ) ,
84
+ ) ) ;
90
85
91
86
// ground plane
92
- commands. spawn ( PbrBundle {
93
- mesh : meshes. add ( Plane3d :: default ( ) . mesh ( ) . size ( 50.0 , 50.0 ) ) ,
94
- material : materials. add ( StandardMaterial {
87
+ commands. spawn ( (
88
+ Mesh3d ( meshes. add ( Plane3d :: default ( ) . mesh ( ) . size ( 50.0 , 50.0 ) ) ) ,
89
+ MeshMaterial3d ( materials. add ( StandardMaterial {
95
90
base_color : Color :: BLACK ,
96
91
perceptual_roughness : 1.0 ,
97
92
double_sided : false ,
98
93
unlit : true ,
99
94
..default ( )
100
- } ) ,
101
- ..default ( )
102
- } ) ;
95
+ } ) ) ,
96
+ ) ) ;
103
97
}
104
98
105
99
// Loads our knight into the asset server, it isn't spawned.
@@ -128,16 +122,12 @@ fn spawn_knight(
128
122
let as_custom_mat = AuraMaterial { inner : 0.0 } ;
129
123
130
124
commands
131
- . spawn ( SceneBundle {
132
- scene : gltf. scenes [ 0 ] . clone ( ) ,
133
- ..Default :: default ( )
134
- } )
125
+ . spawn ( SceneRoot ( gltf. scenes [ 0 ] . clone ( ) ) )
135
126
. with_children ( |parent| {
136
- parent. spawn ( MaterialMeshBundle {
137
- mesh : meshes. add ( disc) ,
138
- material : materials. add ( as_custom_mat) ,
139
- ..default ( )
140
- } ) ;
127
+ parent. spawn ( (
128
+ Mesh3d ( meshes. add ( disc) ) ,
129
+ MeshMaterial3d ( materials. add ( as_custom_mat) ) ,
130
+ ) ) ;
141
131
} ) ;
142
132
143
133
was_loaded. 0 = true ;
@@ -155,7 +145,7 @@ fn animate_light_direction(
155
145
transform. rotation = Quat :: from_euler (
156
146
EulerRot :: ZYX ,
157
147
0.0 ,
158
- time. elapsed_seconds ( ) * PI / 5.0 ,
148
+ time. elapsed_secs ( ) * PI / 5.0 ,
159
149
-FRAC_PI_4 ,
160
150
) ;
161
151
}
@@ -186,3 +176,4 @@ fn quit_listener(input: Res<ButtonInput<KeyCode>>) {
186
176
std:: process:: exit ( 0 )
187
177
}
188
178
}
179
+
0 commit comments