Fix modelling regressions and reconcile WIP UI work
This commit is contained in:
1 parent
49bd89de13
commit
d6cdec40da
67 files changed
+1793
-260
No files matched your search
@@ -68,7 +68,7 @@ pub fn gpu_images(app: &SolveApp) -> Vec<GpuImage> {
|
||||
.iter()
|
||||
.filter(|c| c.visible && c.opacity > 0.0)
|
||||
.filter_map(|c| {
|
||||
let plane = doc.resolve_plane(&vals, &c.plane, 0).ok()?;
|
||||
let plane = doc.canvas_plane(&vals, c).ok()?;
|
||||
let (_, version, size, rgba) = pixels(c)?;
|
||||
let corners = c.world_corners(&plane).map(|p| [p.x as f32, p.y as f32, p.z as f32]);
|
||||
Some(GpuImage { id: c.id, version, size, rgba, corners, opacity: c.opacity.clamp(0.0, 1.0) as f32 })
|
||||
@@ -105,7 +105,7 @@ pub fn show(app: &SolveApp, ui: &egui::Ui, painter: &egui::Painter, proj: &Proj)
|
||||
}
|
||||
let (vals, _) = doc.param_values();
|
||||
for c in doc.canvases.iter().filter(|c| c.visible) {
|
||||
let Ok(plane) = doc.resolve_plane(&vals, &c.plane, 0) else { continue };
|
||||
let Ok(plane) = doc.canvas_plane(&vals, c) else { continue };
|
||||
let Some(tex) = texture(ui.ctx(), c) else { continue };
|
||||
let [bl, br, _, tl] = c.corners();
|
||||
let (u, v) = (br - bl, tl - bl);
|
||||
|
||||
Reference in new issue
Block a user