Implement clipping in XCAA mode
This commit is contained in:
parent
941223c7d4
commit
9a5728aab6
|
@ -44,20 +44,28 @@ export abstract class AntialiasingStrategy {
|
|||
// Returns the transformation matrix that should be applied when directly rendering.
|
||||
abstract get transform(): glmatrix.mat4;
|
||||
|
||||
// Called before direct rendering.
|
||||
// Called before rendering.
|
||||
//
|
||||
// Typically, this redirects direct rendering to a framebuffer of some sort.
|
||||
// Typically, this redirects rendering to a framebuffer of some sort.
|
||||
abstract prepareForRendering(renderer: Renderer): void;
|
||||
|
||||
// Called before directly rendering.
|
||||
//
|
||||
// Typically, this redirects rendering to a framebuffer of some sort.
|
||||
abstract prepareForDirectRendering(renderer: Renderer): void;
|
||||
|
||||
// Called before directly rendering a single object.
|
||||
abstract prepareToDirectlyRenderObject(renderer: Renderer, objectIndex: number): void;
|
||||
abstract prepareToRenderObject(renderer: Renderer, objectIndex: number): void;
|
||||
|
||||
abstract finishDirectlyRenderingObject(renderer: Renderer, objectIndex: number): void;
|
||||
|
||||
// Called after direct rendering.
|
||||
//
|
||||
// This usually performs the actual antialiasing.
|
||||
abstract antialias(renderer: Renderer): void;
|
||||
abstract antialiasObject(renderer: Renderer, objectIndex: number): void;
|
||||
|
||||
// Called after antialiasing each object.
|
||||
abstract resolveAAForObject(renderer: Renderer, objectIndex: number): void;
|
||||
|
||||
// Called after antialiasing.
|
||||
//
|
||||
|
@ -98,7 +106,9 @@ export class NoAAStrategy extends AntialiasingStrategy {
|
|||
gl.disable(gl.SCISSOR_TEST);
|
||||
}
|
||||
|
||||
prepareToDirectlyRenderObject(renderer: Renderer, objectIndex: number): void {
|
||||
prepareForDirectRendering(renderer: Renderer): void {}
|
||||
|
||||
prepareToRenderObject(renderer: Renderer, objectIndex: number): void {
|
||||
const renderContext = renderer.renderContext;
|
||||
const gl = renderContext.gl;
|
||||
|
||||
|
@ -147,9 +157,11 @@ export class NoAAStrategy extends AntialiasingStrategy {
|
|||
compositingOperation.composite(renderer, objectIndex, this.renderTargetColorTextures);
|
||||
}
|
||||
|
||||
antialias(renderer: Renderer) {}
|
||||
antialiasObject(renderer: Renderer, objectIndex: number): void {}
|
||||
|
||||
resolve(renderer: Renderer) {}
|
||||
resolveAAForObject(renderer: Renderer): void {}
|
||||
|
||||
resolve(renderer: Renderer): void {}
|
||||
|
||||
get directRenderingMode(): DirectRenderingMode {
|
||||
return 'color';
|
||||
|
|
|
@ -301,7 +301,7 @@ export abstract class DemoAppController<View extends DemoView> extends AppContro
|
|||
});
|
||||
}
|
||||
|
||||
private fileSelectionChanged(event: Event) {
|
||||
private fileSelectionChanged(event: Event): void {
|
||||
const selectFileElement = event.currentTarget as HTMLSelectElement;
|
||||
const selectedOption = selectFileElement.selectedOptions[0] as HTMLOptionElement;
|
||||
|
||||
|
|
|
@ -102,6 +102,7 @@ export abstract class Renderer {
|
|||
|
||||
this.antialiasingStrategy = new NoAAStrategy(0, 'none');
|
||||
this.antialiasingStrategy.init(this);
|
||||
this.antialiasingStrategy.setFramebufferSize(this);
|
||||
}
|
||||
|
||||
attachMeshes(meshes: PathfinderMeshData[]): void {
|
||||
|
@ -134,12 +135,27 @@ export abstract class Renderer {
|
|||
// Draw "scenery" (used in the 3D view).
|
||||
this.drawSceneryIfNecessary();
|
||||
|
||||
if (antialiasingStrategy.directRenderingMode !== 'none')
|
||||
antialiasingStrategy.prepareForDirectRendering(this);
|
||||
|
||||
const objectCount = this.objectCount;
|
||||
for (let objectIndex = 0; objectIndex < objectCount; objectIndex++) {
|
||||
// Antialias.
|
||||
antialiasingStrategy.antialias(this);
|
||||
antialiasingStrategy.antialiasObject(this, objectIndex);
|
||||
|
||||
// Prepare for direct rendering.
|
||||
antialiasingStrategy.prepareToRenderObject(this, objectIndex);
|
||||
|
||||
// Perform direct rendering (Loop-Blinn).
|
||||
if (antialiasingStrategy.directRenderingMode !== 'none')
|
||||
this.renderDirect();
|
||||
if (antialiasingStrategy.directRenderingMode !== 'none') {
|
||||
// Clear.
|
||||
this.clearForDirectRendering(objectIndex);
|
||||
|
||||
this.directlyRenderObject(objectIndex);
|
||||
}
|
||||
|
||||
antialiasingStrategy.resolveAAForObject(this, objectIndex);
|
||||
}
|
||||
|
||||
// End the timer, and start a new one.
|
||||
if (this.timerQueryPollInterval == null) {
|
||||
|
@ -171,6 +187,7 @@ export abstract class Renderer {
|
|||
this.antialiasingStrategy.init(this);
|
||||
if (this.meshData != null)
|
||||
this.antialiasingStrategy.attachMeshes(this);
|
||||
this.antialiasingStrategy.setFramebufferSize(this);
|
||||
|
||||
this.renderContext.setDirty();
|
||||
}
|
||||
|
@ -276,6 +293,15 @@ export abstract class Renderer {
|
|||
return null;
|
||||
}
|
||||
|
||||
meshIndexForObject(objectIndex: number): number {
|
||||
return objectIndex;
|
||||
}
|
||||
|
||||
pathRangeForObject(objectIndex: number): Range {
|
||||
const bVertexPathRanges = this.meshes[objectIndex].bVertexPathRanges;
|
||||
return new Range(1, bVertexPathRanges.length + 1);
|
||||
}
|
||||
|
||||
protected clearColorForObject(objectIndex: number): glmatrix.vec4 | null {
|
||||
return glmatrix.vec4.create();
|
||||
}
|
||||
|
@ -352,19 +378,10 @@ export abstract class Renderer {
|
|||
return new Range(0, 1);
|
||||
}
|
||||
|
||||
protected meshIndexForObject(objectIndex: number): number {
|
||||
return objectIndex;
|
||||
}
|
||||
|
||||
protected pathRangeForObject(objectIndex: number): Range {
|
||||
const bVertexPathRanges = this.meshes[objectIndex].bVertexPathRanges;
|
||||
return new Range(1, bVertexPathRanges.length + 1);
|
||||
}
|
||||
|
||||
/// Called whenever new GPU timing statistics are available.
|
||||
protected newTimingsReceived(): void {}
|
||||
|
||||
private renderDirect(): void {
|
||||
private directlyRenderObject(objectIndex: number): void {
|
||||
const renderContext = this.renderContext;
|
||||
const gl = renderContext.gl;
|
||||
|
||||
|
@ -372,20 +389,13 @@ export abstract class Renderer {
|
|||
const renderingMode = antialiasingStrategy.directRenderingMode;
|
||||
const objectCount = this.objectCount;
|
||||
|
||||
for (let objectIndex = 0; objectIndex < objectCount; objectIndex++) {
|
||||
const instanceRange = this.instanceRangeForObject(objectIndex);
|
||||
if (instanceRange.isEmpty)
|
||||
continue;
|
||||
return;
|
||||
|
||||
const pathRange = this.pathRangeForObject(objectIndex);
|
||||
const meshIndex = this.meshIndexForObject(objectIndex);
|
||||
|
||||
// Prepare for direct rendering.
|
||||
antialiasingStrategy.prepareToDirectlyRenderObject(this, objectIndex);
|
||||
|
||||
// Clear.
|
||||
this.clearForDirectRendering(objectIndex);
|
||||
|
||||
const meshes = this.meshes[meshIndex];
|
||||
const meshData = this.meshData[meshIndex];
|
||||
|
||||
|
@ -484,7 +494,6 @@ export abstract class Renderer {
|
|||
// Finish direct rendering. Right now, this performs compositing if necessary.
|
||||
antialiasingStrategy.finishDirectlyRenderingObject(this, objectIndex);
|
||||
}
|
||||
}
|
||||
|
||||
private finishTiming() {
|
||||
const renderContext = this.renderContext;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// pathfinder/client/src/shader-loader.ts
|
||||
// pathfinder/demo/client/src/shader-loader.ts
|
||||
//
|
||||
// Copyright © 2017 The Pathfinder Project Developers.
|
||||
//
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// pathfinder/client/src/ssaa-strategy.ts
|
||||
// pathfinder/demo/client/src/ssaa-strategy.ts
|
||||
//
|
||||
// Copyright © 2017 The Pathfinder Project Developers.
|
||||
//
|
||||
|
@ -43,9 +43,9 @@ export default class SSAAStrategy extends AntialiasingStrategy {
|
|||
this.renderTargetFramebuffers = [];
|
||||
}
|
||||
|
||||
attachMeshes(renderer: Renderer) {}
|
||||
attachMeshes(renderer: Renderer): void {}
|
||||
|
||||
setFramebufferSize(renderer: Renderer) {
|
||||
setFramebufferSize(renderer: Renderer): void {
|
||||
const renderContext = renderer.renderContext;
|
||||
const gl = renderContext.gl;
|
||||
|
||||
|
@ -105,7 +105,9 @@ export default class SSAAStrategy extends AntialiasingStrategy {
|
|||
gl.clear(gl.COLOR_BUFFER_BIT);
|
||||
}
|
||||
|
||||
prepareToDirectlyRenderObject(renderer: Renderer, objectIndex: number): void {
|
||||
prepareForDirectRendering(renderer: Renderer): void {}
|
||||
|
||||
prepareToRenderObject(renderer: Renderer, objectIndex: number): void {
|
||||
const renderContext = renderer.renderContext;
|
||||
const gl = renderContext.gl;
|
||||
|
||||
|
@ -160,9 +162,11 @@ export default class SSAAStrategy extends AntialiasingStrategy {
|
|||
compositingOperation.composite(renderer, objectIndex, this.renderTargetColorTextures);
|
||||
}
|
||||
|
||||
antialias(renderer: Renderer) {}
|
||||
antialiasObject(renderer: Renderer): void {}
|
||||
|
||||
resolve(renderer: Renderer) {
|
||||
resolveAAForObject(renderer: Renderer): void {}
|
||||
|
||||
resolve(renderer: Renderer): void {
|
||||
const renderContext = renderer.renderContext;
|
||||
const gl = renderContext.gl;
|
||||
|
||||
|
|
|
@ -181,6 +181,15 @@ class SVGDemoRenderer extends Renderer {
|
|||
return loader.renderTasks[objectIndex].compositingOperation;
|
||||
}
|
||||
|
||||
meshIndexForObject(objectIndex: number): number {
|
||||
return 0;
|
||||
}
|
||||
|
||||
pathRangeForObject(objectIndex: number): Range {
|
||||
const loader = this.renderContext.appController.loader;
|
||||
return loader.renderTasks[objectIndex].instanceIndices;
|
||||
}
|
||||
|
||||
protected get usedSizeFactor(): glmatrix.vec2 {
|
||||
return glmatrix.vec2.clone([1.0, 1.0]);
|
||||
}
|
||||
|
@ -211,15 +220,6 @@ class SVGDemoRenderer extends Renderer {
|
|||
return 'directInterior';
|
||||
}
|
||||
|
||||
protected meshIndexForObject(objectIndex: number): number {
|
||||
return 0;
|
||||
}
|
||||
|
||||
protected pathRangeForObject(objectIndex: number): Range {
|
||||
const loader = this.renderContext.appController.loader;
|
||||
return loader.renderTasks[objectIndex].instanceIndices;
|
||||
}
|
||||
|
||||
protected newTimingsReceived(): void {
|
||||
this.renderContext.appController.newTimingsReceived(this.lastTimings);
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue