forked from 1b-agent/opencadstudio-upstream
Hakan SevenandClaude Opus 4.7
8d64426087
Collapse the paper-space rendering path into the same shader widget the model layout uses. The PaperCanvas widget draws the paper sheet, paper entities and viewport borders underneath; the unified shader paints all content viewports on top, scissored to each viewport's rect. - Drop PaperViewportPane / PaperViewportPipeline newtype / PaperViewportPrimitive, ViewportPaneMode::Paper, ViewportPane::paper, build_primitive and build_viewport_primitive. Scene exposes only build_viewports. - view.rs: the paper branch stacks PaperCanvas + the unified shader instead of the old paper_canvas_view function. The active paper viewport's blue border, render-mode picker and ViewCube hit-area are layered in the same viewport_stack as the model layout. - Transparent shader clear (alpha=0) + alpha-blended blit pipeline so the underlying widget (container bg in model, PaperCanvas sheet in paper) shows through everywhere the shader has not painted geometry — including inside content viewport rectangles. Co-Authored-By: Claude Opus 4.7 <[email protected]>
87 lines
2.9 KiB
Rust
87 lines
2.9 KiB
Rust
//! Unified GPU shader widget for both model and paper layouts.
|
|
//!
|
|
//! There is one `shader::Program` for the whole canvas. `Scene::build_viewports`
|
|
//! decides what to render — model layout produces one viewport per tile
|
|
//! (`active_viewports` iterates `model_tiles`), paper layout produces one per
|
|
//! content viewport entity. Each one is drawn into its own scissor rect by a
|
|
//! dedicated inner `Pipeline` (kept in the `MultiPipeline` outer).
|
|
|
|
use super::render::{CameraState, Primitive};
|
|
use super::Scene;
|
|
use iced::widget::shader;
|
|
use iced::{mouse, Event, Rectangle};
|
|
|
|
// ── Widget struct ─────────────────────────────────────────────────────────
|
|
|
|
pub struct ViewportPane<'a> {
|
|
pub scene: &'a Scene,
|
|
pub show_viewcube: bool,
|
|
/// Render mode applied to the Model layout's tiles. Paper-space content
|
|
/// viewports use the render mode stored on their own viewport entity.
|
|
pub render_mode: acadrust::entities::ViewportRenderMode,
|
|
}
|
|
|
|
impl<'a> ViewportPane<'a> {
|
|
pub fn model(
|
|
scene: &'a Scene,
|
|
show_viewcube: bool,
|
|
render_mode: acadrust::entities::ViewportRenderMode,
|
|
) -> Self {
|
|
Self {
|
|
scene,
|
|
show_viewcube,
|
|
render_mode,
|
|
}
|
|
}
|
|
}
|
|
|
|
// ── shader::Program impl ──────────────────────────────────────────────────
|
|
|
|
impl<'a, Msg: std::fmt::Debug + Clone> shader::Program<Msg> for ViewportPane<'a> {
|
|
type State = CameraState;
|
|
type Primitive = Primitive;
|
|
|
|
fn draw(
|
|
&self,
|
|
state: &Self::State,
|
|
_cursor: mouse::Cursor,
|
|
bounds: Rectangle,
|
|
) -> Self::Primitive {
|
|
self.scene
|
|
.build_viewports(bounds, self.render_mode, state.hover_region)
|
|
}
|
|
|
|
fn update(
|
|
&self,
|
|
state: &mut Self::State,
|
|
event: &Event,
|
|
bounds: Rectangle,
|
|
cursor: mouse::Cursor,
|
|
) -> Option<iced::widget::Action<Msg>> {
|
|
// ViewCube hover is also driven from the app-level CursorMoved /
|
|
// ViewportMove handlers (the cube hit-area overlay shadows this
|
|
// widget for those events). Keeping the call here gives a fallback
|
|
// path while the cursor is over the bare shader.
|
|
if self.show_viewcube {
|
|
self.scene.update_viewcube_state(state, bounds, cursor);
|
|
} else {
|
|
state.hover_region = None;
|
|
}
|
|
let _ = event;
|
|
None
|
|
}
|
|
|
|
fn mouse_interaction(
|
|
&self,
|
|
state: &Self::State,
|
|
_b: Rectangle,
|
|
_c: mouse::Cursor,
|
|
) -> mouse::Interaction {
|
|
if self.show_viewcube {
|
|
self.scene.viewcube_mouse_interaction(state)
|
|
} else {
|
|
mouse::Interaction::default()
|
|
}
|
|
}
|
|
}
|