From e2f0fdc8f8c22e17ce10461ff3c10cd55cafe99b Mon Sep 17 00:00:00 2001
From: erenoku <erenoku910@gmail.com>
Date: Mon, 13 Feb 2023 20:08:59 +0300
Subject: [PATCH] Don't require an aspect ratio when creating a
 NavigationCubeRenderer

---
 crates/fj-viewer/src/graphics/navigation_cube.rs | 13 +++++++------
 crates/fj-viewer/src/graphics/renderer.rs        |  8 ++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/crates/fj-viewer/src/graphics/navigation_cube.rs b/crates/fj-viewer/src/graphics/navigation_cube.rs
index e5855cb3d..79053ff51 100644
--- a/crates/fj-viewer/src/graphics/navigation_cube.rs
+++ b/crates/fj-viewer/src/graphics/navigation_cube.rs
@@ -1,7 +1,10 @@
 use fj_math::Transform;
 use wgpu::util::DeviceExt;
 
-use super::model::{self, load_model, DrawModel, Model};
+use super::{
+    model::{self, load_model, DrawModel, Model},
+    transform,
+};
 
 #[derive(Debug)]
 pub struct NavigationCubeRenderer {
@@ -19,7 +22,6 @@ impl NavigationCubeRenderer {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         config: &wgpu::SurfaceConfiguration,
-        aspect_ratio: f64,
     ) -> Self {
         let texture_bind_group_layout =
             device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -48,13 +50,12 @@ impl NavigationCubeRenderer {
                 label: Some("texture_bind_group_layout"),
             });
 
-        let mvp_matrix =
-            Self::get_mvp_matrix(Transform::identity(), aspect_ratio);
-
         let mvp_matrix_buffer =
             device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
                 label: Some("Model Matrix Buffer"),
-                contents: bytemuck::cast_slice(&[mvp_matrix]),
+                contents: bytemuck::cast_slice(&[
+                    transform::Transform::identity(),
+                ]),
                 usage: wgpu::BufferUsages::UNIFORM
                     | wgpu::BufferUsages::COPY_DST,
             });
diff --git a/crates/fj-viewer/src/graphics/renderer.rs b/crates/fj-viewer/src/graphics/renderer.rs
index 04c9f8678..7171f3b00 100644
--- a/crates/fj-viewer/src/graphics/renderer.rs
+++ b/crates/fj-viewer/src/graphics/renderer.rs
@@ -186,12 +186,8 @@ impl Renderer {
         let pipelines =
             Pipelines::new(&device, &bind_group_layout, color_format);
 
-        let navigation_cube_renderer = NavigationCubeRenderer::new(
-            &device,
-            &queue,
-            &surface_config,
-            800.0 / 600.0,
-        );
+        let navigation_cube_renderer =
+            NavigationCubeRenderer::new(&device, &queue, &surface_config);
 
         Ok(Self {
             surface,