diff --git a/src/main.rs b/src/main.rs index 3f0c9ce..7d2d401 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,21 +4,21 @@ use hello::math::{Mat4x4, Point3, Vector3}; use std::rc::Rc; #[derive(Clone)] -struct RGB { - red: f64, - green: f64, - blue: f64, +struct RGB { + red: T, + green: T, + blue: T, } #[derive(Clone)] -struct Texture { +struct Texture { width: usize, height: usize, - pixel: Vec, + pixel: Vec>, } -impl Texture { - fn load_texture() -> Texture { +impl Texture { + fn load_texture() -> Texture { let width = 640; let height = 480; @@ -45,11 +45,11 @@ impl Texture { struct RenderableGeometry { transform: Mat4x4, geometry: Geometry, - texture: Rc, + texture: Rc>, } impl RenderableGeometry { - fn new(transform: Mat4x4, geometry: Geometry, texture: Rc) -> RenderableGeometry { + fn new(transform: Mat4x4, geometry: Geometry, texture: Rc>) -> RenderableGeometry { RenderableGeometry { transform, geometry,