From 17983e1bbc57a6b35fae6a7c0f077615e05d726b Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 30 Mar 2021 22:36:45 +0200
Subject: [PATCH] Optimize tessellator by around 9%

---
 egui_demo_lib/benches/benchmark.rs |  6 ++++--
 epaint/src/tessellator.rs          | 16 ++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/egui_demo_lib/benches/benchmark.rs b/egui_demo_lib/benches/benchmark.rs
index 9086edd3..3a47c9bf 100644
--- a/egui_demo_lib/benches/benchmark.rs
+++ b/egui_demo_lib/benches/benchmark.rs
@@ -44,13 +44,15 @@ pub fn criterion_benchmark(c: &mut Criterion) {
 
     {
         let mut ctx = egui::CtxRef::default();
-        ctx.memory().set_everything_is_visible(true); // give us everything
+        // ctx.memory().set_everything_is_visible(true); // give us everything
         let mut demo_windows = egui_demo_lib::DemoWindows::default();
         ctx.begin_frame(raw_input.clone());
         demo_windows.ui(&ctx);
         let (_, shapes) = ctx.end_frame();
 
-        c.bench_function("tessellate", |b| b.iter(|| ctx.tessellate(shapes.clone())));
+        c.bench_function("demo_windows_minimal_tessellate", |b| {
+            b.iter(|| ctx.tessellate(shapes.clone()))
+        });
     }
 
     {
diff --git a/epaint/src/tessellator.rs b/epaint/src/tessellator.rs
index 3d192b59..b0c0daaf 100644
--- a/epaint/src/tessellator.rs
+++ b/epaint/src/tessellator.rs
@@ -75,11 +75,10 @@ impl Path {
             // Common case optimization:
             self.add_line_segment([points[0], points[1]]);
         } else {
-            // TODO: optimize
             self.reserve(n);
             self.add_point(points[0], (points[1] - points[0]).normalized().rot90());
+            let mut n0 = (points[1] - points[0]).normalized().rot90();
             for i in 1..n - 1 {
-                let mut n0 = (points[i] - points[i - 1]).normalized().rot90();
                 let mut n1 = (points[i + 1] - points[i]).normalized().rot90();
 
                 // Handle duplicated points (but not triplicated...):
@@ -104,6 +103,8 @@ impl Path {
                     // miter join
                     self.add_point(points[i], normal / length_sq);
                 }
+
+                n0 = n1;
             }
             self.add_point(
                 points[n - 1],
@@ -117,10 +118,11 @@ impl Path {
         assert!(n >= 2);
         self.reserve(n);
 
-        // TODO: optimize
+        let mut n0 = (points[0] - points[n - 1]).normalized().rot90();
+
         for i in 0..n {
-            let mut n0 = (points[i] - points[(i + n - 1) % n]).normalized().rot90();
-            let mut n1 = (points[(i + 1) % n] - points[i]).normalized().rot90();
+            let next_i = if i + 1 == n { 0 } else { i + 1 };
+            let mut n1 = (points[next_i] - points[i]).normalized().rot90();
 
             // Handle duplicated points (but not triplicated...):
             if n0 == Vec2::ZERO {
@@ -144,6 +146,8 @@ impl Path {
                 // miter join
                 self.add_point(points[i], normal / length_sq);
             }
+
+            n0 = n1;
         }
     }
 }
@@ -291,7 +295,7 @@ fn fill_closed_path(
         let mut i0 = n - 1;
         for i1 in 0..n {
             let p1 = &path[i1 as usize];
-            let dm = p1.normal * options.aa_size * 0.5;
+            let dm = 0.5 * options.aa_size * p1.normal;
             out.colored_vertex(p1.pos - dm, color);
             out.colored_vertex(p1.pos + dm, color_outer);
             out.add_triangle(idx_inner + i1 * 2, idx_inner + i0 * 2, idx_outer + 2 * i0);