Fix examples using `Mesh2D`
This commit is contained in:
Héctor Ramón Jiménez
parent
96b36d0f9e
commit
1beeaf9db5
|
|
@ -102,7 +102,7 @@ mod bezier {
|
|||
// Draw rectangle border with lyon.
|
||||
basic_shapes::stroke_rectangle(
|
||||
&lyon::math::Rect::new(
|
||||
lyon::math::Point::new(bounds.x + 0.5, bounds.y + 0.5),
|
||||
lyon::math::Point::new(0.5, 0.5),
|
||||
lyon::math::Size::new(
|
||||
bounds.width - 1.0,
|
||||
bounds.height - 1.0,
|
||||
|
|
@ -121,48 +121,35 @@ mod bezier {
|
|||
|
||||
for curve in self.curves {
|
||||
path_builder.move_to(lyon::math::Point::new(
|
||||
curve.from.x + bounds.x,
|
||||
curve.from.y + bounds.y,
|
||||
curve.from.x,
|
||||
curve.from.y,
|
||||
));
|
||||
|
||||
path_builder.quadratic_bezier_to(
|
||||
lyon::math::Point::new(
|
||||
curve.control.x + bounds.x,
|
||||
curve.control.y + bounds.y,
|
||||
),
|
||||
lyon::math::Point::new(
|
||||
curve.to.x + bounds.x,
|
||||
curve.to.y + bounds.y,
|
||||
),
|
||||
lyon::math::Point::new(curve.control.x, curve.control.y),
|
||||
lyon::math::Point::new(curve.to.x, curve.to.y),
|
||||
);
|
||||
}
|
||||
|
||||
match self.state.pending {
|
||||
None => {}
|
||||
Some(Pending::One { from }) => {
|
||||
path_builder.move_to(lyon::math::Point::new(
|
||||
from.x + bounds.x,
|
||||
from.y + bounds.y,
|
||||
));
|
||||
path_builder
|
||||
.move_to(lyon::math::Point::new(from.x, from.y));
|
||||
path_builder.line_to(lyon::math::Point::new(
|
||||
cursor_position.x,
|
||||
cursor_position.y,
|
||||
cursor_position.x - bounds.x,
|
||||
cursor_position.y - bounds.y,
|
||||
));
|
||||
}
|
||||
Some(Pending::Two { from, to }) => {
|
||||
path_builder.move_to(lyon::math::Point::new(
|
||||
from.x + bounds.x,
|
||||
from.y + bounds.y,
|
||||
));
|
||||
path_builder
|
||||
.move_to(lyon::math::Point::new(from.x, from.y));
|
||||
path_builder.quadratic_bezier_to(
|
||||
lyon::math::Point::new(
|
||||
cursor_position.x,
|
||||
cursor_position.y,
|
||||
),
|
||||
lyon::math::Point::new(
|
||||
to.x + bounds.x,
|
||||
to.y + bounds.y,
|
||||
cursor_position.x - bounds.x,
|
||||
cursor_position.y - bounds.y,
|
||||
),
|
||||
lyon::math::Point::new(to.x, to.y),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -186,10 +173,13 @@ mod bezier {
|
|||
)
|
||||
.unwrap();
|
||||
|
||||
let mesh = Primitive::Mesh2D(Arc::new(Mesh2D {
|
||||
vertices: buffer.vertices,
|
||||
indices: buffer.indices,
|
||||
}));
|
||||
let mesh = Primitive::Mesh2D {
|
||||
origin: Point::new(bounds.x, bounds.y),
|
||||
buffers: Arc::new(Mesh2D {
|
||||
vertices: buffer.vertices,
|
||||
indices: buffer.indices,
|
||||
}),
|
||||
};
|
||||
|
||||
(
|
||||
Primitive::Clip {
|
||||
|
|
|
|||
|
|
@ -69,72 +69,75 @@ mod rainbow {
|
|||
|
||||
let posn_center = {
|
||||
if b.contains(cursor_position) {
|
||||
[cursor_position.x, cursor_position.y]
|
||||
[cursor_position.x - b.x, cursor_position.y - b.y]
|
||||
} else {
|
||||
[b.x + (b.width / 2.0), b.y + (b.height / 2.0)]
|
||||
[b.width / 2.0, b.height / 2.0]
|
||||
}
|
||||
};
|
||||
|
||||
let posn_tl = [b.x, b.y];
|
||||
let posn_t = [b.x + (b.width / 2.0), b.y];
|
||||
let posn_tr = [b.x + b.width, b.y];
|
||||
let posn_r = [b.x + b.width, b.y + (b.height / 2.0)];
|
||||
let posn_br = [b.x + b.width, b.y + b.height];
|
||||
let posn_b = [b.x + (b.width / 2.0), b.y + b.height];
|
||||
let posn_bl = [b.x, b.y + b.height];
|
||||
let posn_l = [b.x, b.y + (b.height / 2.0)];
|
||||
let posn_tl = [0.0, 0.0];
|
||||
let posn_t = [b.width / 2.0, 0.0];
|
||||
let posn_tr = [b.width, 0.0];
|
||||
let posn_r = [b.width, b.height / 2.0];
|
||||
let posn_br = [b.width, b.height];
|
||||
let posn_b = [(b.width / 2.0), b.height];
|
||||
let posn_bl = [0.0, b.height];
|
||||
let posn_l = [0.0, b.height / 2.0];
|
||||
|
||||
(
|
||||
Primitive::Mesh2D(std::sync::Arc::new(Mesh2D {
|
||||
vertices: vec![
|
||||
Vertex2D {
|
||||
position: posn_center,
|
||||
color: [1.0, 1.0, 1.0, 1.0],
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_tl,
|
||||
color: color_r,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_t,
|
||||
color: color_o,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_tr,
|
||||
color: color_y,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_r,
|
||||
color: color_g,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_br,
|
||||
color: color_gb,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_b,
|
||||
color: color_b,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_bl,
|
||||
color: color_i,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_l,
|
||||
color: color_v,
|
||||
},
|
||||
],
|
||||
indices: vec![
|
||||
0, 1, 2, // TL
|
||||
0, 2, 3, // T
|
||||
0, 3, 4, // TR
|
||||
0, 4, 5, // R
|
||||
0, 5, 6, // BR
|
||||
0, 6, 7, // B
|
||||
0, 7, 8, // BL
|
||||
0, 8, 1, // L
|
||||
],
|
||||
})),
|
||||
Primitive::Mesh2D {
|
||||
origin: Point::new(b.x, b.y),
|
||||
buffers: std::sync::Arc::new(Mesh2D {
|
||||
vertices: vec![
|
||||
Vertex2D {
|
||||
position: posn_center,
|
||||
color: [1.0, 1.0, 1.0, 1.0],
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_tl,
|
||||
color: color_r,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_t,
|
||||
color: color_o,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_tr,
|
||||
color: color_y,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_r,
|
||||
color: color_g,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_br,
|
||||
color: color_gb,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_b,
|
||||
color: color_b,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_bl,
|
||||
color: color_i,
|
||||
},
|
||||
Vertex2D {
|
||||
position: posn_l,
|
||||
color: color_v,
|
||||
},
|
||||
],
|
||||
indices: vec![
|
||||
0, 1, 2, // TL
|
||||
0, 2, 3, // T
|
||||
0, 3, 4, // TR
|
||||
0, 4, 5, // R
|
||||
0, 5, 6, // BR
|
||||
0, 6, 7, // B
|
||||
0, 7, 8, // BL
|
||||
0, 8, 1, // L
|
||||
],
|
||||
}),
|
||||
},
|
||||
MouseCursor::OutOfBounds,
|
||||
)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue