rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-11-19 14:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1584 from erenoku/navigation_cube

Browse Source 
Don't require an aspect ratio when creating a new NavigationCubeRenderer
This commit is contained in:
Hanno Braun 2023-02-14 10:56:02 +01:00 committed by GitHub
commit 107a0c34c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/fj-viewer/src/graphics/navigation_cube.rs
View File

@ -1,7 +1,10 @@
use fj_math::Transform; use fj_math::Transform;
use wgpu::util::DeviceExt; use wgpu::util::DeviceExt;
use super::model::{self, load_model, DrawModel, Model}; use super::{
model::{self, load_model, DrawModel, Model},
transform,
};
#[derive(Debug)] #[derive(Debug)]
pub struct NavigationCubeRenderer { pub struct NavigationCubeRenderer {
@ -19,7 +22,6 @@ impl NavigationCubeRenderer {
device: &wgpu::Device, device: &wgpu::Device,
queue: &wgpu::Queue, queue: &wgpu::Queue,
config: &wgpu::SurfaceConfiguration, config: &wgpu::SurfaceConfiguration,
aspect_ratio: f64,
) -> Self { ) -> Self {
let texture_bind_group_layout = let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@ -48,13 +50,12 @@ impl NavigationCubeRenderer {
label: Some("texture_bind_group_layout"), label: Some("texture_bind_group_layout"),
}); });
let mvp_matrix =
Self::get_mvp_matrix(Transform::identity(), aspect_ratio);
let mvp_matrix_buffer = let mvp_matrix_buffer =
device.create_buffer_init(&wgpu::util::BufferInitDescriptor { device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("Model Matrix Buffer"), label: Some("Model Matrix Buffer"),
contents: bytemuck::cast_slice(&[mvp_matrix]), contents: bytemuck::cast_slice(&[
transform::Transform::identity(),
]),
usage: wgpu::BufferUsages::UNIFORM usage: wgpu::BufferUsages::UNIFORM
| wgpu::BufferUsages::COPY_DST, | wgpu::BufferUsages::COPY_DST,
}); });

8
crates/fj-viewer/src/graphics/renderer.rs
View File

@ -186,12 +186,8 @@ impl Renderer {
let pipelines = let pipelines =
Pipelines::new(&device, &bind_group_layout, color_format); Pipelines::new(&device, &bind_group_layout, color_format);
let navigation_cube_renderer = NavigationCubeRenderer::new( let navigation_cube_renderer =
&device, NavigationCubeRenderer::new(&device, &queue, &surface_config);
&queue,
&surface_config,
800.0 / 600.0,
);
Ok(Self { Ok(Self {
surface, surface,