refactor: 移除 TAA 算法后处理抗锯齿逻辑 (#2448)

antvis · May 9, 2024 · 6cbdc51 · 6cbdc51
1 parent ee64cef
commit 6cbdc51
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 403 deletions.
diff --git a/packages/core/src/inversify.config.ts b/packages/core/src/inversify.config.ts
@@ -45,7 +45,6 @@ import MultiPassRenderer from './services/renderer/passes/MultiPassRenderer';
 import PixelPickingPass from './services/renderer/passes/PixelPickingPass';
 import PostProcessor from './services/renderer/passes/PostProcessor';
 import RenderPass from './services/renderer/passes/RenderPass';
-import TAAPass from './services/renderer/passes/TAAPass';
 import BloomPass from './services/renderer/passes/post-processing/BloomPass';
 import BlurHPass from './services/renderer/passes/post-processing/BlurHPass';
 import BlurVPass from './services/renderer/passes/post-processing/BlurVPass';
@@ -133,7 +132,6 @@ export function createSceneContainer(): L7Container {
     clear: new ClearPass(),
     pixelPicking: new PixelPickingPass(),
     render: new RenderPass(),
-    taa: new TAAPass(shaderModuleService),
   };
   container.normalPassFactory = (named: string) => {
     return normalPass[named];

diff --git a/packages/core/src/services/camera/CameraService.ts b/packages/core/src/services/camera/CameraService.ts
@@ -9,16 +9,6 @@ export default class CameraService implements ICameraService {
    */
   private overridedViewProjectionMatrix: number[] | undefined;
 
-  /**
-   * 抖动后的 VP 矩阵
-   */
-  private jitteredViewProjectionMatrix: number[] | undefined;
-
-  /**
-   * 抖动后的 Projection 矩阵
-   */
-  private jitteredProjectionMatrix: number[] | undefined;
-
   /**
    * ViewMatrix 逆矩阵，用于计算相机位置
    */
@@ -56,8 +46,7 @@ export default class CameraService implements ICameraService {
   }
 
   public getProjectionMatrix(): number[] {
-    // 优先返回抖动后的 ProjectionMatrix
-    return this.jitteredProjectionMatrix || this.viewport.getProjectionMatrix();
+    return this.viewport.getProjectionMatrix();
   }
 
   public getModelMatrix(): number[] {
@@ -77,11 +66,7 @@ export default class CameraService implements ICameraService {
   }
 
   public getViewProjectionMatrix(): number[] {
-    return (
-      this.overridedViewProjectionMatrix ||
-      this.jitteredViewProjectionMatrix ||
-      this.viewport.getViewProjectionMatrix()
-    );
+    return this.overridedViewProjectionMatrix || this.viewport.getViewProjectionMatrix();
   }
 
   public getZoom(): number {
@@ -115,25 +100,4 @@ export default class CameraService implements ICameraService {
   public setViewProjectionMatrix(viewProjectionMatrix: number[] | undefined) {
     this.overridedViewProjectionMatrix = viewProjectionMatrix;
   }
-
-  public jitterProjectionMatrix(x: number, y: number) {
-    const translation = mat4.fromTranslation(mat4.create(), [x, y, 0]);
-
-    this.jitteredProjectionMatrix = mat4.multiply(
-      mat4.create(),
-      translation,
-      this.viewport.getProjectionMatrix() as unknown as mat4,
-    ) as unknown as number[];
-
-    this.jitteredViewProjectionMatrix = mat4.multiply(
-      mat4.create(),
-      this.jitteredProjectionMatrix as unknown as mat4,
-      this.viewport.getViewMatrix() as unknown as mat4,
-    ) as unknown as number[];
-  }
-
-  public clearJitterProjectionMatrix() {
-    this.jitteredProjectionMatrix = undefined;
-    this.jitteredViewProjectionMatrix = undefined;
-  }
 }
diff --git a/packages/core/src/services/camera/ICameraService.ts b/packages/core/src/services/camera/ICameraService.ts
@@ -31,6 +31,4 @@ export interface ICameraService extends Omit<IViewport, 'syncWithMapCamera'> {
   update(viewport: IViewport): void;
   getCameraPosition(): number[];
   setViewProjectionMatrix(viewProjectionMatrix: number[] | undefined): void;
-  jitterProjectionMatrix(x: number, y: number): void;
-  clearJitterProjectionMatrix(): void;
 }
diff --git a/packages/core/src/services/config/ConfigService.ts b/packages/core/src/services/config/ConfigService.ts
@@ -75,8 +75,6 @@ const defaultLayerConfig: Partial<ILayerConfig> = {
   activeMix: 0,
   selectColor: 'blue',
   selectMix: 0,
-  enableTAA: false,
-  jitterScale: 1,
   enableLighting: false,
   animateOption: {
     enable: false,

diff --git a/packages/core/src/services/layer/ILayerService.ts b/packages/core/src/services/layer/ILayerService.ts
@@ -651,14 +651,6 @@ export interface ILayerConfig {
   activeColor: string | number[];
   activeMix?: number;
   selectMix?: number;
-  /**
-   * 开启 TAA
-   */
-  enableTAA: boolean;
-  /**
-   * 相机抖动程度
-   */
-  jitterScale: number;
   /**
    * 开启光照
    */