1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

style: apply cargo fmt across workspace

Browse Source
This commit is contained in:
Karim Jerbi committed 2026-10-11 03:14:29 +01:00
1 parent 85710e5454
commit 9cf9ff2c5c
531 files changed
+57740 -33906
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/scene/model/image_model.rs
+78 -32
View File
@@ -22,12 +22,36 @@ fn quad_verts(corners: &[[f32; 3]; 4], corners_low: &[[f32; 3]; 4]) -> Vec<Image
let [p0, p1, p2, p3] = *corners;
let [l0, l1, l2, l3] = *corners_low;
vec![
ImageQuadVertex { pos: p0, uv: [0.0, 1.0], pos_low: l0 },
ImageQuadVertex { pos: p1, uv: [1.0, 1.0], pos_low: l1 },
ImageQuadVertex { pos: p2, uv: [1.0, 0.0], pos_low: l2 },
ImageQuadVertex { pos: p0, uv: [0.0, 1.0], pos_low: l0 },
ImageQuadVertex { pos: p2, uv: [1.0, 0.0], pos_low: l2 },
ImageQuadVertex { pos: p3, uv: [0.0, 0.0], pos_low: l3 },
ImageQuadVertex {
pos: p0,
uv: [0.0, 1.0],
pos_low: l0,
},
ImageQuadVertex {
pos: p1,
uv: [1.0, 1.0],
pos_low: l1,
},
ImageQuadVertex {
pos: p2,
uv: [1.0, 0.0],
pos_low: l2,
},
ImageQuadVertex {
pos: p0,
uv: [0.0, 1.0],
pos_low: l0,
},
ImageQuadVertex {
pos: p2,
uv: [1.0, 0.0],
pos_low: l2,
},
ImageQuadVertex {
pos: p3,
uv: [0.0, 0.0],
pos_low: l3,
},
]
}
@@ -39,12 +63,7 @@ fn clip_triangles_px(img: &codec::entities::RasterImage) -> Vec<[f64; 2]> {
use codec::entities::ClipMode;
let w = img.size.x;
let h = img.size.y;
let quad = || {
vec![
[0.0, 0.0], [w, 0.0], [w, h],
[0.0, 0.0], [w, h], [0.0, h],
]
};
let quad = || vec![[0.0, 0.0], [w, 0.0], [w, h], [0.0, 0.0], [w, h], [0.0, h]];
let Some(poly) = crate::entities::raster_image::image_clip_polygon(img) else {
return quad();
};
@@ -54,7 +73,10 @@ fn clip_triangles_px(img: &codec::entities::RasterImage) -> Vec<[f64; 2]> {
} else {
kernel::geom2d::triangulate(&poly, &[])
};
let tris: Vec<[f64; 2]> = triangles.into_iter().flat_map(|t| t.map(|i| points[i])).collect();
let tris: Vec<[f64; 2]> = triangles
.into_iter()
.flat_map(|t| t.map(|i| points[i]))
.collect();
if tris.is_empty() {
quad()
} else {
@@ -107,8 +129,8 @@ pub(crate) fn underlay_adjust(
def: &codec::entities::UnderlayDefinition,
background: [f32; 4],
) -> super::pdf_raster::PageAdjust {
use codec::entities::{UnderlayDisplayFlags, UnderlayType};
use super::pdf_raster::PageAdjust;
use codec::entities::{UnderlayDisplayFlags, UnderlayType};
let page = crate::entities::underlay::page_of(def);
// Dark means an HSL lightness under one half: pure blue counts as
// light, (0, 128, 0) as dark.
@@ -128,7 +150,9 @@ pub(crate) fn underlay_adjust(
contrast_pivot: match def.underlay_type {
UnderlayType::Pdf => 500,
UnderlayType::Dwf
if u.flags.contains(UnderlayDisplayFlags::ADJUST_FOR_BACKGROUND) && bg_lum < 0.5 =>
if u.flags
.contains(UnderlayDisplayFlags::ADJUST_FOR_BACKGROUND)
&& bg_lum < 0.5 =>
{
730
}
@@ -145,7 +169,9 @@ pub(crate) fn underlay_adjust(
monochrome: u.flags.contains(UnderlayDisplayFlags::MONOCHROME),
// A DGN model's colours follow the background through its
// colour table, whatever this setting.
adjust_for_background: u.flags.contains(UnderlayDisplayFlags::ADJUST_FOR_BACKGROUND)
adjust_for_background: u
.flags
.contains(UnderlayDisplayFlags::ADJUST_FOR_BACKGROUND)
&& !dgn,
dark_background: bg_lum < 0.5,
fade_before_contrast,
@@ -155,9 +181,7 @@ pub(crate) fn underlay_adjust(
impl ImageModel {
/// Build an ImageModel from a DXF RasterImage entity.
/// Returns `None` if the image file cannot be opened or decoded.
pub fn from_raster_image(
img: &codec::entities::RasterImage,
) -> Option<Self> {
pub fn from_raster_image(img: &codec::entities::RasterImage) -> Option<Self> {
let w = img.size.x;
let h = img.size.y;
// Model-space geometry is drawn in (WCS - world_offset) so large UTM-
@@ -201,7 +225,11 @@ impl ImageModel {
let fu = (px / w) as f32;
let fv = (py / h) as f32;
ImageQuadVertex {
pos: [ox + ux * fu + vx * fv, oy + uy * fu + vy * fv, oz + uz * fu + vz * fv],
pos: [
ox + ux * fu + vx * fv,
oy + uy * fu + vy * fv,
oz + uz * fu + vz * fv,
],
uv: [fu, 1.0 - fv],
pos_low: [oxl, oyl, ozl],
}
@@ -249,8 +277,8 @@ impl ImageModel {
background: [f32; 4],
world_per_pixel: Option<f64>,
) -> Option<Self> {
use codec::entities::{UnderlayDisplayFlags, UnderlayType};
use super::pdf_raster;
use codec::entities::{UnderlayDisplayFlags, UnderlayType};
if !u.flags.contains(UnderlayDisplayFlags::ON) {
return None;
}
@@ -262,21 +290,25 @@ impl ImageModel {
// The page's longest side on screen, pixels (the view scale is taken
// a step coarser, so the raster is never reduced on screen and its
// one-pixel lines stay unbroken).
let screen_side = world_per_pixel
.filter(|wpp| *wpp > 0.0)
.map(|wpp| {
let w = (rect[2] - rect[0]) * u.x_scale.abs();
let h = (rect[3] - rect[1]) * u.y_scale.abs();
w.max(h) / wpp
});
let screen_side = world_per_pixel.filter(|wpp| *wpp > 0.0).map(|wpp| {
let w = (rect[2] - rect[0]) * u.x_scale.abs();
let h = (rect[3] - rect[1]) * u.y_scale.abs();
w.max(h) / wpp
});
let (source, raster) = match def.underlay_type {
UnderlayType::Pdf => {
// Hidden PDF layers come from the underlay's layer overrides.
let source = super::pdf_layers::underlay_source(u, &def.file_path);
let inches = (rect[2] - rect[0]).max(rect[3] - rect[1]);
let raster = match screen_side {
Some(side) if inches > 0.0 && side / inches < pdf_raster::DISPLAY_DPI as f64 => {
pdf_raster::rasterize_page_display_at(&source, page, (side / inches).max(8.0) as f32)?
Some(side)
if inches > 0.0 && side / inches < pdf_raster::DISPLAY_DPI as f64 =>
{
pdf_raster::rasterize_page_display_at(
&source,
page,
(side / inches).max(8.0) as f32,
)?
}
_ => pdf_raster::rasterize_page_display(&source, page)?,
};
@@ -286,7 +318,12 @@ impl ImageModel {
// (`underlay_vector::display_wires`).
_ => return None,
};
let pixels = pdf_raster::adjusted_pixels(&source, page, &raster, underlay_adjust(u, def, background));
let pixels = pdf_raster::adjusted_pixels(
&source,
page,
&raster,
underlay_adjust(u, def, background),
);
// The page rectangle in drawing units (1 unit per PDF inch, or per
// DWF/DGN sheet unit), entity scale applied, from its lower-left
@@ -355,7 +392,16 @@ fn underlay_visible_uv(u: &codec::entities::Underlay, rect: [f64; 4]) -> Vec<[f6
let (page_w, page_h) = (rect[2] - rect[0], rect[3] - rect[1]);
use codec::entities::UnderlayDisplayFlags;
let page = vec![[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0]];
let whole = || vec![[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 0.0], [1.0, 1.0], [0.0, 1.0]];
let whole = || {
vec![
[0.0, 0.0],
[1.0, 0.0],
[1.0, 1.0],
[0.0, 0.0],
[1.0, 1.0],
[0.0, 1.0],
]
};
let clip = crate::entities::underlay::clip_polygon_local(u);
if !u.flags.contains(UnderlayDisplayFlags::CLIPPING) || clip.len() < 3 {
return whole();