Skip to content

Commit 31a2dbb

Browse files
committed
Other CI fixes
1 parent 215b67d commit 31a2dbb

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

crates/bevy_camera/src/camera.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ pub struct MainPassResolutionOverride(pub UVec2);
198198
///
199199
/// ```
200200
///
201-
/// See the "camera_sub_view" example for more information.
201+
/// See the `camera_sub_view` example for more information.
202202
///
203203
/// ## [`SubViewSourceProjection`]
204204
///
@@ -402,7 +402,7 @@ pub enum ViewportConversionError {
402402
#[error("computed coordinate beyond `Camera`'s far plane")]
403403
PastFarPlane,
404404
/// The Normalized Device Coordinates could not be computed because the `camera_transform`, the
405-
/// `world_position`, or the projection matrix defined by [`Projection`](super::projection::Projection)
405+
/// `world_position`, or the projection matrix defined by [`Projection`]
406406
/// contained `NAN` (see [`world_to_ndc`][Camera::world_to_ndc] and [`ndc_to_world`][Camera::ndc_to_world]).
407407
#[error("found NaN while computing NDC")]
408408
InvalidData,
@@ -572,7 +572,7 @@ impl Camera {
572572
.map(|t: &RenderTargetInfo| t.scale_factor)
573573
}
574574

575-
/// The projection matrix computed using this camera's [`Projection`](super::projection::Projection).
575+
/// The projection matrix computed using this camera's [`Projection`].
576576
#[inline]
577577
pub fn clip_from_view(&self) -> Mat4 {
578578
self.computed.clip_from_view
@@ -792,7 +792,7 @@ impl Camera {
792792
/// [`world_to_viewport`](Self::world_to_viewport).
793793
///
794794
/// Returns `None` if the `camera_transform`, the `world_position`, or the projection matrix defined by
795-
/// [`Projection`](super::projection::Projection) contain `NAN`.
795+
/// [`Projection`] contain `NAN`.
796796
///
797797
/// # Panics
798798
///
@@ -818,7 +818,7 @@ impl Camera {
818818
/// [`world_to_viewport`](Self::world_to_viewport).
819819
///
820820
/// Returns `None` if the `camera_transform`, the `world_position`, or the projection matrix defined by
821-
/// [`Projection`](super::projection::Projection) contain `NAN`.
821+
/// [`Projection`] contain `NAN`.
822822
///
823823
/// # Panics
824824
///

examples/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ Example | Description
164164
[Lighting](../examples/3d/lighting.rs) | Illustrates various lighting options in a simple scene
165165
[Lightmaps](../examples/3d/lightmaps.rs) | Rendering a scene with baked lightmaps
166166
[Lines](../examples/3d/lines.rs) | Create a custom material to draw 3d lines
167+
[Magnifier](../examples/usage/magnifier.rs) | Demonstrates magnifying part of the screen with CameraSubView
167168
[Manual Material Implementation](../examples/3d/manual_material.rs) | Demonstrates how to implement a material manually using the mid-level render APIs
168169
[Mesh Ray Cast](../examples/3d/mesh_ray_cast.rs) | Demonstrates ray casting with the `MeshRayCast` system parameter
169170
[Meshlet](../examples/3d/meshlet.rs) | Meshlet rendering for dense high-poly scenes (experimental)
@@ -594,7 +595,6 @@ Example | Description
594595
--- | ---
595596
[Context Menu](../examples/usage/context_menu.rs) | Example of a context menu
596597
[Cooldown](../examples/usage/cooldown.rs) | Example for cooldown on button clicks
597-
[Magnifier](../examples/usage/magnifier.rs) | Demonstrates magnifying part of the screen with CameraSubView
598598

599599
### Window
600600

examples/usage/magnifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ fn update_sub_view(
150150
let viewport_pos = cursor - viewport_half_size;
151151
viewport.physical_position = viewport_pos.as_uvec2();
152152

153-
// Normalise the position to the 0..1 range the sub view expects
153+
// Normalize the position to the 0..1 range the sub view expects
154154
let mut offset = cursor / window_size;
155155

156156
// A subview scale of 1.0 makes the full window image visible within the much smaller viewport (i.e. very "zoomed out").
@@ -166,7 +166,7 @@ fn update_sub_view(
166166
// is actually the projection of the other camera (that renders the background image).
167167
// This means we must ensure that at least one of the axes of the projections of both of these cameras is the same,
168168
// so that we get the correct result from specifying the fraction of the "full view" we want as the fraction that the sub view uses.
169-
// Fortunately, this is already the case for us, as both projections were initialised with all the same default parameters,
169+
// Fortunately, this is already the case for us, as both projections were initialized with all the same default parameters,
170170
// except the aspect ratio. The aspect ratio only affects the x axis, so we pick the y axis instead.
171171
let scale = size.y;
172172

0 commit comments

Comments
 (0)