From 81787f4750031976056b44819c0cdf0cd4e4e8ef Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 16 Oct 2017 16:11:00 -0700 Subject: [PATCH] Remove `MonochromeDemoView` --- demo/client/src/benchmark.ts | 4 ++-- demo/client/src/text-demo.ts | 4 ++-- demo/client/src/view.ts | 5 ----- demo/client/src/xcaa-strategy.ts | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/demo/client/src/benchmark.ts b/demo/client/src/benchmark.ts index 5b1a2668..e278b6ba 100644 --- a/demo/client/src/benchmark.ts +++ b/demo/client/src/benchmark.ts @@ -24,7 +24,7 @@ import SSAAStrategy from './ssaa-strategy'; import {BUILTIN_FONT_URI, ExpandedMeshData, GlyphStore, PathfinderFont, TextFrame} from "./text"; import {computeStemDarkeningAmount, TextRun} from "./text"; import {assert, lerp, PathfinderError, unwrapNull, unwrapUndef} from "./utils"; -import {DemoView, MonochromeDemoView, Timings} from "./view"; +import {DemoView, Timings} from "./view"; import {AdaptiveMonochromeXCAAStrategy} from './xcaa-strategy'; const STRING: string = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; @@ -236,7 +236,7 @@ class BenchmarkAppController extends DemoAppController { } } -class BenchmarkTestView extends MonochromeDemoView { +class BenchmarkTestView extends DemoView { destFramebuffer: WebGLFramebuffer | null = null; renderingPromiseCallback: ((time: number) => void) | null; diff --git a/demo/client/src/text-demo.ts b/demo/client/src/text-demo.ts index 0777c5bc..53d99473 100644 --- a/demo/client/src/text-demo.ts +++ b/demo/client/src/text-demo.ts @@ -30,7 +30,7 @@ import {BUILTIN_FONT_URI, calculatePixelXMin, computeStemDarkeningAmount} from " import {GlyphStore, Hint, SimpleTextLayout, UnitMetrics} from "./text"; import {assert, expectNotNull, panic, PathfinderError, scaleRect, UINT32_SIZE} from './utils'; import {unwrapNull} from './utils'; -import {DemoView, MonochromeDemoView, Timings, TIMINGS} from './view'; +import {DemoView, Timings, TIMINGS} from './view'; import {AdaptiveMonochromeXCAAStrategy} from './xcaa-strategy'; const DEFAULT_TEXT: string = @@ -264,7 +264,7 @@ class TextDemoController extends DemoAppController { } } -class TextDemoView extends MonochromeDemoView { +class TextDemoView extends DemoView { atlasFramebuffer: WebGLFramebuffer; atlasDepthTexture: WebGLTexture; diff --git a/demo/client/src/view.ts b/demo/client/src/view.ts index 5166aa05..b9490c22 100644 --- a/demo/client/src/view.ts +++ b/demo/client/src/view.ts @@ -731,11 +731,6 @@ export abstract class DemoView extends PathfinderView implements Renderer { protected abstract get directInteriorProgramName(): keyof ShaderMap; } -export abstract class MonochromeDemoView extends DemoView { - abstract get bgColor(): glmatrix.vec4; - abstract get fgColor(): glmatrix.vec4; -} - export interface Renderer { /// The OpenGL context. readonly gl: WebGLRenderingContext; diff --git a/demo/client/src/xcaa-strategy.ts b/demo/client/src/xcaa-strategy.ts index 4ab08e98..a46697c2 100644 --- a/demo/client/src/xcaa-strategy.ts +++ b/demo/client/src/xcaa-strategy.ts @@ -20,7 +20,7 @@ import {B_QUAD_LOWER_INDICES_OFFSET, B_QUAD_SIZE, B_QUAD_UPPER_INDICES_OFFSET} f import {PathfinderShaderProgram} from './shader-loader'; import {computeStemDarkeningAmount} from './text'; import {FLOAT32_SIZE, lerp, UINT32_SIZE, unwrapNull} from './utils'; -import {MonochromeDemoView, Renderer} from './view'; +import {Renderer} from './view'; interface FastEdgeVAOs { upper: WebGLVertexArrayObject;