feat(engine): add asset management

1 files changed, 35 insertions, 80 deletions

diff --git a/engine/src/material.rs b/engine/src/material.rs
index e368519..fd4aa41 100644
--- a/engine/src/material.rs
+++ b/engine/src/material.rs
@@ -1,21 +1,19 @@
 use ecs::Component;
 
 use crate::color::Color;
-use crate::data_types::dimens::Dimens;
-use crate::texture::{Id as TextureId, Texture};
+use crate::texture::Texture;
 use crate::util::builder;
 
-#[derive(Debug, Clone, Component)]
+#[derive(Debug, Clone)]
 #[non_exhaustive]
 pub struct Material
 {
     pub ambient: Color<f32>,
     pub diffuse: Color<f32>,
     pub specular: Color<f32>,
-    pub ambient_map: TextureId,
-    pub diffuse_map: TextureId,
-    pub specular_map: TextureId,
-    pub textures: Vec<Texture>,
+    pub ambient_map: Option<Texture>,
+    pub diffuse_map: Option<Texture>,
+    pub specular_map: Option<Texture>,
     pub shininess: f32,
 }
 
@@ -27,17 +25,24 @@ impl Material
     }
 }
 
+impl Default for Material
+{
+    fn default() -> Self
+    {
+        Self::builder().build()
+    }
+}
+
 /// [`Material`] builder.
 #[derive(Debug, Clone)]
 pub struct Builder
 {
-    ambient: Option<Color<f32>>,
-    diffuse: Option<Color<f32>>,
-    specular: Option<Color<f32>>,
-    ambient_map: Option<TextureId>,
-    diffuse_map: Option<TextureId>,
-    specular_map: Option<TextureId>,
-    textures: Vec<Texture>,
+    ambient: Color<f32>,
+    diffuse: Color<f32>,
+    specular: Color<f32>,
+    ambient_map: Option<Texture>,
+    diffuse_map: Option<Texture>,
+    specular_map: Option<Texture>,
     shininess: f32,
 }
 
@@ -47,13 +52,12 @@ impl Builder
     pub fn new() -> Self
     {
         Self {
-            ambient: None,
-            diffuse: None,
-            specular: None,
+            ambient: Color::WHITE_F32,
+            diffuse: Color::WHITE_F32,
+            specular: Color::WHITE_F32,
             ambient_map: None,
             diffuse_map: None,
             specular_map: None,
-            textures: Vec::new(),
             shininess: 32.0,
         }
     }
@@ -61,7 +65,7 @@ impl Builder
     #[must_use]
     pub fn ambient(mut self, ambient: Color<f32>) -> Self
     {
-        self.ambient = Some(ambient);
+        self.ambient = ambient;
 
         self
     }
@@ -69,7 +73,7 @@ impl Builder
     #[must_use]
     pub fn diffuse(mut self, diffuse: Color<f32>) -> Self
     {
-        self.diffuse = Some(diffuse);
+        self.diffuse = diffuse;
 
         self
     }
@@ -77,13 +81,13 @@ impl Builder
     #[must_use]
     pub fn specular(mut self, specular: Color<f32>) -> Self
     {
-        self.specular = Some(specular);
+        self.specular = specular;
 
         self
     }
 
     #[must_use]
-    pub fn ambient_map(mut self, ambient_map: TextureId) -> Self
+    pub fn ambient_map(mut self, ambient_map: Texture) -> Self
     {
         self.ambient_map = Some(ambient_map);
 
@@ -91,7 +95,7 @@ impl Builder
     }
 
     #[must_use]
-    pub fn diffuse_map(mut self, diffuse_map: TextureId) -> Self
+    pub fn diffuse_map(mut self, diffuse_map: Texture) -> Self
     {
         self.diffuse_map = Some(diffuse_map);
 
@@ -99,7 +103,7 @@ impl Builder
     }
 
     #[must_use]
-    pub fn specular_map(mut self, specular_map: TextureId) -> Self
+    pub fn specular_map(mut self, specular_map: Texture) -> Self
     {
         self.specular_map = Some(specular_map);
 
@@ -107,22 +111,6 @@ impl Builder
     }
 
     #[must_use]
-    pub fn textures(mut self, textures: impl IntoIterator<Item = Texture>) -> Self
-    {
-        self.textures = textures.into_iter().collect();
-
-        self
-    }
-
-    #[must_use]
-    pub fn texture(mut self, texture: Texture) -> Self
-    {
-        self.textures.push(texture);
-
-        self
-    }
-
-    #[must_use]
     pub fn shininess(mut self, shininess: f32) -> Self
     {
         self.shininess = shininess;
@@ -135,43 +123,15 @@ impl Builder
     /// # Panics
     /// Will panic if no ambient map, diffuse map or specular map is set.
     #[must_use]
-    pub fn build(mut self) -> Material
+    pub fn build(self) -> Material
     {
-        let ambient_map = self.ambient_map.unwrap_or_else(|| {
-            let texture = create_1x1_white_texture();
-            let texture_id = texture.id();
-
-            self.textures.push(texture);
-
-            texture_id
-        });
-
-        let diffuse_map = self.diffuse_map.unwrap_or_else(|| {
-            let texture = create_1x1_white_texture();
-            let texture_id = texture.id();
-
-            self.textures.push(texture);
-
-            texture_id
-        });
-
-        let specular_map = self.specular_map.unwrap_or_else(|| {
-            let texture = create_1x1_white_texture();
-            let texture_id = texture.id();
-
-            self.textures.push(texture);
-
-            texture_id
-        });
-
         Material {
-            ambient: self.ambient.unwrap_or(Color::WHITE_F32),
-            diffuse: self.diffuse.unwrap_or(Color::WHITE_F32),
-            specular: self.specular.unwrap_or(Color::WHITE_F32),
-            ambient_map,
-            diffuse_map,
-            specular_map,
-            textures: self.textures,
+            ambient: self.ambient,
+            diffuse: self.diffuse,
+            specular: self.specular,
+            ambient_map: self.ambient_map,
+            diffuse_map: self.diffuse_map,
+            specular_map: self.specular_map,
             shininess: self.shininess,
         }
     }
@@ -206,8 +166,3 @@ impl Flags
         FlagsBuilder::default()
     }
 }
-
-fn create_1x1_white_texture() -> Texture
-{
-    Texture::new_from_color(&Dimens { width: 1, height: 1 }, &Color::WHITE_U8)
-}