Revert refactoring of Renderer into BaseRenderer.
It's not needed.
This commit is contained in:
parent
30893fb9ad
commit
80c0d07f1a
|
@ -21,7 +21,7 @@ import PathfinderBufferTexture from "./buffer-texture";
|
||||||
import {CameraView, PerspectiveCamera} from "./camera";
|
import {CameraView, PerspectiveCamera} from "./camera";
|
||||||
import {UniformMap} from './gl-utils';
|
import {UniformMap} from './gl-utils';
|
||||||
import {PathfinderMeshData} from "./meshes";
|
import {PathfinderMeshData} from "./meshes";
|
||||||
import {BaseRenderer, PathTransformBuffers} from './renderer';
|
import {PathTransformBuffers, Renderer} from './renderer';
|
||||||
import {ShaderMap, ShaderProgramSource} from "./shader-loader";
|
import {ShaderMap, ShaderProgramSource} from "./shader-loader";
|
||||||
import SSAAStrategy from "./ssaa-strategy";
|
import SSAAStrategy from "./ssaa-strategy";
|
||||||
import {BUILTIN_FONT_URI, ExpandedMeshData} from "./text";
|
import {BUILTIN_FONT_URI, ExpandedMeshData} from "./text";
|
||||||
|
@ -359,7 +359,7 @@ class ThreeDView extends DemoView implements TextRenderContext {
|
||||||
newTimingsReceived(timings: Timings): void {}
|
newTimingsReceived(timings: Timings): void {}
|
||||||
}
|
}
|
||||||
|
|
||||||
class ThreeDRenderer extends BaseRenderer {
|
class ThreeDRenderer extends Renderer {
|
||||||
renderContext: ThreeDView;
|
renderContext: ThreeDView;
|
||||||
|
|
||||||
camera: PerspectiveCamera;
|
camera: PerspectiveCamera;
|
||||||
|
|
|
@ -19,7 +19,7 @@ import PathfinderBufferTexture from './buffer-texture';
|
||||||
import {OrthographicCamera} from './camera';
|
import {OrthographicCamera} from './camera';
|
||||||
import {UniformMap} from './gl-utils';
|
import {UniformMap} from './gl-utils';
|
||||||
import {PathfinderMeshData} from "./meshes";
|
import {PathfinderMeshData} from "./meshes";
|
||||||
import {BaseRenderer, PathTransformBuffers} from './renderer';
|
import {PathTransformBuffers, Renderer} from './renderer';
|
||||||
import {ShaderMap, ShaderProgramSource} from "./shader-loader";
|
import {ShaderMap, ShaderProgramSource} from "./shader-loader";
|
||||||
import SSAAStrategy from './ssaa-strategy';
|
import SSAAStrategy from './ssaa-strategy';
|
||||||
import {BUILTIN_SVG_URI, SVGLoader} from './svg-loader';
|
import {BUILTIN_SVG_URI, SVGLoader} from './svg-loader';
|
||||||
|
@ -400,7 +400,7 @@ class BenchmarkTestView extends DemoView {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class BenchmarkTextRenderer extends BaseRenderer {
|
class BenchmarkTextRenderer extends Renderer {
|
||||||
renderContext: BenchmarkTestView;
|
renderContext: BenchmarkTestView;
|
||||||
|
|
||||||
camera: OrthographicCamera;
|
camera: OrthographicCamera;
|
||||||
|
|
|
@ -20,7 +20,7 @@ import {SUBPIXEL_GRANULARITY} from './atlas';
|
||||||
import {OrthographicCamera} from './camera';
|
import {OrthographicCamera} from './camera';
|
||||||
import {UniformMap} from './gl-utils';
|
import {UniformMap} from './gl-utils';
|
||||||
import {PathfinderMeshData} from './meshes';
|
import {PathfinderMeshData} from './meshes';
|
||||||
import {BaseRenderer, PathTransformBuffers} from "./renderer";
|
import {PathTransformBuffers, Renderer} from "./renderer";
|
||||||
import {ShaderMap, ShaderProgramSource} from "./shader-loader";
|
import {ShaderMap, ShaderProgramSource} from "./shader-loader";
|
||||||
import SSAAStrategy from './ssaa-strategy';
|
import SSAAStrategy from './ssaa-strategy';
|
||||||
import {BUILTIN_FONT_URI, computeStemDarkeningAmount, ExpandedMeshData, GlyphStore} from "./text";
|
import {BUILTIN_FONT_URI, computeStemDarkeningAmount, ExpandedMeshData, GlyphStore} from "./text";
|
||||||
|
@ -465,7 +465,7 @@ class ReferenceTestView extends DemoView {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class ReferenceTestRenderer extends BaseRenderer {
|
class ReferenceTestRenderer extends Renderer {
|
||||||
renderContext: ReferenceTestView;
|
renderContext: ReferenceTestView;
|
||||||
camera: OrthographicCamera;
|
camera: OrthographicCamera;
|
||||||
|
|
||||||
|
|
|
@ -36,43 +36,7 @@ export interface PathTransformBuffers<T> {
|
||||||
ext: T;
|
ext: T;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Renderer {
|
export abstract class Renderer {
|
||||||
readonly renderContext: RenderContext;
|
|
||||||
readonly pathTransformBufferTextures: Array<PathTransformBuffers<PathfinderBufferTexture>>;
|
|
||||||
readonly meshes: PathfinderMeshBuffers[] | null;
|
|
||||||
readonly meshData: PathfinderMeshData[] | null;
|
|
||||||
readonly usesSTTransform: boolean;
|
|
||||||
readonly emboldenAmount: glmatrix.vec2;
|
|
||||||
readonly bgColor: glmatrix.vec4;
|
|
||||||
readonly fgColor: glmatrix.vec4 | null;
|
|
||||||
readonly backgroundColor: glmatrix.vec4;
|
|
||||||
readonly meshesAttached: boolean;
|
|
||||||
readonly usesIntermediateRenderTargets: boolean;
|
|
||||||
readonly destFramebuffer: WebGLFramebuffer | null;
|
|
||||||
readonly destAllocatedSize: glmatrix.vec2;
|
|
||||||
readonly destUsedSize: glmatrix.vec2;
|
|
||||||
attachMeshes(meshes: PathfinderMeshData[]): void;
|
|
||||||
pathBoundingRects(objectIndex: number): Float32Array;
|
|
||||||
setHintsUniform(uniforms: UniformMap): void;
|
|
||||||
setPathColorsUniform(objectIndex: number, uniforms: UniformMap, textureUnit: number): void;
|
|
||||||
setEmboldenAmountUniform(objectIndex: number, uniforms: UniformMap): void;
|
|
||||||
setAntialiasingOptions(aaType: AntialiasingStrategyName,
|
|
||||||
aaLevel: number,
|
|
||||||
aaOptions: AAOptions):
|
|
||||||
void;
|
|
||||||
redraw(): void;
|
|
||||||
canvasResized(): void;
|
|
||||||
meshIndexForObject(objectIndex: number): number;
|
|
||||||
pathRangeForObject(objectIndex: number): Range;
|
|
||||||
renderTaskTypeForObject(objectIndex: number): RenderTaskType;
|
|
||||||
compositingOperationForObject(objectIndex: number): CompositingOperation | null;
|
|
||||||
setTransformAndTexScaleUniformsForDest(uniforms: UniformMap): void;
|
|
||||||
setTransformSTAndTexScaleUniformsForDest(uniforms: UniformMap): void;
|
|
||||||
setTransformUniform(uniforms: UniformMap, objectIndex: number): void;
|
|
||||||
setTransformSTUniform(uniforms: UniformMap, objectIndex: number): void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export abstract class BaseRenderer implements Renderer {
|
|
||||||
readonly renderContext: RenderContext;
|
readonly renderContext: RenderContext;
|
||||||
|
|
||||||
readonly pathTransformBufferTextures: Array<PathTransformBuffers<PathfinderBufferTexture>>;
|
readonly pathTransformBufferTextures: Array<PathTransformBuffers<PathfinderBufferTexture>>;
|
||||||
|
|
|
@ -16,7 +16,7 @@ import {OrthographicCamera} from "./camera";
|
||||||
import {UniformMap} from './gl-utils';
|
import {UniformMap} from './gl-utils';
|
||||||
import {PathfinderMeshData} from './meshes';
|
import {PathfinderMeshData} from './meshes';
|
||||||
import {CompositingOperation, RenderTaskType} from './render-task';
|
import {CompositingOperation, RenderTaskType} from './render-task';
|
||||||
import {BaseRenderer, PathTransformBuffers} from "./renderer";
|
import {PathTransformBuffers, Renderer} from "./renderer";
|
||||||
import {ShaderMap} from './shader-loader';
|
import {ShaderMap} from './shader-loader';
|
||||||
import SSAAStrategy from './ssaa-strategy';
|
import SSAAStrategy from './ssaa-strategy';
|
||||||
import {SVGLoader} from './svg-loader';
|
import {SVGLoader} from './svg-loader';
|
||||||
|
@ -36,7 +36,7 @@ const ANTIALIASING_STRATEGIES: AntialiasingStrategyTable = {
|
||||||
xcaa: ECAAMulticolorStrategy,
|
xcaa: ECAAMulticolorStrategy,
|
||||||
};
|
};
|
||||||
|
|
||||||
export abstract class SVGRenderer extends BaseRenderer {
|
export abstract class SVGRenderer extends Renderer {
|
||||||
renderContext: RenderContext;
|
renderContext: RenderContext;
|
||||||
|
|
||||||
camera: OrthographicCamera;
|
camera: OrthographicCamera;
|
||||||
|
|
|
@ -17,7 +17,7 @@ import {Atlas, ATLAS_SIZE, AtlasGlyph, GlyphKey, SUBPIXEL_GRANULARITY} from './a
|
||||||
import {CameraView, OrthographicCamera} from './camera';
|
import {CameraView, OrthographicCamera} from './camera';
|
||||||
import {createFramebuffer, createFramebufferDepthTexture, QUAD_ELEMENTS} from './gl-utils';
|
import {createFramebuffer, createFramebufferDepthTexture, QUAD_ELEMENTS} from './gl-utils';
|
||||||
import {UniformMap} from './gl-utils';
|
import {UniformMap} from './gl-utils';
|
||||||
import {BaseRenderer, PathTransformBuffers} from './renderer';
|
import {PathTransformBuffers, Renderer} from './renderer';
|
||||||
import {ShaderMap} from './shader-loader';
|
import {ShaderMap} from './shader-loader';
|
||||||
import SSAAStrategy from './ssaa-strategy';
|
import SSAAStrategy from './ssaa-strategy';
|
||||||
import {calculatePixelRectForGlyph, computeStemDarkeningAmount, GlyphStore, Hint} from "./text";
|
import {calculatePixelRectForGlyph, computeStemDarkeningAmount, GlyphStore, Hint} from "./text";
|
||||||
|
@ -56,7 +56,7 @@ export interface TextRenderContext extends RenderContext {
|
||||||
newTimingsReceived(timings: Timings): void;
|
newTimingsReceived(timings: Timings): void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export abstract class TextRenderer extends BaseRenderer {
|
export abstract class TextRenderer extends Renderer {
|
||||||
renderContext: TextRenderContext;
|
renderContext: TextRenderContext;
|
||||||
|
|
||||||
camera: OrthographicCamera;
|
camera: OrthographicCamera;
|
||||||
|
|
Loading…
Reference in New Issue