diff options
Diffstat (limited to 'engine/src/file_format/wavefront/obj.rs')
| -rw-r--r-- | engine/src/file_format/wavefront/obj.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engine/src/file_format/wavefront/obj.rs b/engine/src/file_format/wavefront/obj.rs index ebbbe45..3fcb17b 100644 --- a/engine/src/file_format/wavefront/obj.rs +++ b/engine/src/file_format/wavefront/obj.rs @@ -17,8 +17,9 @@ use crate::mesh::vertex_buffer::{ NamedVertexAttr, VertexAttrInfo, VertexBuffer as MeshVertexBuffer, + VertexLabel, }; -use crate::mesh::{Mesh, VertexAttrType, POSITION_VERTEX_ATTRIB_NAME}; +use crate::mesh::{Mesh, VertexAttrType}; use crate::util::try_option; use crate::vector::{Vec2, Vec3}; @@ -90,15 +91,15 @@ impl Obj let mut vertex_buf = MeshVertexBuffer::with_capacity( &[ VertexAttrInfo { - name: POSITION_VERTEX_ATTRIB_NAME.into(), + label: VertexLabel::Position, ty: VertexAttrType::Float32Array { length: 3 }, }, VertexAttrInfo { - name: "texture_coords".into(), + label: VertexLabel::Uv, ty: VertexAttrType::Float32Array { length: 2 }, }, VertexAttrInfo { - name: "normal".into(), + label: VertexLabel::Normal, ty: VertexAttrType::Float32Array { length: 3 }, }, ], @@ -170,15 +171,15 @@ impl Obj vertex_buf.push(( NamedVertexAttr { - name: POSITION_VERTEX_ATTRIB_NAME, + label: VertexLabel::Position, value: pos.into_array(), }, NamedVertexAttr { - name: "texture_coords", + label: VertexLabel::Uv, value: texture_pos.into_array(), }, NamedVertexAttr { - name: "normal", + label: VertexLabel::Normal, value: normal.into_array(), }, )); |