AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(ole): render the OLE2FRAME embedded presentation bitmap

Browse source 
An OLE2FRAME drew only a rectangle-with-X placeholder. AutoCAD shows the OLE
object's cached presentation image, which the DWG stores as a BMP embedded in
the OLE data blob (a BITMAPFILEHEADER "BM" + DIB).

`ImageModel::from_ole2frame` scans the blob for a self-consistent embedded BMP
(validating the DIB-header size, so a metafile/other-format OLE cleanly falls
back), decodes it with the `image` crate, and builds the textured quad at the
frame rectangle with a per-corner double-single split so it stays precise at UTM
scale. The scene's image collection now feeds OLE2FRAME entities through it
alongside RasterImage. The placeholder's diagonal X is dropped — only the frame
border is drawn now, so it no longer crosses over the bitmap.

Verified on budweiser handle 3088: the 32×32 embedded bitmap decodes to RGBA
with the expected colours (yellow upper-left, blue centre, red lower-right),
upright and positioned at the frame corners.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-07-18 13:33:46 +03:00
commit b655bd232b
3 changed files with 99 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/entities/ole2frame.rs
View file

@ -28,8 +28,10 @@ fn to_truck(ole: &Ole2Frame) -> TruckEntity {
let cx = (x0 + x1) * 0.5;
let cy = (y0 + y1) * 0.5;
// Frame border only — the embedded presentation bitmap is drawn inside the
// rectangle by the image pass (see `ImageModel::from_ole2frame`). The old
// diagonal-X placeholder would have crossed over that image.
let pts: Vec<[f64; 3]> = vec![
// Rectangle
[x0, y0, z],
[x1, y0, z],
[x1, y0, z],
@ -38,12 +40,6 @@ fn to_truck(ole: &Ole2Frame) -> TruckEntity {
[x0, y1, z],
[x0, y1, z],
[x0, y0, z],
// Diagonal X
[x0, y0, z],
[x1, y1, z],
[f64::NAN; 3],
[x1, y0, z],
[x0, y1, z],
];
let center = glam::DVec3::new(cx, cy, z);
TruckEntity {
@ -171,9 +167,7 @@ impl TruckConvertible for Ole2Frame {
crate::impl_entity_basics!(Ole2Frame);
impl crate::entities::traits::FallbackTess for Ole2Frame {
fn fallback_geometry(
&self,
) -> crate::scene::convert::tess_util::FallbackGeometry {
fn fallback_geometry(&self) -> crate::scene::convert::tess_util::FallbackGeometry {
// OLE objects carry a bounding rectangle in model space.
// Render a simple X-through-rectangle placeholder.
let x0 = self.upper_left_corner.x;
@ -187,7 +181,7 @@ impl crate::entities::traits::FallbackTess for Ole2Frame {
return (vec![[-s, 0.0, 0.0], [s, 0.0, 0.0]], vec![], vec![], vec![]);
}
let pts = vec![
// Outer rectangle
// Frame border only; the presentation bitmap fills the rectangle.
[x0, y0, z],
[x1, y0, z],
[x1, y0, z],
@ -196,12 +190,6 @@ impl crate::entities::traits::FallbackTess for Ole2Frame {
[x0, y1, z],
[x0, y1, z],
[x0, y0, z],
// Diagonal X
[x0, y0, z],
[x1, y1, z],
[f64::NAN, f64::NAN, f64::NAN],
[x1, y0, z],
[x0, y1, z],
];
(pts, vec![], vec![], vec![[x0, y0, z], [x1, y1, z]])
}