library: render: object: add deserialization

By using `enum_dispatch` and deserializing the enums, you can very
easily represent the `Object` in serialized form.
This commit is contained in:
Bruno BELANYI 2020-03-18 15:42:45 +01:00
parent 02874c9c22
commit 67628ec083

View file

@ -1,9 +1,10 @@
use crate::material::MaterialEnum; use crate::material::MaterialEnum;
use crate::shape::ShapeEnum; use crate::shape::ShapeEnum;
use crate::texture::TextureEnum; use crate::texture::TextureEnum;
use serde::Deserialize;
/// An object being rendered in the scene. /// An object being rendered in the scene.
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq, Deserialize)]
pub struct Object { pub struct Object {
pub shape: ShapeEnum, pub shape: ShapeEnum,
pub material: MaterialEnum, pub material: MaterialEnum,
@ -29,22 +30,28 @@ mod test {
use crate::texture::UniformTexture; use crate::texture::UniformTexture;
use crate::Point; use crate::Point;
#[test] fn simple_object() -> Object {
fn new_works() { let shape = Sphere::new(Point::new(5., 0., 0.), 1.);
let shape = Sphere::new(Point::origin(), 1.);
let material = UniformMaterial::new( let material = UniformMaterial::new(
LinearColor::new(0.5, 0.5, 0.5), LinearColor::new(0.5, 0.5, 0.5),
LinearColor::new(1., 1., 1.), LinearColor::new(1., 1., 1.),
0.5, 0.5,
); );
let texture = UniformTexture::new(LinearColor::new(0.25, 0.5, 1.)); let texture = UniformTexture::new(LinearColor::new(0.25, 0.5, 1.));
let object = Object::new( Object::new(shape.into(), material.into(), texture.into())
shape.clone().into(), }
material.clone().into(),
texture.clone().into(), #[test]
fn new_works() {
let shape = Sphere::new(Point::new(5., 0., 0.), 1.);
let material = UniformMaterial::new(
LinearColor::new(0.5, 0.5, 0.5),
LinearColor::new(1., 1., 1.),
0.5,
); );
let texture = UniformTexture::new(LinearColor::new(0.25, 0.5, 1.));
assert_eq!( assert_eq!(
object, simple_object(),
Object { Object {
shape: shape.into(), shape: shape.into(),
material: material.into(), material: material.into(),
@ -52,4 +59,26 @@ mod test {
} }
) )
} }
#[test]
fn deserialization_works() {
let yaml = r#"
shape:
type: sphere
inverted: false
center: [5., 0.0, 0.0]
radius: 1.0
material:
type: uniform
diffuse: {r: 0.5, g: 0.5, b: 0.5}
specular: {r: 1., g: 1., b: 1.}
reflectivity: 0.5
texture:
type: uniform
color: {r: 0.25, g: 0.5, b: 1.}
"#;
let object: Object = serde_yaml::from_str(yaml).unwrap();
let expected = simple_object();
assert_eq!(object, expected)
}
} }