summaryrefslogtreecommitdiff
path: root/engine/src/material.rs
diff options
context:
space:
mode:
Diffstat (limited to 'engine/src/material.rs')
-rw-r--r--engine/src/material.rs15
1 files changed, 8 insertions, 7 deletions
diff --git a/engine/src/material.rs b/engine/src/material.rs
index 59f0a6a..dd5a460 100644
--- a/engine/src/material.rs
+++ b/engine/src/material.rs
@@ -1,7 +1,8 @@
use crate::asset::Handle as AssetHandle;
use crate::builder;
-use crate::color::Color;
+use crate::color::{Color, Rgb};
use crate::ecs::Component;
+use crate::reflection::Reflection;
use crate::texture::Texture;
pub mod asset;
@@ -21,7 +22,7 @@ pub struct Material
impl Material
{
- pub const fn builder() -> Builder
+ pub fn builder() -> Builder
{
Builder::new()
}
@@ -51,12 +52,12 @@ pub struct Builder
impl Builder
{
#[must_use]
- pub const fn new() -> Self
+ pub fn new() -> Self
{
Self {
- ambient: Color::WHITE_F32,
- diffuse: Color::WHITE_F32,
- specular: Color::WHITE_F32,
+ ambient: Color::Rgb(Rgb::<f32>::white()),
+ diffuse: Color::Rgb(Rgb::<f32>::white()),
+ specular: Color::Rgb(Rgb::<f32>::white()),
ambient_map: None,
diffuse_map: None,
specular_map: None,
@@ -150,7 +151,7 @@ impl Default for Builder
builder! {
/// Material flags.
#[builder(name = FlagsBuilder, derives = (Debug, Clone))]
-#[derive(Debug, Clone, Component)]
+#[derive(Debug, Clone, Component, Reflection)]
#[non_exhaustive]
pub struct Flags
{