diff --git a/experiments/2024-12-09/src/render/geometry.rs b/experiments/2024-12-09/src/render/geometry.rs index 3151b623a..b6f73dcdc 100644 --- a/experiments/2024-12-09/src/render/geometry.rs +++ b/experiments/2024-12-09/src/render/geometry.rs @@ -5,7 +5,7 @@ use wgpu::util::DeviceExt; use crate::geometry::Operation; -use super::pipelines::{triangles, vertices}; +use super::pipelines::triangles; pub struct Geometry { pub vertices: wgpu::Buffer, @@ -14,42 +14,6 @@ pub struct Geometry { _vertex: PhantomData, } -impl Geometry { - pub fn vertices(device: &wgpu::Device, operation: &dyn Operation) -> Self { - let mut mesh_vertices = Vec::new(); - operation.vertices(&mut mesh_vertices); - - let mut vertices = Vec::new(); - let mut indices = Vec::new(); - - for mesh_vertex in mesh_vertices { - let s = 0.05; - - let p = mesh_vertex.point; - let [a, b, c, d] = [[-s, -s], [s, -s], [-s, s], [s, s]] - .map(|[x, y]| p + [x, y, 0.]) - .map(|point| { - point.coords.components.map(|scalar| scalar.value() as f32) - }); - - for vertex in [a, b, c, c, b, d] { - let index = vertices.len() as u32; - - let vertex = vertices::Vertex { - position: vertex, - center: p.coords.components.map(|s| s.value() as f32), - radius: s as f32, - }; - - vertices.push(vertex); - indices.push(index); - } - } - - Self::new(device, &vertices, &indices) - } -} - impl Geometry { pub fn triangles(device: &wgpu::Device, operation: &dyn Operation) -> Self { let mut mesh_triangles = Vec::new(); diff --git a/experiments/2024-12-09/src/render/pipelines/pipelines.rs b/experiments/2024-12-09/src/render/pipelines/pipelines.rs index 9cc16b65b..057edff2d 100644 --- a/experiments/2024-12-09/src/render/pipelines/pipelines.rs +++ b/experiments/2024-12-09/src/render/pipelines/pipelines.rs @@ -3,10 +3,9 @@ use std::f32::consts::PI; use glam::{Mat4, Vec3}; use wgpu::util::DeviceExt; -use super::{triangles, vertices, Pipeline}; +use super::{triangles, Pipeline}; pub struct Pipelines { - pub vertices: Pipeline, pub triangles: Pipeline, } @@ -25,12 +24,6 @@ impl Pipelines { usage: wgpu::BufferUsages::UNIFORM, }); - let vertices = Pipeline::new( - device, - config, - wgpu::include_wgsl!("shaders/vertices.wgsl"), - &uniforms, - ); let triangles = Pipeline::new( device, config, @@ -38,10 +31,7 @@ impl Pipelines { &uniforms, ); - Self { - vertices, - triangles, - } + Self { triangles } } } diff --git a/experiments/2024-12-09/src/render/renderer.rs b/experiments/2024-12-09/src/render/renderer.rs index 3fb49883e..98216959e 100644 --- a/experiments/2024-12-09/src/render/renderer.rs +++ b/experiments/2024-12-09/src/render/renderer.rs @@ -90,7 +90,6 @@ impl Renderer { pub fn render(&mut self, operations: &OperationView) -> anyhow::Result<()> { let selected_operation = operations.selected(); - let vertices = Geometry::vertices(&self.device, selected_operation); let triangles = Geometry::triangles(&self.device, selected_operation); let mut encoder = self @@ -129,7 +128,6 @@ impl Renderer { occlusion_query_set: None, }); - self.pipelines.vertices.draw(&mut render_pass, &vertices); self.pipelines.triangles.draw(&mut render_pass, &triangles); self.text_renderer.render( operations,