forked from 1b-agent/opencadstudio-upstream
perf(blocks): keep repeated block copies as one stub wire each
Every further reference to an already expanded block (a translated copy of the same definition, at the top level or nested) was materialised as a full copy of every wire, although the GPU already draws those copies from one shared source with a per-copy offset. Such a copy is now a single stub wire holding the shared prototype and its offset (stubs nest inside prototypes, so nested repeats collapse too). - The block renderer expands stubs into instance references while it groups by source, so drawing is unchanged. - Interaction queries expand only the stubs near the query, so snapping, picking, window and crossing selection see each copy's geometry. - Plot, boundary detection, viewport projection and entity_wires() get fully expanded wires; count and reference-edit recolouring expand the set while they are active. - OCS_NO_BLOCK_STUBS turns it off. A drawing with 480 references to a block of 100 nested 50-line blocks (2.4M lines) now opens with 11k wires instead of 2.4M: peak memory 5.4 GB -> 0.37 GB, wire assembly 2.4 s -> 36 ms, interaction index 3.7 s -> 23 ms. The viewport, a plotted PDF, snaps and selections are identical with and without stubs, and on five real drawings the view renders the same. Refs #1698, #1542 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
8d287decd8
commit
29c0d1df9a
14 files changed
+445
-52
No files matched your search
@@ -1,4 +1,7 @@
|
||||
use std::sync::atomic::{AtomicU64, Ordering};
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::wire_model::WireModel;
|
||||
|
||||
static NEXT_SOURCE_ID: AtomicU64 = AtomicU64::new(1);
|
||||
|
||||
@@ -11,3 +14,127 @@ pub struct RenderInstance {
|
||||
pub fn next_source_id() -> u64 {
|
||||
NEXT_SOURCE_ID.fetch_add(1, Ordering::Relaxed)
|
||||
}
|
||||
|
||||
/// Translated copies of one nested block expansion, kept as a single wire
|
||||
/// instead of one wire per copied primitive (#1698): the copy is `prototype`
|
||||
/// moved by `delta`, its draw depths shifted by `depth_delta`. Prototype
|
||||
/// wires are block-instanced (or stubs themselves), so the GPU draws them
|
||||
/// from the shared source geometry and CPU users expand them on demand.
|
||||
#[derive(Debug)]
|
||||
pub struct InstanceStub {
|
||||
pub prototype: Arc<Vec<WireModel>>,
|
||||
pub delta: [f64; 3],
|
||||
pub depth_delta: f32,
|
||||
}
|
||||
|
||||
/// Whether a prototype wire may be represented by a stub: one the block
|
||||
/// renderer draws from its source geometry alone (no glyphs, fills or
|
||||
/// markers of its own), or a stub already.
|
||||
pub fn stubbable(wire: &WireModel) -> bool {
|
||||
// Kill-switch: `OCS_NO_BLOCK_STUBS` keeps every copy as its own wires.
|
||||
static OFF: std::sync::OnceLock<bool> = std::sync::OnceLock::new();
|
||||
if *OFF.get_or_init(|| std::env::var("OCS_NO_BLOCK_STUBS").is_ok()) {
|
||||
return false;
|
||||
}
|
||||
wire.stub.is_some()
|
||||
|| (wire.render_instance.is_some()
|
||||
&& wire.text_verts.is_empty()
|
||||
&& wire.fill_tris.is_empty()
|
||||
&& wire.pick_tris.is_empty()
|
||||
&& !wire.fill_is_3d
|
||||
&& wire.point_marker.is_none()
|
||||
&& wire.searchable_text.is_empty())
|
||||
}
|
||||
|
||||
/// The XY box a prototype's wires cover, before any copy's offset.
|
||||
pub fn prototype_aabb(prototype: &[WireModel]) -> [f32; 4] {
|
||||
prototype.iter().fold(
|
||||
[f32::INFINITY, f32::INFINITY, f32::NEG_INFINITY, f32::NEG_INFINITY],
|
||||
|acc, wire| {
|
||||
[
|
||||
acc[0].min(wire.aabb[0]),
|
||||
acc[1].min(wire.aabb[1]),
|
||||
acc[2].max(wire.aabb[2]),
|
||||
acc[3].max(wire.aabb[3]),
|
||||
]
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
/// A stub wire standing for `prototype` moved by `delta`.
|
||||
pub fn stub_wire(
|
||||
prototype: Arc<Vec<WireModel>>,
|
||||
prototype_aabb: [f32; 4],
|
||||
delta: [f64; 3],
|
||||
depth_delta: f32,
|
||||
) -> WireModel {
|
||||
let aabb = [
|
||||
(prototype_aabb[0] as f64 + delta[0]) as f32,
|
||||
(prototype_aabb[1] as f64 + delta[1]) as f32,
|
||||
(prototype_aabb[2] as f64 + delta[0]) as f32,
|
||||
(prototype_aabb[3] as f64 + delta[1]) as f32,
|
||||
];
|
||||
WireModel {
|
||||
aabb,
|
||||
stub: Some(Arc::new(InstanceStub {
|
||||
prototype,
|
||||
delta,
|
||||
depth_delta,
|
||||
})),
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
/// Every wire `wires` stands for, stubs expanded into translated copies
|
||||
/// named and selected like the stub that holds them.
|
||||
pub fn expand_stubs(wires: &[WireModel]) -> std::borrow::Cow<'_, [WireModel]> {
|
||||
if !wires.iter().any(|wire| wire.stub.is_some()) {
|
||||
return std::borrow::Cow::Borrowed(wires);
|
||||
}
|
||||
let mut out = Vec::with_capacity(wires.len());
|
||||
for wire in wires {
|
||||
if wire.stub.is_some() {
|
||||
expand_stub_into(wire, &mut out);
|
||||
} else {
|
||||
out.push(wire.clone());
|
||||
}
|
||||
}
|
||||
std::borrow::Cow::Owned(out)
|
||||
}
|
||||
|
||||
/// Append the translated copies a stub wire stands for.
|
||||
pub fn expand_stub_into(stub_wire: &WireModel, out: &mut Vec<WireModel>) {
|
||||
let Some(stub) = stub_wire.stub.as_ref() else {
|
||||
out.push(stub_wire.clone());
|
||||
return;
|
||||
};
|
||||
for wire in stub.prototype.iter() {
|
||||
let mut copy = crate::scene::cache::block_cache::translated_prototype_wire(
|
||||
wire,
|
||||
&stub_wire.name,
|
||||
stub.delta,
|
||||
);
|
||||
shift_depth(&mut copy, stub.depth_delta);
|
||||
copy.selected = stub_wire.selected;
|
||||
copy.display_visible &= stub_wire.display_visible;
|
||||
if copy.stub.is_some() {
|
||||
expand_stub_into(©, out);
|
||||
} else {
|
||||
out.push(copy);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Shift a block-local draw depth by `delta`, through a stub as well.
|
||||
pub fn shift_depth(wire: &mut WireModel, delta: f32) {
|
||||
if let Some(depth) = wire.depth_override.as_mut() {
|
||||
*depth += delta;
|
||||
}
|
||||
if let Some(stub) = wire.stub.as_mut() {
|
||||
*stub = Arc::new(InstanceStub {
|
||||
prototype: Arc::clone(&stub.prototype),
|
||||
delta: stub.delta,
|
||||
depth_delta: stub.depth_delta + delta,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -836,6 +836,9 @@ pub struct WireModel {
|
||||
pub fill_is_2d_solid: bool,
|
||||
/// Shared block-render source and this placement's translation.
|
||||
pub render_instance: Option<super::instance_model::RenderInstance>,
|
||||
/// Set on a wire that stands for a translated copy of a nested block
|
||||
/// expansion; its own geometry is empty (see `InstanceStub`).
|
||||
pub stub: Option<std::sync::Arc<super::instance_model::InstanceStub>>,
|
||||
}
|
||||
|
||||
impl WireModel {
|
||||
@@ -911,6 +914,7 @@ impl WireModel {
|
||||
fill_is_3d: false,
|
||||
fill_is_2d_solid: false,
|
||||
render_instance: None,
|
||||
stub: None,
|
||||
pick_tris: Vec::new(),
|
||||
pick_tris_low: Vec::new(),
|
||||
text_verts: Vec::new(),
|
||||
@@ -1448,6 +1452,7 @@ impl Default for WireModel {
|
||||
fill_is_3d: false,
|
||||
fill_is_2d_solid: false,
|
||||
render_instance: None,
|
||||
stub: None,
|
||||
pick_tris: Vec::new(),
|
||||
pick_tris_low: Vec::new(),
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user