Merge branch 'main' into implement_angle_type

hannobraun · May 23, 2022 · beb5736 · beb5736
2 parents 0b1384a + 0f3199d
commit beb5736
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/fj-viewer/src/graphics/transform.rs b/crates/fj-viewer/src/graphics/transform.rs
@@ -15,7 +15,8 @@ impl Transform {
     ///
     /// The returned transform is used for transforming vertices on the GPU.
     pub fn for_vertices(camera: &Camera, aspect_ratio: f64) -> Self {
-        let field_of_view_in_y = camera.field_of_view_in_x() / aspect_ratio;
+        let field_of_view_in_y = 2.
+            * ((camera.field_of_view_in_x() / 2.).tan() / aspect_ratio).atan();
 
         let transform = camera.camera_to_model().project_to_array(
             aspect_ratio,

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.60.0"
-components = [ "rustfmt", "clippy" ]
+channel = "1.61.0"
+components = ["rustfmt", "clippy"]
diff --git a/tools/release-operator/Cargo.toml b/tools/release-operator/Cargo.toml
@@ -12,7 +12,7 @@ cargo_metadata = "0.14.2"
 cmd_lib = "1.3.0"
 env_logger = "0.9.0"
 log = "0.4.17"
-regex = "1.5.5"
+regex = "1.5.6"
 secstr = "0.5.0"
 semver = "1.0.9"
 serde_json = "1.0.81"