From 015973babbae9a4f51531386de94a87842039714 Mon Sep 17 00:00:00 2001
From: Hakan Seven <hakanseven8125@gmail.com>
Date: Sat, 18 Jul 2026 14:15:13 +0300
Subject: [PATCH] fix(solid): fill 2D SOLIDs so block-nested ones aren't hollow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A 2D SOLID's `to_truck` emitted only its 4 perimeter edges; its fill came from
a solid-fill HatchModel the scene injects for top-level SOLIDs. That injection
never runs for a SOLID nested in a block, so a filled arrowhead like the
`_BoxFilled` dimension arrow rendered as a hollow box outline.

`to_truck` now also emits the two fill triangles (visual quad p0→p1→p3→p2, the
second degenerate for a triangle SOLID). Block expansion carries fill_tris, so
the arrowhead — and any SOLID inside a block — renders filled; the dimension /
MultiLeader / mesh 2-D fill pass already routes these to the flat fill batch.
Top-level SOLIDs also keep their HatchModel fill; the duplicate is invisible for
the opaque solids these are.

Verified on budweiser dim 3728: the `_BoxFilled` arrow SOLID now tessellates to
fill_tris (2 triangles) instead of an empty fill.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 src/entities/solid.rs | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/entities/solid.rs b/src/entities/solid.rs
index e0c5f631f..b65581d7a 100644
--- a/src/entities/solid.rs
+++ b/src/entities/solid.rs
@@ -1,7 +1,11 @@
 // SOLID entity — 2D filled quadrilateral (or triangle when p3 == p4).
 //
 // Wireframe: the 4 perimeter edges as TruckObject::Lines.
-// Filled:    the scene injects a solid-fill HatchModel (like hatch.rs).
+// Filled:    two triangles on `fill_tris`, so a SOLID nested in a block (e.g.
+//            a `_BoxFilled` dimension arrowhead) renders filled — block
+//            expansion has no separate hatch-model injection. Top-level SOLIDs
+//            also get a solid-fill HatchModel; the duplicate fill is invisible
+//            for the opaque solids these are (arrowheads, cell fills).
 // Grips:     4 corner grip points.
 
 use acadrust::entities::Solid;
@@ -53,13 +57,17 @@ impl TruckConvertible for Solid {
             (dv(&self.fourth_corner), SnapHint::Node),
         ];
 
+        // Fill the visual quad p0→p1→p3→p2 (Z-order) as two triangles; a
+        // triangle SOLID (p2 == p3) degenerates the second, which is harmless.
+        let fill_tris = vec![p0, p1, p3, p0, p3, p2];
+
         Some(TruckEntity {
             pick_tris: Vec::new(),
             object: TruckObject::Lines(pts),
             snap_pts: snap,
             tangent_geoms: vec![],
             key_vertices: vec![p0, p1, p2, p3],
-            fill_tris: vec![],
+            fill_tris,
         })
     }
 }
@@ -146,15 +154,24 @@ impl PropertyEditable for Solid {
 
 impl Transformable for Solid {
     fn apply_transform(&mut self, t: &EntityTransform) {
-        crate::scene::view::transform::apply_standard_entity_transform(self, t, |entity, p1, p2| {
-            for corner in [
-                &mut entity.first_corner,
-                &mut entity.second_corner,
-                &mut entity.third_corner,
-                &mut entity.fourth_corner,
-            ] {
-                crate::scene::view::transform::reflect_xy_point(&mut corner.x, &mut corner.y, p1, p2);
-            }
-        });
+        crate::scene::view::transform::apply_standard_entity_transform(
+            self,
+            t,
+            |entity, p1, p2| {
+                for corner in [
+                    &mut entity.first_corner,
+                    &mut entity.second_corner,
+                    &mut entity.third_corner,
+                    &mut entity.fourth_corner,
+                ] {
+                    crate::scene::view::transform::reflect_xy_point(
+                        &mut corner.x,
+                        &mut corner.y,
+                        p1,
+                        p2,
+                    );
+                }
+            },
+        );
     }
 }