From 7a0ade99e2a969596577ae993cee448b8498e2b6 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Mon, 16 Oct 2017 16:07:43 -0700
Subject: [PATCH] Support subpixel AA in the benchmark

---
 demo/client/html/benchmark.html.hbs       | 10 +++---
 demo/client/html/partials/switch.html.hbs |  9 ++++++
 demo/client/html/text-demo.html.hbs       | 37 +++--------------------
 demo/client/src/benchmark.ts              |  9 ++++--
 4 files changed, 26 insertions(+), 39 deletions(-)
 create mode 100644 demo/client/html/partials/switch.html.hbs

diff --git a/demo/client/html/benchmark.html.hbs b/demo/client/html/benchmark.html.hbs
index 54a0a385..b6d40900 100644
--- a/demo/client/html/benchmark.html.hbs
+++ b/demo/client/html/benchmark.html.hbs
@@ -13,15 +13,17 @@
          class="fixed-bottom mb-3 pt-3 d-flex justify-content-between align-items-end pf-pointer-events-none border border-right-0 border-bottom-0 border-left-0">
             <div class="container ml-3 pf-pointer-events-auto">
                 <div class="row">
-                    <label for="pf-aa-level-select" class="col-form-label">Antialiasing</label>
-                    <div class="col-md-auto">
-                        <select id="pf-aa-level-select" class="form-control custom-select">
+                    <form class="form-inline">
+                        <label for="pf-aa-level-select"
+                         class="col-form-label mr-sm-2">Antialiasing</label>
+                        <select id="pf-aa-level-select" class="form-control custom-select mr-sm-3">
                             <option value="none" selected>None</option>
                             <option value="ssaa-2">2&times;SSAA</option>
                             <option value="ssaa-4">4&times;SSAA</option>
                             <option value="xcaa">XCAA</option>
                         </select>
-                    </div>
+                        {{>partials/switch.html id="pf-subpixel-aa" title="Subpixel AA"}}
+                    </form>
                 </div>
             </div>
             <div id="pf-toolbar">
diff --git a/demo/client/html/partials/switch.html.hbs b/demo/client/html/partials/switch.html.hbs
new file mode 100644
index 00000000..dbf1cf6b
--- /dev/null
+++ b/demo/client/html/partials/switch.html.hbs
@@ -0,0 +1,9 @@
+<label for="{{id}}-select" class="col-form-label col-auto">{{title}}</label>
+<div class="col-auto btn-group" id="{{id}}-buttons" data-toggle="buttons">
+    <label class="btn btn-outline-secondary active">
+        <input type="radio" name="{{id}}" id="{{id}}-select-on" autocomplete="off" checked>On
+    </label>
+    <label class="btn btn-outline-secondary">
+        <input type="radio" name="{{id}}" autocomplete="off" id="{{id}}-select-off">Off
+    </label>
+</div>
diff --git a/demo/client/html/text-demo.html.hbs b/demo/client/html/text-demo.html.hbs
index 956cd7e0..95813497 100644
--- a/demo/client/html/text-demo.html.hbs
+++ b/demo/client/html/text-demo.html.hbs
@@ -63,41 +63,12 @@
                                     </select>
                                 </div>
                                 <div class="form-group row justify-content-between">
-                                    <label for="pf-subpixel-aa-select"
-                                     class="col-form-label col-auto">
-                                        Subpixel AA
-                                    </label>
-                                    <div class="col-auto btn-group" id="pf-subpixel-aa-buttons"
-                                     data-toggle="buttons">
-                                        <label class="btn btn-outline-secondary active">
-                                            <input type="radio" name="pf-subpixel-aa"
-                                             id="pf-subpixel-aa-select-on" autocomplete="off"
-                                             checked>On
-                                        </label>
-                                        <label class="btn btn-outline-secondary">
-                                            <input type="radio" name="pf-subpixel-aa"
-                                             autocomplete="off" id="pf-subpixel-aa-select-off">Off
-                                        </label>
-                                    </div>
+                                    {{>partials/switch.html id="pf-subpixel-aa"
+                                      title="Subpixel AA"}}
                                 </div>
                                 <div class="form-group row justify-content-between">
-                                    <label for="pf-stem-darkening-select"
-                                     class="col-form-label col-auto">
-                                        Stem Darkening
-                                    </label>
-                                    <div class="col-auto btn-group" id="pf-stem-darkening-buttons"
-                                     data-toggle="buttons">
-                                        <label class="btn btn-outline-secondary active">
-                                            <input type="radio" name="pf-stem-darkening"
-                                             id="pf-stem-darkening-select-on" autocomplete="off"
-                                             checked>On
-                                        </label>
-                                        <label class="btn btn-outline-secondary">
-                                            <input type="radio" name="pf-stem-darkening"
-                                             id="pf-stem-darkening-select-off"
-                                             autocomplete="off">Off
-                                        </label>
-                                    </div>
+                                    {{>partials/switch.html id="pf-stem-darkening"
+                                      title="Stem Darkening"}}
                                 </div>
                             </form>
                         </div>
diff --git a/demo/client/src/benchmark.ts b/demo/client/src/benchmark.ts
index 812bf622..5b1a2668 100644
--- a/demo/client/src/benchmark.ts
+++ b/demo/client/src/benchmark.ts
@@ -241,8 +241,13 @@ class BenchmarkTestView extends MonochromeDemoView {
 
     renderingPromiseCallback: ((time: number) => void) | null;
 
-    readonly bgColor: glmatrix.vec4 = glmatrix.vec4.clone([1.0, 1.0, 1.0, 0.0]);
-    readonly fgColor: glmatrix.vec4 = glmatrix.vec4.clone([0.0, 0.0, 0.0, 1.0]);
+    get bgColor(): glmatrix.vec4 {
+        return glmatrix.vec4.clone([1.0, 1.0, 1.0, 0.0]);
+    }
+
+    get fgColor(): glmatrix.vec4 {
+        return glmatrix.vec4.clone([0.0, 0.0, 0.0, 1.0]);
+    }
 
     protected usedSizeFactor: glmatrix.vec2 = glmatrix.vec2.clone([1.0, 1.0]);