Complete 2D solid workflow

src/scene/pipeline/face3d_gpu.rs

@@ -22,6 +22,20 @@ use crate::scene::model::wire_model::WireModel;
 use iced::wgpu;
 use iced::wgpu::util::DeviceExt;
 
+fn planar_solid_faces_view(wire: &WireModel, view_dir: glam::Vec3) -> bool {
+    if !wire.fill_is_2d_solid || wire.fill_is_3d {
+        return true;
+    }
+    let view = view_dir.normalize_or_zero();
+    wire.fill_tris.chunks_exact(3).any(|triangle| {
+        let first = glam::Vec3::from_array(triangle[0]);
+        let second = glam::Vec3::from_array(triangle[1]);
+        let third = glam::Vec3::from_array(triangle[2]);
+        let normal = (second - first).cross(third - first).normalize_or_zero();
+        normal.length_squared() > 0.0 && normal.dot(view).abs() >= 1.0 - 1.0e-5
+    })
+}
+
 // ── Vertex layout ──────────────────────────────────────────────────────────
 
 #[repr(C)]
@@ -149,6 +163,7 @@ impl Face3DGpu {
         all_wires: &[WireModel],
         keep_3d_mesh_fills: bool,
         show_2d_solid_fills: bool,
+        view_dir: glam::Vec3,
         depth_map: &rustc_hash::FxHashMap<u64, [f32; 2]>,
     ) -> Self {
         let depth_of =
@@ -200,6 +215,9 @@ impl Face3DGpu {
             if !show_2d_solid_fills && wire.fill_is_2d_solid {
                 continue;
             }
+            if !planar_solid_faces_view(wire, view_dir) {
+                continue;
+            }
             // A real 3-D surface fill (PolyfaceMesh / PolygonMesh) carries a
             // double-single low residual paired with `fill_tris` — it lives at
             // true world coordinates and must keep its real depth. 2-D fills
@@ -259,6 +277,7 @@ impl Face3DGpu {
             all_wires,
             keep_3d_mesh_fills,
             show_2d_solid_fills,
+            view_dir,
             depth_map,
         );
         Self {
@@ -275,6 +294,7 @@ fn upload_block_chunks(
     wires: &[WireModel],
     keep_3d_mesh_fills: bool,
     show_2d_solid_fills: bool,
+    view_dir: glam::Vec3,
     depth_map: &rustc_hash::FxHashMap<u64, [f32; 2]>,
 ) -> (Vec<BlockFace3DChunk>, Vec<BlockFace3DChunk>) {
     let mut slots = rustc_hash::FxHashMap::default();
@@ -285,6 +305,7 @@ fn upload_block_chunks(
         };
         if wire.fill_tris.is_empty()
             || (!show_2d_solid_fills && wire.fill_is_2d_solid)
+            || !planar_solid_faces_view(wire, view_dir)
             || (wire.fill_is_3d && !keep_3d_mesh_fills)
         {
             continue;

src/scene/pipeline/mod.rs

@@ -312,12 +312,12 @@ pub struct Pipeline {
     /// a pick bumps only `selection_generation`, refreshing the overlay without
     /// touching the main wire buffers.
     pub cached_selection: (u64, u64),
-    /// `(wire_content_id, face3d_fill_active, show_2d_solid_fills)` the Face3D
+    /// `(wire_content_id, face3d_fill_active, show_2d_solid_fills, view_dir)` the Face3D
     /// edge/fill buffers were uploaded for. A stable content id avoids retaining
     /// the resident wire Arc:
     /// that Arc must stay uniquely owned by Scene so a small edit can splice it
     /// in place instead of rebuilding the whole drawing.
-    pub cached_face3d_key: (u64, bool, bool),
+    pub cached_face3d_key: (u64, bool, bool, [u32; 3]),
     /// Handle → indices into the resident wire set, built once per wire upload
     /// (when `cached_wire_id` changes). Lets the selection/hover xray overlay
     /// gather just the highlighted entity's wires (`O(highlighted)`) instead of
@@ -2323,7 +2323,7 @@ impl Pipeline {
             cached_epoch: (u64::MAX, u64::MAX, u64::MAX),
             cached_wire_id: u64::MAX,
             cached_selection: (u64::MAX, u64::MAX),
-            cached_face3d_key: (u64::MAX, false, false),
+            cached_face3d_key: (u64::MAX, false, false, [u32::MAX; 3]),
             wire_handle_index: std::sync::Arc::new(rustc_hash::FxHashMap::default()),
             render_sig: u64::MAX,
             skip_geometry: false,
@@ -3023,6 +3023,7 @@ impl Pipeline {
         all_wires: &[WireModel],
         wireframe_only: bool,
         show_2d_solid_fills: bool,
+        view_dir: glam::Vec3,
         depth_map: &rustc_hash::FxHashMap<u64, [f32; 2]>,
     ) {
         let perf_started = crate::perf::enabled().then(iced::time::Instant::now);
@@ -3056,6 +3057,7 @@ impl Pipeline {
                 all_wires,
                 keep_3d_mesh_fills,
                 show_2d_solid_fills,
+                view_dir,
                 depth_map,
             ));
         }