alex/vello
1
0
Fork 0
mirror of https://github.com/italicsjenga/vello.git synced 2025-01-08 20:01:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Address review feedback

Browse source
This commit is contained in:
Raph Levien 2023-05-31 17:44:30 -07:00
parent f60cb0c31b
commit 6ed6e4a940
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
examples/scenes/src/mmark.rs
View file

@ -1,4 +1,10 @@
//! A benchmark based on MotionMark 1.2's path benchmark. //! A benchmark based on MotionMark 1.2's path benchmark.
//! This is roughly comparable to:
//!
//! https://browserbench.org/MotionMark1.2/developer.html?warmup-length=2000&warmup-frame-count=30&first-frame-minimum-length=0&test-interval=15&display=minimal&tiles=big&controller=adaptive&frame-rate=50&time-measurement=performance&suite-name=MotionMark&test-name=Paths&complexity=1
//!
//! However, at this point it cannot be directly compared, as we don't accurately
//! implement the stroke style parameters, and it has not been carefully validated.
use std::cmp::Ordering; use std::cmp::Ordering;
@ -31,7 +37,7 @@ struct Element {
} }
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
struct GridPoint((i64, i64)); struct GridPoint(i64, i64);
impl MMark { impl MMark {
pub fn new(n: usize) -> MMark { pub fn new(n: usize) -> MMark {
@ -49,7 +55,7 @@ impl MMark {
.elements .elements
.last() .last()
.map(|e| e.grid_point) .map(|e| e.grid_point)
.unwrap_or(GridPoint((GRID_WIDTH / 2, GRID_HEIGHT / 2))); .unwrap_or(GridPoint(GRID_WIDTH / 2, GRID_HEIGHT / 2));
self.elements.extend((old_n..n).map(|_| { self.elements.extend((old_n..n).map(|_| {
let element = Element::new_rand(last); let element = Element::new_rand(last);
last = element.grid_point; last = element.grid_point;
@ -173,23 +179,23 @@ impl GridPoint {
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
let offset = OFFSETS.choose(&mut rng).unwrap(); let offset = OFFSETS.choose(&mut rng).unwrap();
let mut x = last.0 .0 + offset.0; let mut x = last.0 + offset.0;
if !(0..=GRID_WIDTH).contains(&x) { if !(0..=GRID_WIDTH).contains(&x) {
x -= offset.0 * 2; x -= offset.0 * 2;
} }
let mut y = last.0 .1 + offset.1; let mut y = last.1 + offset.1;
if !(0..=GRID_HEIGHT).contains(&y) { if !(0..=GRID_HEIGHT).contains(&y) {
y -= offset.1 * 2; y -= offset.1 * 2;
} }
GridPoint((x, y)) GridPoint(x, y)
} }
fn coordinate(&self) -> Point { fn coordinate(&self) -> Point {
let scale_x = WIDTH as f64 / ((GRID_WIDTH + 1) as f64); let scale_x = WIDTH as f64 / ((GRID_WIDTH + 1) as f64);
let scale_y = HEIGHT as f64 / ((GRID_HEIGHT + 1) as f64); let scale_y = HEIGHT as f64 / ((GRID_HEIGHT + 1) as f64);
Point::new( Point::new(
(self.0 .0 as f64 + 0.5) * scale_x, (self.0 as f64 + 0.5) * scale_x,
100.0 + (self.0 .1 as f64 + 0.5) * scale_y, 100.0 + (self.1 as f64 + 0.5) * scale_y,
) )
} }
} }