add module 'shapes'

This commit is contained in:
histausse 2022-01-16 13:50:30 +01:00
parent 59cd9727a8
commit 12f8f86a37
Signed by: histausse
GPG key ID: 67486F107F62E9E9
3 changed files with 24 additions and 13 deletions

View file

@ -1,16 +1,15 @@
use std::f64; use std::f64;
use crate::shapes::Point;
pub struct Point(pub f64, pub f64);
pub fn draw_circle(center: Point, radius: f64, context: &web_sys::CanvasRenderingContext2d) { pub fn draw_circle(center: Point, radius: f64, context: &web_sys::CanvasRenderingContext2d) {
context.move_to(center.0+radius, center.1); context.move_to(center.x+radius, center.y);
context context
.arc(center.0, center.1, radius, 0.0, f64::consts::PI * 2.0) .arc(center.x, center.y, radius, 0.0, f64::consts::PI * 2.0)
.unwrap(); .unwrap();
} }
pub fn draw_line(p1: Point, p2: Point, context: &web_sys::CanvasRenderingContext2d) { pub fn draw_line(p1: Point, p2: Point, context: &web_sys::CanvasRenderingContext2d) {
context.move_to(p1.0, p1.1); context.move_to(p1.x, p1.y);
context context
.line_to(p2.0, p2.1); .line_to(p2.x, p2.y);
} }

View file

@ -1,7 +1,10 @@
use wasm_bindgen::prelude::*; use wasm_bindgen::prelude::*;
use wasm_bindgen::JsCast; use wasm_bindgen::JsCast;
pub mod drawing;
use drawing::Point; mod drawing;
mod shapes;
use shapes::Point;
#[wasm_bindgen(start)] #[wasm_bindgen(start)]
pub fn start() { pub fn start() {
@ -21,12 +24,12 @@ pub fn start() {
context.begin_path(); context.begin_path();
drawing::draw_circle(Point(75.0, 75.0), 70.0, &context); drawing::draw_circle(Point {x: 75.0, y: 75.0}, 70.0, &context);
drawing::draw_circle(Point(75.0, 75.0), 35.0, &context); drawing::draw_circle(Point {x: 75.0, y: 75.0}, 35.0, &context);
drawing::draw_circle(Point(60.0, 65.0), 5.0, &context); drawing::draw_circle(Point {x: 60.0, y: 65.0}, 5.0, &context);
drawing::draw_line(Point(0.0, 0.0), Point(150.0, 150.0), &context); drawing::draw_line(Point {x: 0.0, y: 0.0}, Point {x: 150.0, y: 150.0}, &context);
drawing::draw_line(Point(0.0, 150.0), Point(150.0, 0.0), &context); drawing::draw_line(Point {x: 0.0, y: 150.0}, Point {x: 150.0, y: 0.0}, &context);
context.stroke(); context.stroke();
} }

9
src/shapes.rs Normal file
View file

@ -0,0 +1,9 @@
pub struct Point {
pub x: f64,
pub y: f64,
}
pub struct Circle {
pub center: Point,
pub radius: f64,
}