From 86084730051d28e2c73b2f091f0f1394ae82a981 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 30 Jan 2024 10:59:28 +0100 Subject: [PATCH] Integrate `color` model into `all` --- Cargo.lock | 1 + models/all/Cargo.toml | 3 +++ models/all/src/lib.rs | 1 + 3 files changed, 5 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index e428d2605..92139a4e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,6 +59,7 @@ dependencies = [ name = "all" version = "0.1.0" dependencies = [ + "color", "cuboid", "fj", "holes", diff --git a/models/all/Cargo.toml b/models/all/Cargo.toml index 8963edec7..db94c03e3 100644 --- a/models/all/Cargo.toml +++ b/models/all/Cargo.toml @@ -6,6 +6,9 @@ edition = "2021" [dependencies.fj] path = "../../crates/fj" +[dependencies.color] +path = "../color" + [dependencies.cuboid] path = "../cuboid" diff --git a/models/all/src/lib.rs b/models/all/src/lib.rs index 47d9cf644..df07a2efd 100644 --- a/models/all/src/lib.rs +++ b/models/all/src/lib.rs @@ -19,6 +19,7 @@ pub fn model(services: &mut Services) -> Solid { let angle_rad = Scalar::PI / 6.; let models = [ + color::model(services), cuboid::model([1., 2., 3.], services), holes::model(0.5, services), spacer::model(2., 1., 1., services),