Skip to content

Commit

Permalink
update femtovg demo from inlottie repo
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhfan
mhfan committed Jun 18, 2024
1 parent c9b2e90 commit cb7fe09
Showing 1 changed file with 49 additions and 34 deletions.
83 changes: 49 additions & 34 deletions src/nanovg.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dbg!();
let ctx = ContextBuilder::new()
.with_gl_profile(GlProfile::Core).with_gl(GlRequest::Latest)
.build_headless(&EventLoop::new(), PhysicalSize::new(1, 1))?;
.build_headless(&EventLoop::new(), winit::dpi::PhysicalSize::new(1, 1))?;
let ctx = unsafe { ctx.make_current() }.unwrap();
Ok(unsafe { OpenGl::new_from_function(|s| ctx.get_proc_address(s) as *const _) }?)
Expand Down Expand Up @@ -136,6 +136,7 @@ fn main() -> Result<(), Box<dyn Error>> {
#[cfg(feature = "lottie")] let mut lottie = None;
#[cfg(feature = "lottie")] use inlottie::schema::Animation;

let mut do_test = false;
let mut usvg_opts = usvg::Options::default();
usvg_opts.fontdb_mut().load_system_fonts(); let mut tree = None;
let path = std::env::args().nth(1).unwrap_or("data/tiger.svg".to_owned());
Expand All @@ -144,11 +145,18 @@ fn main() -> Result<(), Box<dyn Error>> {
match path.rfind('.').map_or("", |i| &path[1 + i..]) {
#[cfg(feature = "lottie")]
"json" => lottie = Animation::from_reader(fs::File::open(&path)?).ok(),
//.map(|lottie| { expand_central(&mut canvas, window.inner_size(),
// (lottie.w as _, lottie.h as _)); lottie }),
#[cfg(feature = "rive-rs")]
"riv" => scene = NanoVG::new_scene(&fs::read(&path)?),
"riv" => scene = NanoVG::new_scene(&fs::read(&path)?)/*.map(|scene| {
let size = window.inner_size();
viewport.resize(size.width, size.height);
canvas.set_size(size.width, size.height, 1.); scene })*/,
"svg" => tree = usvg::Tree::from_data(&fs::read(&path)?, &usvg_opts).ok(),
//.map(|tree| { expand_central(&mut canvas, window.inner_size(),
// (tree.size().width(), tree.size().height())); tree }),
_ => { let size = window.inner_size();
canvas.set_size(size.width, size.height, 1.);
canvas.set_size(size.width, size.height, 1.); do_test = true;
eprintln!("File format is not supported: {path}");
}
}
Expand All @@ -159,10 +167,10 @@ fn main() -> Result<(), Box<dyn Error>> {
//event_loop.set_control_flow(ControlFlow::Poll);

event_loop.run(|event, elwt| {
let mut resize_canvas = |csize: (f32, f32)| {
let wsize = window.inner_size();
let mut expand_central = /*<T: Renderer>(canvas: &mut Canvas<T>,
wsize: winit::dpi::PhysicalSize<u32>, */|csize: (f32, f32)| {
canvas.reset_transform(); let wsize = window.inner_size();
let wsize = (wsize.width as f32, wsize.height as f32);
canvas.reset_transform(); mouse = (0., 0.);
let scale = (wsize.0 / csize.0).min(wsize.1 / csize.1) * 0.95;
canvas.translate((wsize.0 - csize.0 * scale) / 2., (wsize.1 - csize.1 * scale) / 2.);
canvas.set_size (wsize.0 as _, wsize.1 as _, 1.); // window.scale_factor() as _
Expand All @@ -179,15 +187,15 @@ fn main() -> Result<(), Box<dyn Error>> {
size.height.try_into().unwrap());

if let Some(tree) = &tree {
resize_canvas((tree.size().width(), tree.size().height()));
expand_central((tree.size().width(), tree.size().height()));
}
#[cfg(feature = "lottie")] if let Some(lottie) = &lottie {
resize_canvas((lottie.w as _, lottie.h as _));
expand_central((lottie.w as _, lottie.h as _));
}
#[cfg(feature = "rive-rs")] if scene.is_some() { //mouse = (0., 0.);
#[cfg(feature = "rive-rs")] if scene.is_some() {
viewport.resize(size.width, size.height);
canvas.set_size(size.width, size.height, 1.);
}
} mouse = (0., 0.);
}

WindowEvent::KeyboardInput { event, .. } => {
Expand Down Expand Up @@ -259,46 +267,46 @@ fn main() -> Result<(), Box<dyn Error>> {
match path.extension().and_then(|ext| ext.to_str()) {
Some("svg") => tree = usvg::Tree::from_data(&file,
&usvg_opts).ok().map(|tree| {
resize_canvas((tree.size().width(), tree.size().height())); tree
expand_central((tree.size().width(), tree.size().height())); tree
}),

#[cfg(feature = "rive-rs")]
Some("riv") => scene = NanoVG::new_scene(&file),
Some("riv") => scene = NanoVG::new_scene(&file).map(|scene| {
let size = window.inner_size();
viewport.resize(size.width, size.height);
canvas.set_size(size.width, size.height, 1.); scene }),
#[cfg(feature = "lottie")]
Some("json") => lottie = Animation::from_reader(
fs::File::open(&path).unwrap()).ok().map(|lottie| {
resize_canvas((lottie.w as _, lottie.h as _)); lottie }),
expand_central((lottie.w as _, lottie.h as _)); lottie }),
_ => eprintln!("File format is not supported: {}", path.display()),
}
} mouse = (0., 0.);

//let mut size = window.inner_size(); size.width += 1; size.height += 1;
//let _ = window.request_inner_size(size);
window.request_redraw();
}

WindowEvent::RedrawRequested => {
#[cfg(any(feature = "rive-rs", feature = "lottie"))]
let elapsed = prevt.elapsed(); prevt = Instant::now();
let _elapsed = prevt.elapsed(); prevt = Instant::now();
canvas.clear_rect(0, 0, canvas.width(), canvas.height(),
Color::rgbf(0.4, 0.4, 0.4)); // XXX: to clear viewport/viewbox only?

#[cfg(feature = "rive-rs")] if let Some(scene) = &mut scene {
if !scene.advance_and_maybe_draw(&mut NanoVG::new(&mut canvas),
elapsed, &mut viewport) { return }
_elapsed, &mut viewport) { return }
}
#[cfg(feature = "lottie")] if let Some(lottie) = &mut lottie {
if !(lottie.render_next_frame(&mut canvas,
elapsed.as_secs_f32())) { return }
_elapsed.as_secs_f32())) { return }
// TODO: draw frame time (lottie.fnth) on screen?
}
if let Some(tree) = &tree {
render_nodes(&mut canvas, &mouse, tree.root(),
&usvg::Transform::identity());
}/* else {
canvas.clear_rect(0, 0, canvas.width(), canvas.height(),
Color::rgbf(0.4, 0.4, 0.4));
_some_test_case(&mut canvas);
} */
}

if do_test { _some_test_case(&mut canvas); }

perf.render(&mut canvas, 3., 3.); canvas.flush();
// Tell renderer to execute all drawing commands
Expand Down Expand Up @@ -531,27 +539,34 @@ fn _some_test_case<T: Renderer>(canvas: &mut Canvas<T>) {
let (w, h) = (canvas.width(), canvas.height());
let (w, h) = (w as f32, h as f32);

let imgid = canvas.create_image_empty(w as _, h as _,
femtovg::PixelFormat::Rgba8, femtovg::ImageFlags::FLIP_Y).unwrap();
canvas.set_render_target(femtovg::RenderTarget::Image(imgid));
canvas.clear_rect(0, 0, w as _, h as _, femtovg::Color::rgbaf(0., 0., 0., 0.));

let (lx, ty) = (w / 4., h / 4.);
let mut path = Path::new(); path.rect(lx, ty, w / 2., h / 2.);
canvas.stroke_path(&path, &Paint::color(Color::rgbaf(0., 0., 1., 1.)).with_line_width(1.));
canvas. fill_path(&path, &Paint::color(Color::rgbaf(1., 0.5, 0.5, 1.)));

/* let imgid = canvas.create_image_empty(w as _, h as _,
let mskid = canvas.create_image_empty(w as _, h as _,
femtovg::PixelFormat::Rgba8, femtovg::ImageFlags::FLIP_Y).unwrap();
canvas.set_render_target(femtovg::RenderTarget::Image(imgid));
canvas.clear_rect(0, 0, w as _, h as _, femtovg::Color::rgbaf(0., 0., 0., 0.)); */
canvas.set_render_target(femtovg::RenderTarget::Image(mskid));
canvas.clear_rect(0, 0, w as _, h as _, femtovg::Color::rgbaf(0., 0., 0., 0.));

canvas.fill_path(&path, &Paint::color(Color::rgbaf(1., 0.5, 0.5, 1.)));
canvas.global_composite_operation(femtovg::CompositeOperation::DestinationIn);
let mut path = Path::new();

let (rx, by) = (w - lx, h - ty - 10.);
let (mut path, rx, by) = (Path::new(), w - lx, h - ty - 10.);
path.move_to(w / 2., ty); path.line_to(rx, by); path.line_to(lx, by); path.close();
canvas.fill_path(&path, &Paint::color(Color::rgbaf(0., 1., 0., 1.)));

path = Path::new(); path.rect(0., 0., w, h);
canvas.global_composite_operation(femtovg::CompositeOperation::DestinationIn);
canvas.set_render_target(femtovg::RenderTarget::Image(imgid));
let paint = femtovg::Paint::image(mskid, 0., 0., w, h, 0., 1.);
canvas.fill_path(&path, &paint); canvas.flush(); canvas.delete_image(mskid);

canvas.global_composite_operation(femtovg::CompositeOperation::SourceOver);
/* let mut path = Path::new(); path.rect(0., 0., w, h);
let paint = femtovg::Paint::image(imgid, 0., 0., w, h, 0., 1.);
canvas.set_render_target(femtovg::RenderTarget::Screen);
canvas.fill_path(&path, &paint); canvas.flush(); canvas.delete_image(imgid); */
let paint = femtovg::Paint::image(imgid, 0., 0., w, h, 0., 1.);
canvas.fill_path(&path, &paint); canvas.flush(); canvas.delete_image(imgid);
}

0 comments on commit cb7fe09

Please sign in to comment.