diff --git a/CHANGELOG.md b/CHANGELOG.md index d81d746d..6c1ffe8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -135,7 +135,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * Refactored the interface for `egui::app::App`. * Windows are now constrained to the screen. * `Context::begin_frame()` no longer returns a `Ui`. Instead put your widgets into a `SidePanel`, `TopPanel`, `CentralPanel`, `Window` or `Area`. -* `Context::end_frame()` now returns paint commands that need to be converted to triangles with `Context::tesselate()`. +* `Context::end_frame()` now returns paint commands that need to be converted to triangles with `Context::tessellate()`. * Anti-aliasing is now off by default in debug builds. ### Removed 🔥 @@ -153,7 +153,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * Unicode characters in labels (limited by [what the default font supports](https://fonts.google.com/specimen/Comfortaa#glyphs)) * Simple drop-down combo box menu * Logarithmic sliders -* Optimization: coarse culling in the tesselator +* Optimization: coarse culling in the tessellator * CHANGED: switch argument order of `ui.checkbox` and `ui.radio` ## 0.1.4 - 2020-09-08 diff --git a/README.md b/README.md index 8d7b663b..820bcdbe 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ Loop: * Gather input (mouse, touches, keyboard, screen size, etc) and give it to Egui * Run application code (Immediate Mode GUI) -* Tell Egui to tesselate the frame graphics to a triangle mesh +* Tell Egui to tessellate the frame graphics to a triangle mesh * Render the triangle mesh with your favorite graphics API (see [OpenGL example](https://github.com/emilk/egui/blob/master/egui_glium/src/painter.rs)) ## Integrations @@ -174,7 +174,7 @@ loop { egui_ctx.begin_frame(raw_input); my_app.ui(&mut egui_ctx); // add panels, windows and widgets to `egui_ctx` here let (output, paint_commands) = egui_ctx.end_frame(); - let paint_jobs = egui_ctx.tesselate(paint_commands); // create triangles to paint + let paint_jobs = egui_ctx.tessellate(paint_commands); // create triangles to paint my_integration.paint(paint_jobs); my_integration.set_cursor_icon(output.cursor_icon); // Also see `egui::Output` for more diff --git a/egui/benches/benchmark.rs b/egui/benches/benchmark.rs index d0cb5e9f..28253aa0 100644 --- a/egui/benches/benchmark.rs +++ b/egui/benches/benchmark.rs @@ -38,8 +38,8 @@ pub fn criterion_benchmark(c: &mut Criterion) { demo_windows.ui(&ctx, &Default::default(), &mut None, |_ui| {}); let (_, paint_commands) = ctx.end_frame(); - c.bench_function("tesselate", |b| { - b.iter(|| ctx.tesselate(paint_commands.clone())) + c.bench_function("tessellate", |b| { + b.iter(|| ctx.tessellate(paint_commands.clone())) }); } diff --git a/egui/src/context.rs b/egui/src/context.rs index cdc14661..a094e04c 100644 --- a/egui/src/context.rs +++ b/egui/src/context.rs @@ -17,7 +17,7 @@ struct Options { /// The default style for new `Ui`:s. style: Arc