From e315d00bb37ac26f5bb85176c55799b0ba89062b Mon Sep 17 00:00:00 2001 From: annieversary Date: Sat, 28 Aug 2021 00:20:17 +0200 Subject: [PATCH] move draw_exterior into utils --- crates/subtitled9/src/main.rs | 39 ++--------------------------------- crates/utils/src/drawing.rs | 37 +++++++++++++++++++++++++++++++++ crates/utils/src/lib.rs | 1 + 3 files changed, 40 insertions(+), 37 deletions(-) create mode 100644 crates/utils/src/drawing.rs diff --git a/crates/subtitled9/src/main.rs b/crates/subtitled9/src/main.rs index ba28aba..25417bd 100644 --- a/crates/subtitled9/src/main.rs +++ b/crates/subtitled9/src/main.rs @@ -63,8 +63,8 @@ fn view(app: &App, _model: &Model, frame: Frame) { } } - // draw exteriors - draw_exterior(&draw); + // draw exterior + drawing::draw_exterior(&draw, 200.0, SNOW); // outer draw for i in 0..50 { @@ -80,38 +80,3 @@ fn view(app: &App, _model: &Model, frame: Frame) { draw.to_frame(app, &frame).unwrap(); utils::record::record(app, &frame); } - -fn draw_exterior(draw: &Draw) { - draw.quad() - .points( - vec2(200.0, -1000.0), - vec2(200.0, 1000.0), - vec2(1000.0, 1000.0), - vec2(1000.0, -1000.0), - ) - .color(SNOW); - draw.quad() - .points( - vec2(-200.0, -1000.0), - vec2(-200.0, 1000.0), - vec2(-1000.0, 1000.0), - vec2(-1000.0, -1000.0), - ) - .color(SNOW); - draw.quad() - .points( - vec2(-1000.0, 200.0), - vec2(-1000.0, 1000.0), - vec2(1000.0, 1000.0), - vec2(1000.0, 200.0), - ) - .color(SNOW); - draw.quad() - .points( - vec2(-1000.0, -200.0), - vec2(-1000.0, -1000.0), - vec2(1000.0, -1000.0), - vec2(1000.0, -200.0), - ) - .color(SNOW); -} diff --git a/crates/utils/src/drawing.rs b/crates/utils/src/drawing.rs new file mode 100644 index 0000000..2f8b270 --- /dev/null +++ b/crates/utils/src/drawing.rs @@ -0,0 +1,37 @@ +use nannou::{color::IntoLinSrgba, draw::properties::ColorScalar, prelude::*}; + +/// Draws the opposite of a box +pub fn draw_exterior(draw: &Draw, size: f32, color: impl IntoLinSrgba + Clone) { + draw.quad() + .points( + vec2(size, -1000.0), + vec2(size, 1000.0), + vec2(1000.0, 1000.0), + vec2(1000.0, -1000.0), + ) + .color(color.clone()); + draw.quad() + .points( + vec2(-size, -1000.0), + vec2(-size, 1000.0), + vec2(-1000.0, 1000.0), + vec2(-1000.0, -1000.0), + ) + .color(color.clone()); + draw.quad() + .points( + vec2(-1000.0, size), + vec2(-1000.0, 1000.0), + vec2(1000.0, 1000.0), + vec2(1000.0, size), + ) + .color(color.clone()); + draw.quad() + .points( + vec2(-1000.0, -size), + vec2(-1000.0, -1000.0), + vec2(1000.0, -1000.0), + vec2(1000.0, -size), + ) + .color(color); +} diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs index 8c7fa7c..45e8a87 100644 --- a/crates/utils/src/lib.rs +++ b/crates/utils/src/lib.rs @@ -1,4 +1,5 @@ pub mod color; +pub mod drawing; pub mod record; pub mod sequences;