diff options
Diffstat (limited to 'engine/src/ui/dear_imgui.rs')
| -rw-r--r-- | engine/src/ui/dear_imgui.rs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/engine/src/ui/dear_imgui.rs b/engine/src/ui/dear_imgui.rs index bcdefa1..8f58ff6 100644 --- a/engine/src/ui/dear_imgui.rs +++ b/engine/src/ui/dear_imgui.rs @@ -36,12 +36,9 @@ use crate::mesh::vertex_buffer::{ NamedVertexAttr as MeshNamedVertexAttr, VertexAttrInfo as MeshVertexAttrInfo, VertexBuffer as MeshVertexBuffer, + VertexLabel, }; -use crate::mesh::{ - Mesh, - VertexAttrType as MeshVertexAttrType, - POSITION_VERTEX_ATTRIB_NAME, -}; +use crate::mesh::{Mesh, VertexAttrType as MeshVertexAttrType}; use crate::projection::{ ClipVolume as ProjectionClipVolume, Orthographic as OrthographicProjection, @@ -393,15 +390,15 @@ fn initialize_context( .vertices(MeshVertexBuffer::with_capacity( &[ MeshVertexAttrInfo { - name: POSITION_VERTEX_ATTRIB_NAME.into(), + label: VertexLabel::Position, ty: MeshVertexAttrType::Float32Array { length: 3 }, }, MeshVertexAttrInfo { - name: "color".into(), + label: VertexLabel::Color, ty: MeshVertexAttrType::Float32Array { length: 4 }, }, MeshVertexAttrInfo { - name: "texture_coords".into(), + label: VertexLabel::Uv, ty: MeshVertexAttrType::Float32Array { length: 2 }, }, ], @@ -726,15 +723,15 @@ fn add_drawing_render_pass( for vertex in draw_list.vtx_buffer() { mesh.vertex_buf_mut().push(( MeshNamedVertexAttr::<[f32; 3]> { - name: POSITION_VERTEX_ATTRIB_NAME, + label: VertexLabel::Position, value: [vertex.pos[0], vertex.pos[1], 0.0], }, MeshNamedVertexAttr { - name: "color", + label: VertexLabel::Color, value: vertex.rgba().map(|elem| (elem as f32) / 255.0), }, MeshNamedVertexAttr { - name: "texture_coords", + label: VertexLabel::Uv, value: vertex.uv, }, )); |