Skip to content

Commit dc50cac

Browse files
committed
Use const strings as node/camera names.
1 parent e33f279 commit dc50cac

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

examples/window/viewports.rs

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use bevy::{
33
prelude::*,
44
render::{
55
camera::{ActiveCameras, Camera},
6-
render_graph::{base::MainPass, CameraNode, PassNode, RenderGraph},
6+
render_graph::{base, CameraNode, PassNode, RenderGraph},
77
surface::{SideLocation, Viewport, ViewportDescriptor},
88
},
99
};
@@ -19,29 +19,35 @@ fn main() {
1919
.run();
2020
}
2121

22+
const FRONT_CAMERA: &str = "FrontView";
23+
const FRONT_CAMERA_NODE: &str = "front_view_camera";
24+
const SIDE_CAMERA: &str = "SideView";
25+
const SIDE_CAMERA_NODE: &str = "side_view_camera";
26+
2227
fn setup(
2328
commands: &mut Commands,
2429
mut active_cameras: ResMut<ActiveCameras>,
2530
mut render_graph: ResMut<RenderGraph>,
2631
asset_server: Res<AssetServer>,
2732
) {
2833
// add new camera nodes for the secondary viewports
29-
render_graph.add_system_node("front_view_camera", CameraNode::new("FrontView"));
30-
render_graph.add_system_node("side_view_camera", CameraNode::new("SideView"));
31-
active_cameras.add("FrontView");
32-
active_cameras.add("SideView");
34+
render_graph.add_system_node(FRONT_CAMERA_NODE, CameraNode::new(FRONT_CAMERA));
35+
render_graph.add_system_node(SIDE_CAMERA_NODE, CameraNode::new(SIDE_CAMERA));
36+
active_cameras.add(FRONT_CAMERA);
37+
active_cameras.add(SIDE_CAMERA);
3338

3439
// add the cameras to the main pass
3540
{
36-
let main_pass: &mut PassNode<&MainPass> = render_graph.get_node_mut("main_pass").unwrap();
37-
main_pass.add_camera("FrontView");
38-
main_pass.add_camera("SideView");
41+
let main_pass: &mut PassNode<&base::MainPass> =
42+
render_graph.get_node_mut(base::node::MAIN_PASS).unwrap();
43+
main_pass.add_camera(FRONT_CAMERA);
44+
main_pass.add_camera(SIDE_CAMERA);
3945
}
4046
render_graph
41-
.add_node_edge("front_view_camera", "main_pass")
47+
.add_node_edge(FRONT_CAMERA_NODE, base::node::MAIN_PASS)
4248
.unwrap();
4349
render_graph
44-
.add_node_edge("side_view_camera", "main_pass")
50+
.add_node_edge(SIDE_CAMERA_NODE, base::node::MAIN_PASS)
4551
.unwrap();
4652

4753
// SETUP SCENE
@@ -78,7 +84,7 @@ fn setup(
7884
// top right camera
7985
.spawn(PerspectiveCameraBundle {
8086
camera: Camera {
81-
name: Some("FrontView".to_string()),
87+
name: Some(FRONT_CAMERA.to_string()),
8288
..Default::default()
8389
},
8490
transform: Transform::from_xyz(0.0, 0.3, 1.3)
@@ -88,7 +94,7 @@ fn setup(
8894
// bottom right camera
8995
.spawn(PerspectiveCameraBundle {
9096
camera: Camera {
91-
name: Some("SideView".to_string()),
97+
name: Some(SIDE_CAMERA.to_string()),
9298
..Default::default()
9399
},
94100
transform: Transform::from_xyz(-1.3, 0.3, 0.0)
@@ -198,14 +204,14 @@ fn viewport_layout_system(
198204
Some("Camera3d") => {
199205
viewport.sides = layout.main_view();
200206
}
201-
Some("FrontView") => {
207+
Some(FRONT_CAMERA) => {
202208
if layout.invert {
203209
viewport.sides = layout.front_view_view();
204210
} else {
205211
viewport.sides = layout.side_view_view();
206212
}
207213
}
208-
Some("SideView") => {
214+
Some(SIDE_CAMERA) => {
209215
if layout.invert {
210216
viewport.sides = layout.side_view_view();
211217
} else {

0 commit comments

Comments
 (0)