michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove `MonochromeDemoView`

This commit is contained in:
Patrick Walton 2017-10-16 16:11:00 -07:00
parent 7a0ade99e2
commit 81787f4750
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo/client/src/benchmark.ts
View File

@ -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<BenchmarkTestView> {
}
}
class BenchmarkTestView extends MonochromeDemoView {
class BenchmarkTestView extends DemoView {
destFramebuffer: WebGLFramebuffer | null = null;
renderingPromiseCallback: ((time: number) => void) | null;

4
demo/client/src/text-demo.ts
View File

@ -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<TextDemoView> {
}
}
class TextDemoView extends MonochromeDemoView {
class TextDemoView extends DemoView {
atlasFramebuffer: WebGLFramebuffer;
atlasDepthTexture: WebGLTexture;

5
demo/client/src/view.ts
View File

@ -731,11 +731,6 @@ export abstract class DemoView extends PathfinderView implements Renderer {
protected abstract get directInteriorProgramName(): keyof ShaderMap<void>;
}
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;

2
demo/client/src/xcaa-strategy.ts
View File

@ -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;