Move operation module to top-level

experiments/2024-12-09/src/app.rs

@@ -8,7 +8,7 @@ use winit::{
     window::{Window, WindowAttributes, WindowId},
 };
 
-use crate::{geometry::HandleAny, render::Renderer, view::OperationView};
+use crate::{operation::HandleAny, render::Renderer, view::OperationView};
 
 pub fn run(shape: HandleAny) -> anyhow::Result<()> {
     let view = OperationView::new(shape);

experiments/2024-12-09/src/export.rs

@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, fs::File};
 
-use crate::geometry::Operation;
+use crate::operation::Operation;
 
 pub fn export(op: &dyn Operation) -> anyhow::Result<()> {
     let tri_mesh = op.tri_mesh();

experiments/2024-12-09/src/geometry/mod.rs

@@ -1,11 +1,5 @@
-mod operation;
 mod sketch;
 mod tri_mesh;
 mod triangle;
 
-pub use self::{
+pub use self::{sketch::Sketch, tri_mesh::TriMesh, triangle::Triangle};
-    operation::{Handle, HandleAny, Operation, OperationOutput},
-    sketch::Sketch,
-    tri_mesh::TriMesh,
-    triangle::Triangle,
-};

experiments/2024-12-09/src/geometry/sketch.rs

@@ -1,10 +1,9 @@
 use crate::{
     math::{Plane, Point},
+    operation::Handle,
     topology::{face::Face, vertex::Vertex},
 };
 
-use super::Handle;
-
 pub struct Sketch {
     pub points: Vec<Point<2>>,
 }

experiments/2024-12-09/src/geometry/triangle.rs

@@ -1,12 +1,12 @@
 use std::fmt;
 
-use crate::math::Point;
+use crate::{
-
+    math::Point,
-use super::{
+    operation::{HandleAny, Operation, OperationOutput},
-    operation::{HandleAny, OperationOutput},
-    Operation, TriMesh,
 };
 
+use super::TriMesh;
+
 #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
 pub struct Triangle {
     pub points: [Point<3>; 3],

experiments/2024-12-09/src/main.rs

@@ -5,6 +5,7 @@ mod export;
 mod geometry;
 mod math;
 mod model;
+mod operation;
 mod render;
 mod topology;
 mod view;

experiments/2024-12-09/src/model.rs

@@ -1,6 +1,7 @@
 use crate::{
-    geometry::{Handle, HandleAny, Sketch},
+    geometry::Sketch,
     math::{Bivector, Plane, Point, Vector},
+    operation::{Handle, HandleAny},
     topology::sweep::SweepExt,
 };
 

experiments/2024-12-09/src/operation.rs

@@ -1,6 +1,6 @@
 use std::{cmp::Ordering, fmt, rc::Rc};
 
-use super::tri_mesh::TriMesh;
+use crate::geometry::TriMesh;
 
 pub trait Operation {
     fn display(&self, f: &mut fmt::Formatter) -> fmt::Result;

experiments/2024-12-09/src/render/geometry.rs

@@ -1,7 +1,7 @@
 use glam::Vec3;
 use wgpu::util::DeviceExt;
 
-use crate::geometry::Operation;
+use crate::operation::Operation;
 
 use super::vertex::Vertex;
 

experiments/2024-12-09/src/render/text.rs

@@ -1,6 +1,6 @@
 use std::fmt::Write;
 
-use crate::{geometry::Operation, view::OperationView};
+use crate::{operation::Operation, view::OperationView};
 
 pub struct TextRenderer {
     text_atlas: glyphon::TextAtlas,

experiments/2024-12-09/src/topology/connect.rs

@@ -1,8 +1,9 @@
 use std::fmt;
 
 use crate::{
-    geometry::{Handle, HandleAny, Operation, OperationOutput, TriMesh},
+    geometry::TriMesh,
     math::Plane,
+    operation::{Handle, HandleAny, Operation, OperationOutput},
 };
 
 use super::{face::Face, solid::Solid};

experiments/2024-12-09/src/topology/face.rs

@@ -4,10 +4,9 @@ use itertools::Itertools;
 use spade::Triangulation;
 
 use crate::{
-    geometry::{
+    geometry::{TriMesh, Triangle},
-        Handle, HandleAny, Operation, OperationOutput, TriMesh, Triangle,
-    },
     math::{Plane, Point},
+    operation::{Handle, HandleAny, Operation, OperationOutput},
 };
 
 use super::vertex::Vertex;

experiments/2024-12-09/src/topology/flip.rs

@@ -1,6 +1,9 @@
 use std::fmt;
 
-use crate::geometry::{Handle, HandleAny, Operation, OperationOutput, TriMesh};
+use crate::{
+    geometry::TriMesh,
+    operation::{Handle, HandleAny, Operation, OperationOutput},
+};
 
 use super::face::Face;
 

experiments/2024-12-09/src/topology/solid.rs

@@ -1,6 +1,9 @@
 use std::fmt;
 
-use crate::geometry::{Handle, HandleAny, Operation, OperationOutput, TriMesh};
+use crate::{
+    geometry::TriMesh,
+    operation::{Handle, HandleAny, Operation, OperationOutput},
+};
 
 use super::face::Face;
 

experiments/2024-12-09/src/topology/sweep.rs

@@ -1,8 +1,9 @@
 use std::fmt;
 
 use crate::{
-    geometry::{Handle, HandleAny, Operation, OperationOutput, TriMesh},
+    geometry::TriMesh,
     math::Vector,
+    operation::{Handle, HandleAny, Operation, OperationOutput},
 };
 
 use super::{

experiments/2024-12-09/src/topology/translate.rs

@@ -1,8 +1,9 @@
 use std::fmt;
 
 use crate::{
-    geometry::{Handle, HandleAny, Operation, OperationOutput, TriMesh},
+    geometry::TriMesh,
     math::Vector,
+    operation::{Handle, HandleAny, Operation, OperationOutput},
 };
 
 use super::face::Face;

experiments/2024-12-09/src/topology/vertex.rs

@@ -1,8 +1,9 @@
 use std::fmt;
 
 use crate::{
-    geometry::{HandleAny, Operation, OperationOutput, TriMesh},
+    geometry::TriMesh,
     math::{Point, Vector},
+    operation::{HandleAny, Operation, OperationOutput},
 };
 
 #[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]

experiments/2024-12-09/src/view.rs

@@ -1,6 +1,9 @@
 use std::{fmt, iter};
 
-use crate::geometry::{HandleAny, Operation, OperationOutput, TriMesh};
+use crate::{
+    geometry::TriMesh,
+    operation::{HandleAny, Operation, OperationOutput},
+};
 
 #[derive(Clone)]
 pub struct OperationView {