diff options
Diffstat (limited to 'engine/src/material.rs')
| -rw-r--r-- | engine/src/material.rs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/engine/src/material.rs b/engine/src/material.rs index 94ab24e..ed1c139 100644 --- a/engine/src/material.rs +++ b/engine/src/material.rs @@ -1,5 +1,6 @@ use ecs::Component; +use crate::asset::Handle as AssetHandle; use crate::builder; use crate::color::Color; use crate::texture::Texture; @@ -13,9 +14,9 @@ pub struct Material pub ambient: Color<f32>, pub diffuse: Color<f32>, pub specular: Color<f32>, - pub ambient_map: Option<Texture>, - pub diffuse_map: Option<Texture>, - pub specular_map: Option<Texture>, + pub ambient_map: Option<AssetHandle<Texture>>, + pub diffuse_map: Option<AssetHandle<Texture>>, + pub specular_map: Option<AssetHandle<Texture>>, pub shininess: f32, } @@ -42,9 +43,9 @@ pub struct Builder ambient: Color<f32>, diffuse: Color<f32>, specular: Color<f32>, - ambient_map: Option<Texture>, - diffuse_map: Option<Texture>, - specular_map: Option<Texture>, + ambient_map: Option<AssetHandle<Texture>>, + diffuse_map: Option<AssetHandle<Texture>>, + specular_map: Option<AssetHandle<Texture>>, shininess: f32, } @@ -89,7 +90,7 @@ impl Builder } #[must_use] - pub fn ambient_map(mut self, ambient_map: Texture) -> Self + pub fn ambient_map(mut self, ambient_map: AssetHandle<Texture>) -> Self { self.ambient_map = Some(ambient_map); @@ -97,7 +98,7 @@ impl Builder } #[must_use] - pub fn diffuse_map(mut self, diffuse_map: Texture) -> Self + pub fn diffuse_map(mut self, diffuse_map: AssetHandle<Texture>) -> Self { self.diffuse_map = Some(diffuse_map); @@ -105,7 +106,7 @@ impl Builder } #[must_use] - pub fn specular_map(mut self, specular_map: Texture) -> Self + pub fn specular_map(mut self, specular_map: AssetHandle<Texture>) -> Self { self.specular_map = Some(specular_map); |
