From 204362bdcc9d78a0bb8ec6362985701f82aca5c7 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 6 Nov 2024 19:49:15 +0100 Subject: [PATCH] Update name of struct --- experiments/2024-10-30/src/app.rs | 6 +++--- experiments/2024-10-30/src/export.rs | 4 ++-- experiments/2024-10-30/src/geometry.rs | 6 +++--- experiments/2024-10-30/src/model.rs | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/experiments/2024-10-30/src/app.rs b/experiments/2024-10-30/src/app.rs index 259821802..1be7a637c 100644 --- a/experiments/2024-10-30/src/app.rs +++ b/experiments/2024-10-30/src/app.rs @@ -8,9 +8,9 @@ use winit::{ window::{Window, WindowAttributes, WindowId}, }; -use crate::{geometry::Mesh, render::Renderer}; +use crate::{geometry::Operations, render::Renderer}; -pub fn run(mesh: Mesh) -> anyhow::Result<()> { +pub fn run(mesh: Operations) -> anyhow::Result<()> { let event_loop = EventLoop::new()?; let mut app = App { @@ -24,7 +24,7 @@ pub fn run(mesh: Mesh) -> anyhow::Result<()> { } struct App { - mesh: Mesh, + mesh: Operations, window: Option>, renderer: Option, } diff --git a/experiments/2024-10-30/src/export.rs b/experiments/2024-10-30/src/export.rs index 5cf0c2de1..0edc92046 100644 --- a/experiments/2024-10-30/src/export.rs +++ b/experiments/2024-10-30/src/export.rs @@ -1,8 +1,8 @@ use std::{collections::BTreeMap, fs::File}; -use crate::geometry::{Mesh, Operation, Vertex}; +use crate::geometry::{Operation, Operations, Vertex}; -pub fn export(mesh: &Mesh) -> anyhow::Result<()> { +pub fn export(mesh: &Operations) -> anyhow::Result<()> { let mut mesh_vertices = Vec::new(); let mut mesh_triangles = Vec::new(); diff --git a/experiments/2024-10-30/src/geometry.rs b/experiments/2024-10-30/src/geometry.rs index 054104fd3..2924ee775 100644 --- a/experiments/2024-10-30/src/geometry.rs +++ b/experiments/2024-10-30/src/geometry.rs @@ -1,12 +1,12 @@ use crate::math::Point; #[derive(Default)] -pub struct Mesh { +pub struct Operations { pub vertices: Vec, pub triangles: Vec, } -impl Mesh { +impl Operations { pub fn vertex(&mut self, point: Point) { let vertex = Vertex { point }; self.vertices.push(vertex); @@ -17,7 +17,7 @@ impl Mesh { } } -impl Operation for Mesh { +impl Operation for Operations { fn vertices(&self, vertices: &mut Vec) { vertices.extend(&self.vertices); } diff --git a/experiments/2024-10-30/src/model.rs b/experiments/2024-10-30/src/model.rs index 7d1b96af6..66e70c64e 100644 --- a/experiments/2024-10-30/src/model.rs +++ b/experiments/2024-10-30/src/model.rs @@ -1,7 +1,7 @@ -use crate::{geometry::Mesh, math::Scalar}; +use crate::{geometry::Operations, math::Scalar}; -pub fn model() -> anyhow::Result { - let mut mesh = Mesh::default(); +pub fn model() -> anyhow::Result { + let mut mesh = Operations::default(); [ [-0.5, -0.5, -0.5], // 0