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

post rebase fixups

Browse source
This commit is contained in:
Chad Brokaw 2023-03-06 11:41:12 -05:00
parent 5e06a4f1c1
commit 69dd838d09
5 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -45,7 +45,7 @@ parking_lot = "0.12"
bytemuck = { version = "1.12.1", features = ["derive"] } bytemuck = { version = "1.12.1", features = ["derive"] }
smallvec = "1.8.0" smallvec = "1.8.0"
moscato = { git = "https://github.com/dfrg/pinot", rev = "59db153" } moscato = { git = "https://github.com/dfrg/pinot", rev = "59db153" }
peniko = { git = "https://github.com/linebender/peniko", rev = "9526fb1afa85493cf537afac76c1e38dc7c76d23" } peniko = { git = "https://github.com/linebender/peniko", rev = "cafdac9a211a0fb2fec5656bd663d1ac770bcc81" }
[workspace.dependencies] [workspace.dependencies]
wgpu = "0.15" wgpu = "0.15"

2
examples/scenes/src/test_scenes.rs
View file

@ -130,7 +130,7 @@ fn animated_text(sb: &mut SceneBuilder, params: &mut SceneParams) {
Color::WHITE, Color::WHITE,
Affine::translate((110.0, 700.0)), Affine::translate((110.0, 700.0)),
// Add a skew to simulate an oblique font. // Add a skew to simulate an oblique font.
Some(Affine::new([1., 0., 20f64.to_radians().tan(), 1., 0., 0.])), Some(Affine::skew(20f64.to_radians().tan(), 0.0)),
&Stroke::new(1.0), &Stroke::new(1.0),
s, s,
); );

2
examples/with_winit/src/lib.rs
View file

@ -268,7 +268,6 @@ fn run(
base_color: None, base_color: None,
}; };
(example_scene.function)(&mut builder, &mut scene_params); (example_scene.function)(&mut builder, &mut scene_params);
builder.finish();
// If the user specifies a base color in the CLI we use that. Otherwise we use any // If the user specifies a base color in the CLI we use that. Otherwise we use any
// color specified by the scene. The default is black. // color specified by the scene. The default is black.
@ -291,7 +290,6 @@ fn run(
transform = transform * Affine::scale(scale_factor); transform = transform * Affine::scale(scale_factor);
} }
builder.append(&fragment, Some(transform)); builder.append(&fragment, Some(transform));
builder.finish();
let surface_texture = render_state let surface_texture = render_state
.surface .surface
.surface .surface

2
src/encoding/draw.rs
View file

@ -15,7 +15,7 @@
// Also licensed under MIT license, at your choice. // Also licensed under MIT license, at your choice.
use bytemuck::{Pod, Zeroable}; use bytemuck::{Pod, Zeroable};
use peniko::{BlendMode, Color, Fill, Stroke}; use peniko::{BlendMode, Color};
use super::Monoid; use super::Monoid;

1
src/encoding/encoding.rs
View file

@ -19,7 +19,6 @@ use super::{
PathEncoder, PathTag, Transform, PathEncoder, PathTag, Transform,
}; };
use bytemuck::{Pod, Zeroable};
use peniko::{kurbo::Shape, BlendMode, BrushRef, ColorStop, Extend, GradientKind}; use peniko::{kurbo::Shape, BlendMode, BrushRef, ColorStop, Extend, GradientKind};
/// Encoded data streams for a scene. /// Encoded data streams for a scene.