WebGLRenderer refactorings + SAO

xeokit · Sep 25, 2024 · 31afc46 · 31afc46
1 parent 90689f5
commit 31afc46
Show file tree

Hide file tree

Showing 44 changed files with 1,569 additions and 635 deletions.
diff --git a/packages/webglrenderer/src/Layer.ts b/packages/webglrenderer/src/Layer.ts
@@ -17,6 +17,7 @@ export interface Layer {
     layerIndex: number;
     sortId: string;
     meshCounts: MeshCounts[];
+    saoSupported: boolean;
 
     //---------------------------------------------------------
     // Builder methods
@@ -68,6 +69,8 @@ export interface Layer {
 
     drawColorOpaque() : void;
 
+    drawColorSAOOpaque(): void;
+
     drawColorTranslucent(): void;
 
     drawDepth(): void;

diff --git a/packages/webglrenderer/src/RENDER_PASSES.ts b/packages/webglrenderer/src/RENDER_PASSES.ts
@@ -8,10 +8,10 @@ export const RENDER_PASSES = {
 
     NOT_RENDERED: 0,
 
-    // Normal rendering - mutually exclusive modes
+    // Draw color, or draw depth or normals for post-effects
 
-    COLOR_OPAQUE: 1,
-    COLOR_TRANSPARENT: 2,
+    DRAW_OPAQUE: 1,
+    DRAW_TRANSPARENT: 2,
 
     // Accents silhouette rendering - mutually exclusive modes
 

diff --git a/packages/webglrenderer/src/RenderContext.ts b/packages/webglrenderer/src/RenderContext.ts
@@ -41,11 +41,6 @@ export class RenderContext {
      */
     public pbrEnabled: boolean;
 
-    /**
-     * Whether SAO is currently enabled during the current frame.
-     */
-    public withSAO: boolean;
-
     /**
      * Whether backfaces are currently enabled during the current frame.
      */
@@ -125,7 +120,7 @@ export class RenderContext {
     /**
      * The occlusion rendering texture.
      */
-    public occlusionTexture: WebGLAbstractTexture | null;
+    public saoOcclusionTexture: WebGLAbstractTexture | null;
 
     public pickClipPos: FloatArrayParam;
 
@@ -145,7 +140,6 @@ export class RenderContext {
     reset() {
         this.lastProgramId = -1;
         this.pbrEnabled = false;
-        this.withSAO = false;
         this.backfaces = false;
         this.frontface = true;
         this.textureUnit = 0;
@@ -157,7 +151,7 @@ export class RenderContext {
         this.pickZFar = 5000;
         this.pickInvisible = false;
         this.lineWidth = 1;
-        this.occlusionTexture = null;
+        this.saoOcclusionTexture = null;
     }
 
     /**