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

fix(render): restore solid surface rendering

Browse source 
Keep viewport styles from disabling selected shaded modes.\n\nPack mesh shader inputs to stay within WebGL limits.
This commit is contained in:
Hakan Seven 2026-08-11 15:44:16 +03:00
commit a1f64d7663
3 changed files with 30 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/scene/pipeline/mesh_gpu.rs
View file

@ -1,11 +1,4 @@
// Mesh GPU buffers — TriangleList rendering for solid objects.
//
// Vertex layout (40 bytes):
// position [f32; 3] offset 0 12 B
// normal [f32; 3] offset 12 12 B
// color [f32; 4] offset 24 16 B
// ------
// 40 B / vertex
// GPU buffers for triangle meshes.
use crate::scene::model::mesh_model::{MeshLodSet, MeshModel};
use iced::wgpu;
@ -95,32 +88,17 @@ impl MeshVertex {
wgpu::VertexAttribute {
offset: std::mem::offset_of!(MeshVertex, uv_specular) as u64,
shader_location: 10,
format: wgpu::VertexFormat::Float32x2,
},
wgpu::VertexAttribute {
offset: std::mem::offset_of!(MeshVertex, uv_reflection) as u64,
shader_location: 11,
format: wgpu::VertexFormat::Float32x2,
format: wgpu::VertexFormat::Float32x4,
},
wgpu::VertexAttribute {
offset: std::mem::offset_of!(MeshVertex, uv_opacity) as u64,
shader_location: 12,
format: wgpu::VertexFormat::Float32x2,
},
wgpu::VertexAttribute {
offset: std::mem::offset_of!(MeshVertex, uv_bump) as u64,
shader_location: 13,
format: wgpu::VertexFormat::Float32x2,
shader_location: 11,
format: wgpu::VertexFormat::Float32x4,
},
wgpu::VertexAttribute {
offset: std::mem::offset_of!(MeshVertex, uv_refraction) as u64,
shader_location: 14,
format: wgpu::VertexFormat::Float32x2,
},
wgpu::VertexAttribute {
offset: std::mem::offset_of!(MeshVertex, uv_normal) as u64,
shader_location: 15,
format: wgpu::VertexFormat::Float32x2,
shader_location: 12,
format: wgpu::VertexFormat::Float32x4,
},
];
wgpu::VertexBufferLayout {
@ -130,12 +108,7 @@ impl MeshVertex {
}
}
/// Minimal layout shared by native and WebGL mesh edge pipelines.
///
/// Edge fragments only need position and entity color. Advertising the
/// material/normal/UV attributes here would keep the full surface-shader
/// interface alive on WebGL even though the edge entry point never reads
/// those values.
/// Surface-independent layout for mesh edge pipelines.
pub fn edge_layout<'a>() -> wgpu::VertexBufferLayout<'a> {
const ATTRS: &[wgpu::VertexAttribute] = &[
wgpu::VertexAttribute {

9
src/scene/view/render.rs
View file

@ -3195,13 +3195,8 @@ impl Scene {
let display = self.viewport_display_settings(inst);
let mut flags = render_mode_flags(inst.render_mode);
if let Some(style) = display.visual_style.as_ref() {
if flags.mesh_fill {
flags.face3d_fill &= style.face_visible();
flags.mesh_fill &= style.face_visible();
flags.show_3d_edges = style.edges_visible();
if style.face_lighting_quality == 1 {
flags.flat_shade = true;
}
if flags.mesh_fill && style.face_lighting_quality == 1 {
flags.flat_shade = true;
}
}
let view_wireframe = !flags.face3d_fill;