diff options
Diffstat (limited to 'src/files/obj.rs')
| -rw-r--r-- | src/files/obj.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/files/obj.rs b/src/files/obj.rs index c45ffbf..af2ce03 100644 --- a/src/files/obj.rs +++ b/src/files/obj.rs @@ -1,5 +1,6 @@ #![forbid(unsafe_code)] use crate::error::*; +use crate::graphics::{ Permanent, Model }; use crate::linear_algebra::{ Vec2, Vec3 }; use crate::shader_data::Vertex; @@ -8,7 +9,7 @@ use std::io::Cursor; use tobj::{ load_obj_buf, LoadOptions }; -pub fn load_obj() -> Result<(Vec<Vertex<f32>>, Vec<u32>)> { +pub fn load_obj(permanent: &Permanent) -> Result<Model> { let obj = include_bytes!("../../models/teapot.obj"); let load_options = LoadOptions { @@ -39,6 +40,6 @@ pub fn load_obj() -> Result<(Vec<Vertex<f32>>, Vec<u32>)> { } } - Ok((vertices, indices)) + Model::new(vertices, indices, permanent) } |