annie
/
artyversary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

finish subtitled5

main
annieversary 2021-08-21 17:59:21 +02:00
parent e7b0735bcf
commit 6e73e65dfc
3 changed files with 208 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/subtitled3/src/main.rs
View File

@ -34,7 +34,7 @@ fn view(app: &App, _model: &Model, frame: Frame) {
let draw = app.draw(); let draw = app.draw();
if frame.nth() == 1 { if frame.nth() == 0 {
draw.background().color(BG); draw.background().color(BG);
} else { } else {
let win = app.window_rect(); let win = app.window_rect();

16
crates/subtitled5/src/main.rs
View File

@ -9,17 +9,25 @@ fn main() {
struct Model { struct Model {
shape: Shapes, shape: Shapes,
count: usize,
} }
fn model(_app: &App) -> Model { fn model(_app: &App) -> Model {
Model { Model {
shape: Shapes::new(), shape: Shapes::new(0),
count: 0,
} }
} }
fn update(app: &App, model: &mut Model, _update: Update) { fn update(app: &App, model: &mut Model, _update: Update) {
if app.elapsed_frames() % 60 == 0 { if app.elapsed_frames() % 60 == 0 && app.elapsed_frames() > 1 {
model.shape = Shapes::new(); if model.count >= 20 {
std::process::exit(0);
}
model.shape = Shapes::new(random_range(1, 7));
model.count += 1;
} }
} }
@ -29,7 +37,7 @@ fn view(app: &App, model: &Model, frame: Frame) {
let draw = app.draw(); let draw = app.draw();
if frame.nth() == 0 { if frame.nth() == 0 {
draw.background().color(BLACK); draw.background().color(BLACK);
} else if frame.nth() % 60 > 40 { } else if frame.nth() % 60 > 30 {
let win = app.window_rect(); let win = app.window_rect();
draw.rect().wh(win.wh()).color(srgba(0.0, 0.0, 0.0, 0.2)); draw.rect().wh(win.wh()).color(srgba(0.0, 0.0, 0.0, 0.2));
} }

228
crates/subtitled5/src/shapes.rs
View File

@ -3,41 +3,115 @@ use nannou::prelude::*;
pub struct Shapes(Vec<Shape>); pub struct Shapes(Vec<Shape>);
impl Shapes { impl Shapes {
pub fn draw(&self, draw: Draw) { pub fn draw(&self, draw: Draw) {
let w = 1.0;
for shape in &self.0 { for shape in &self.0 {
match shape { match shape {
Shape::Triangle { center, radius } => { &Shape::Triangle {
center,
radius,
rotation,
} => {
let points = vec![vec2(0., 1.), vec2(0.866, -0.5), vec2(-0.866, -0.5)] let points = vec![vec2(0., 1.), vec2(0.866, -0.5), vec2(-0.866, -0.5)]
.into_iter() .into_iter()
.map(|v| v * *radius + *center) .map(|v| {
vec2(
v.x * rotation.cos() - v.y * rotation.sin(),
v.x * rotation.sin() + v.y * rotation.cos(),
)
})
.map(|v| v * radius + center)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
draw.polyline().weight(3.).points_closed(points).color(PINK); draw.polyline().weight(w).points_closed(points).color(PINK);
} }
Shape::Circle { center, radius } => { Shape::Circle { center, radius, .. } => {
draw.ellipse() draw.ellipse()
.radius(*radius) .radius(*radius)
.no_fill() .no_fill()
.stroke_weight(3.) .stroke_weight(w)
.xy(*center) .xy(*center)
.stroke_color(PINK); .stroke_color(PINK);
} }
Shape::Line { center, radius } => {} &Shape::Line {
center,
radius,
rotation,
} => {
let points = vec![vec2(-1.0, 0.), vec2(1.0, 0.0)]
.into_iter()
.map(|v| {
vec2(
v.x * rotation.cos() - v.y * rotation.sin(),
v.x * rotation.sin() + v.y * rotation.cos(),
)
})
.map(|v| v * radius + center)
.collect::<Vec<_>>();
draw.line()
.stroke_weight(w)
.start(points[0])
.end(points[1])
.color(PINK);
}
Shape::LongLine { center, radius, .. } => {
draw.line()
.stroke_weight(w)
.start(Vec2::ZERO)
.end(*center + center.normalize() * *radius)
.color(PINK);
}
&Shape::Square {
center,
radius,
rotation,
} => {
let points = vec![
vec2(1.0, 1.0),
vec2(-1.0, 1.0),
vec2(-1.0, -1.0),
vec2(1.0, -1.0),
]
.into_iter()
.map(|v| {
vec2(
v.x * rotation.cos() - v.y * rotation.sin(),
v.x * rotation.sin() + v.y * rotation.cos(),
)
})
.map(|v| v * radius + center)
.collect::<Vec<_>>();
draw.polyline()
.stroke_weight(w)
.points_closed(points)
.color(PINK);
}
} }
} }
} }
pub fn new() -> Self { pub fn new(children: usize) -> Self {
let root = Shape::random(Vec2::ZERO, 100.0); let root = Shape::random(Vec2::ZERO, 100.0);
let mut vec = vec![]; let mut vec = vec![];
for _ in 0..3 { for _ in 0..children {
let (c, r) = root.get_random_point_distance(); let (c, r) = root.get_random_point_distance();
let s = Shape::random(c, r); let s = Shape::random(c, r);
let children = random_range(0, 3); let children = random_range(0, 5.min(children + 2));
for _ in 0..children { for _ in 0..children {
let (c, r) = s.get_random_point_distance(); let (c, r) = s.get_random_point_distance();
let s = Shape::random(c, r); let s = Shape::random(c, r);
let children = random_range(0, 3.min(children + 1));
for _ in 0..children {
let (c, r) = s.get_random_point_distance();
let s = Shape::random(c, r);
vec.push(s);
}
vec.push(s); vec.push(s);
} }
@ -49,58 +123,144 @@ impl Shapes {
} }
} }
macro_rules! sh {
( $($id:ident),* ) => {
pub enum Shape { pub enum Shape {
Triangle { center: Vec2, radius: f32 }, $(
Circle { center: Vec2, radius: f32 }, $id { center: Vec2, radius: f32, rotation: f32 },
Line { center: Vec2, radius: f32 }, )*
} }
};
}
sh!(Triangle, Circle, Line, LongLine, Square);
fn random_sq_rot() -> f32 {
[0.0, PI / 4.0][random_range(0, 2)]
}
fn random_tri_rot() -> f32 {
[0.0, PI / 3.0][random_range(0, 2)]
}
fn random_line_rot() -> f32 {
[0.0, PI / 3.0, PI / 2.0, PI / 4.0, PI][random_range(0, 4)]
}
impl Shape { impl Shape {
fn random(center: Vec2, radius: f32) -> Self { fn random(center: Vec2, radius: f32) -> Self {
match random_range(0, 3) { match random_range(0, 5) {
0 => Self::tri(center, radius), 0 => Self::tri(center, radius, random_tri_rot()),
1 => Self::line(center, radius), 1 => Self::line(center, radius, random_line_rot()),
_ => Self::circ(center, radius), 2 if center.distance(Vec2::ZERO) > 0.01 => Self::long_line(center, radius, 0.0),
3 => Self::square(center, radius, random_sq_rot()),
_ => Self::circ(center, radius, 0.0),
} }
} }
fn tri(center: Vec2, radius: f32) -> Self { fn tri(center: Vec2, radius: f32, rotation: f32) -> Self {
Self::Triangle { center, radius } Self::Triangle {
center,
radius,
rotation,
} }
fn circ(center: Vec2, radius: f32) -> Self {
Self::Circle { center, radius }
} }
fn line(center: Vec2, radius: f32) -> Self { fn circ(center: Vec2, radius: f32, rotation: f32) -> Self {
Self::Line { center, radius } Self::Circle {
center,
radius,
rotation,
}
}
fn line(center: Vec2, radius: f32, rotation: f32) -> Self {
Self::Line {
center,
radius,
rotation,
}
}
fn long_line(center: Vec2, radius: f32, rotation: f32) -> Self {
Self::LongLine {
center,
radius,
rotation,
}
}
fn square(center: Vec2, radius: f32, rotation: f32) -> Self {
Self::Square {
center,
radius,
rotation,
}
} }
fn get_random_point_distance(&self) -> (Vec2, f32) { fn get_random_point_distance(&self) -> (Vec2, f32) {
match self { match self {
Shape::Triangle { center, radius } => { &Shape::Triangle {
center,
radius,
rotation,
} => {
let points = vec![vec2(0., 1.), vec2(0.866, -0.5), vec2(-0.866, -0.5)] let points = vec![vec2(0., 1.), vec2(0.866, -0.5), vec2(-0.866, -0.5)]
.into_iter() .into_iter()
.map(|v| v * *radius + *center) .map(|v| {
vec2(
v.x * rotation.cos() - v.y * rotation.sin(),
v.x * rotation.sin() + v.y * rotation.cos(),
)
})
.map(|v| v * radius + center)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let denom = random_range(1.0, 5.0).floor(); let denom = random_range(1.0, 4.0).floor();
(points[random_range(0, points.len())], radius / denom) (points[random_range(0, points.len())], radius / denom)
} }
Shape::Circle { center, radius } => { &Shape::Circle { center, radius, .. } => {
let point = match random_range(0, 4) { let point = match random_range(0, 4) {
0 => *center + Vec2::X * *radius, 0 => center + Vec2::X * radius,
1 => *center - Vec2::X * *radius, 1 => center - Vec2::X * radius,
2 => *center + Vec2::Y * *radius, 2 => center + Vec2::Y * radius,
_ => *center - Vec2::Y * *radius, _ => center - Vec2::Y * radius,
}; };
let denom = random_range(1.0, 5.0).floor(); let denom = random_range(1.0, 4.0).floor();
(point, radius / denom) (point, radius / denom)
} }
Shape::Line { center, radius } => { &Shape::Line { center, radius, .. } => {
let point = todo!("one of the two vertices"); let point = match random_range(0, 2) {
0 => center - center.normalize() * radius,
_ => center + center.normalize() * radius,
};
let denom = random_range(1.0, 5.0).floor(); let denom = random_range(1.0, 4.0).floor();
(point, radius / denom) (point, radius / denom)
} }
&Shape::LongLine { center, radius, .. } => {
let denom = random_range(1.0, 4.0).floor();
(center + center.normalize() * radius, radius / denom)
}
&Shape::Square {
center,
radius,
rotation,
} => {
let points = vec![
vec2(1.0, 1.0),
vec2(-1.0, 1.0),
vec2(-1.0, -1.0),
vec2(1.0, -1.0),
]
.into_iter()
.map(|v| {
vec2(
v.x * rotation.cos() - v.y * rotation.sin(),
v.x * rotation.sin() + v.y * rotation.cos(),
)
})
.map(|v| v * radius + center)
.collect::<Vec<_>>();
let denom = random_range(1.0, 4.0).floor();
(points[random_range(0, 4)], radius / denom)
}
} }
} }
} }