@itwin/core-frontend 3.6.0-dev.8 → 4.0.0-dev.2

package/lib/cjs/render/webgl/UniformHandle.js

@@ -9,7 +9,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UniformHandle = void 0;
 const core_bentley_1 = require("@itwin/core-bentley");
-const Logger_1 = require("@itwin/core-bentley/lib/cjs/Logger");
 const FrontendLoggerCategory_1 = require("../../FrontendLoggerCategory");
 const System_1 = require("./System");
 /** A handle to the location of a uniform within a shader program
@@ -32,7 +31,7 @@ class UniformHandle {
                 throw new Error(errMsg);
             }
             else {
-                Logger_1.Logger.logError(FrontendLoggerCategory_1.FrontendLoggerCategory.Render, errMsg);
+                core_bentley_1.Logger.logError(FrontendLoggerCategory_1.FrontendLoggerCategory.Render, errMsg);
             }
         }
         return new UniformHandle(location);

package/lib/cjs/render/webgl/UniformHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"UniformHandle.js","sourceRoot":"","sources":["../../../../src/render/webgl/UniformHandle.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module WebGL\r\n */\r\n\r\nimport { assert } from \"@itwin/core-bentley\";\r\nimport { Logger } from \"@itwin/core-bentley/lib/cjs/Logger\";\r\nimport { FrontendLoggerCategory } from \"../../FrontendLoggerCategory\";\r\nimport { Matrix3, Matrix4 } from \"./Matrix\";\r\nimport { ShaderProgram } from \"./ShaderProgram\";\r\nimport { SyncToken } from \"./Sync\";\r\nimport { System } from \"./System\";\r\n\r\nconst enum DataType {// eslint-disable-line no-restricted-syntax\r\n  Undefined, // eslint-disable-line id-blacklist\r\n  Mat3,\r\n  Mat4,\r\n  Float,\r\n  FloatArray,\r\n  Vec2,\r\n  Vec3,\r\n  Vec4,\r\n  Int,\r\n  IntArray,\r\n  Uint,\r\n}\r\n\r\n/** A handle to the location of a uniform within a shader program\r\n * @internal\r\n */\r\nexport class UniformHandle {\r\n  private readonly _location: WebGLUniformLocation | null;\r\n  private _type: DataType = DataType.Undefined;\r\n  private readonly _data: number[] = [];\r\n  public syncToken?: SyncToken;\r\n\r\n  private constructor(location: WebGLUniformLocation | null) { this._location = location; }\r\n\r\n  public static create(program: ShaderProgram, name: string): UniformHandle {\r\n    let location = null;\r\n    if (undefined !== program.glProgram) {\r\n      location = System.instance.context.getUniformLocation(program.glProgram, name);\r\n    }\r\n    if (null === location) {\r\n      const errMsg = `uniform ${name} not found in ${program.description}.`;\r\n      if (System.instance.options.errorOnMissingUniform) {\r\n        throw new Error(errMsg);\r\n      } else {\r\n        Logger.logError(FrontendLoggerCategory.Render, errMsg);\r\n      }\r\n    }\r\n    return new UniformHandle(location);\r\n  }\r\n\r\n  private updateData(type: DataType, data: Float32Array | Int32Array | number[]): boolean {\r\n    assert(DataType.Undefined !== type && DataType.Int !== type && DataType.Float !== type && DataType.Uint !== type);\r\n\r\n    let updated = this._type !== type;\r\n    if (updated) {\r\n      this._type = type;\r\n      if (this._data.length !== data.length)\r\n        this._data.length = data.length;\r\n    }\r\n\r\n    for (let i = 0; i < data.length; i++) {\r\n      const datum = data[i];\r\n      updated = updated || this._data[i] !== datum;\r\n      this._data[i] = datum;\r\n    }\r\n\r\n    return updated;\r\n  }\r\n\r\n  private updateDatum(type: DataType, datum: number): boolean {\r\n    assert(DataType.Int === type || DataType.Uint === type || DataType.Float === type);\r\n\r\n    // NB: Yes, calling data.length without actually changing the length shows up as a significant performance bottleneck...\r\n    if (this._data.length !== 1)\r\n      this._data.length = 1;\r\n\r\n    const updated = this._type !== type || this._data[0] !== datum;\r\n    this._type = type;\r\n    this._data[0] = datum;\r\n\r\n    return updated;\r\n  }\r\n\r\n  public setMatrix3(mat: Matrix3) {\r\n    if (this.updateData(DataType.Mat3, mat.data))\r\n      System.instance.context.uniformMatrix3fv(this._location, false, mat.data);\r\n  }\r\n\r\n  public setMatrix4(mat: Matrix4) {\r\n    if (this.updateData(DataType.Mat4, mat.data))\r\n      System.instance.context.uniformMatrix4fv(this._location, false, mat.data);\r\n  }\r\n\r\n  public setUniform1iv(data: Int32Array | number[]) {\r\n    if (this.updateData(DataType.IntArray, data))\r\n      System.instance.context.uniform1iv(this._location, data);\r\n  }\r\n\r\n  public setUniform1fv(data: Float32Array | number[]) {\r\n    if (this.updateData(DataType.FloatArray, data))\r\n      System.instance.context.uniform1fv(this._location, data);\r\n  }\r\n\r\n  public setUniform2fv(data: Float32Array | number[]) {\r\n    if (this.updateData(DataType.Vec2, data))\r\n      System.instance.context.uniform2fv(this._location, data);\r\n  }\r\n\r\n  public setUniform3fv(data: Float32Array | number[]) {\r\n    if (this.updateData(DataType.Vec3, data))\r\n      System.instance.context.uniform3fv(this._location, data);\r\n  }\r\n\r\n  public setUniform4fv(data: Float32Array | number[]) {\r\n    if (this.updateData(DataType.Vec4, data))\r\n      System.instance.context.uniform4fv(this._location, data);\r\n  }\r\n\r\n  public setUniform1i(data: number) {\r\n    if (this.updateDatum(DataType.Int, data))\r\n      System.instance.context.uniform1i(this._location, data);\r\n  }\r\n\r\n  public setUniform1f(data: number) {\r\n    if (this.updateDatum(DataType.Float, data))\r\n      System.instance.context.uniform1f(this._location, data);\r\n  }\r\n\r\n  public setUniform1ui(data: number) {\r\n    if (this.updateDatum(DataType.Uint, data))\r\n      (System.instance.context as WebGL2RenderingContext).uniform1ui(this._location, data);\r\n  }\r\n\r\n  public setUniformBitflags(data: number) {\r\n    if (System.instance.capabilities.isWebGL2)\r\n      this.setUniform1ui(data);\r\n    else\r\n      this.setUniform1f(data);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"UniformHandle.js","sourceRoot":"","sources":["../../../../src/render/webgl/UniformHandle.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module WebGL\r\n */\r\n\r\nimport { assert, Logger } from \"@itwin/core-bentley\";\r\nimport { FrontendLoggerCategory } from \"../../FrontendLoggerCategory\";\r\nimport { Matrix3, Matrix4 } from \"./Matrix\";\r\nimport { ShaderProgram } from \"./ShaderProgram\";\r\nimport { SyncToken } from \"./Sync\";\r\nimport { System } from \"./System\";\r\n\r\nconst enum DataType {// eslint-disable-line no-restricted-syntax\r\n  Undefined, // eslint-disable-line id-blacklist\r\n  Mat3,\r\n  Mat4,\r\n  Float,\r\n  FloatArray,\r\n  Vec2,\r\n  Vec3,\r\n  Vec4,\r\n  Int,\r\n  IntArray,\r\n  Uint,\r\n}\r\n\r\n/** A handle to the location of a uniform within a shader program\r\n * @internal\r\n */\r\nexport class UniformHandle {\r\n  private readonly _location: WebGLUniformLocation | null;\r\n  private _type: DataType = DataType.Undefined;\r\n  private readonly _data: number[] = [];\r\n  public syncToken?: SyncToken;\r\n\r\n  private constructor(location: WebGLUniformLocation | null) { this._location = location; }\r\n\r\n  public static create(program: ShaderProgram, name: string): UniformHandle {\r\n    let location = null;\r\n    if (undefined !== program.glProgram) {\r\n      location = System.instance.context.getUniformLocation(program.glProgram, name);\r\n    }\r\n    if (null === location) {\r\n      const errMsg = `uniform ${name} not found in ${program.description}.`;\r\n      if (System.instance.options.errorOnMissingUniform) {\r\n        throw new Error(errMsg);\r\n      } else {\r\n        Logger.logError(FrontendLoggerCategory.Render, errMsg);\r\n      }\r\n    }\r\n    return new UniformHandle(location);\r\n  }\r\n\r\n  private updateData(type: DataType, data: Float32Array | Int32Array | number[]): boolean {\r\n    assert(DataType.Undefined !== type && DataType.Int !== type && DataType.Float !== type && DataType.Uint !== type);\r\n\r\n    let updated = this._type !== type;\r\n    if (updated) {\r\n      this._type = type;\r\n      if (this._data.length !== data.length)\r\n        this._data.length = data.length;\r\n    }\r\n\r\n    for (let i = 0; i < data.length; i++) {\r\n      const datum = data[i];\r\n      updated = updated || this._data[i] !== datum;\r\n      this._data[i] = datum;\r\n    }\r\n\r\n    return updated;\r\n  }\r\n\r\n  private updateDatum(type: DataType, datum: number): boolean {\r\n    assert(DataType.Int === type || DataType.Uint === type || DataType.Float === type);\r\n\r\n    // NB: Yes, calling data.length without actually changing the length shows up as a significant performance bottleneck...\r\n    if (this._data.length !== 1)\r\n      this._data.length = 1;\r\n\r\n    const updated = this._type !== type || this._data[0] !== datum;\r\n    this._type = type;\r\n    this._data[0] = datum;\r\n\r\n    return updated;\r\n  }\r\n\r\n  public setMatrix3(mat: Matrix3) {\r\n    if (this.updateData(DataType.Mat3, mat.data))\r\n      System.instance.context.uniformMatrix3fv(this._location, false, mat.data);\r\n  }\r\n\r\n  public setMatrix4(mat: Matrix4) {\r\n    if (this.updateData(DataType.Mat4, mat.data))\r\n      System.instance.context.uniformMatrix4fv(this._location, false, mat.data);\r\n  }\r\n\r\n  public setUniform1iv(data: Int32Array | number[]) {\r\n    if (this.updateData(DataType.IntArray, data))\r\n      System.instance.context.uniform1iv(this._location, data);\r\n  }\r\n\r\n  public setUniform1fv(data: Float32Array | number[]) {\r\n    if (this.updateData(DataType.FloatArray, data))\r\n      System.instance.context.uniform1fv(this._location, data);\r\n  }\r\n\r\n  public setUniform2fv(data: Float32Array | number[]) {\r\n    if (this.updateData(DataType.Vec2, data))\r\n      System.instance.context.uniform2fv(this._location, data);\r\n  }\r\n\r\n  public setUniform3fv(data: Float32Array | number[]) {\r\n    if (this.updateData(DataType.Vec3, data))\r\n      System.instance.context.uniform3fv(this._location, data);\r\n  }\r\n\r\n  public setUniform4fv(data: Float32Array | number[]) {\r\n    if (this.updateData(DataType.Vec4, data))\r\n      System.instance.context.uniform4fv(this._location, data);\r\n  }\r\n\r\n  public setUniform1i(data: number) {\r\n    if (this.updateDatum(DataType.Int, data))\r\n      System.instance.context.uniform1i(this._location, data);\r\n  }\r\n\r\n  public setUniform1f(data: number) {\r\n    if (this.updateDatum(DataType.Float, data))\r\n      System.instance.context.uniform1f(this._location, data);\r\n  }\r\n\r\n  public setUniform1ui(data: number) {\r\n    if (this.updateDatum(DataType.Uint, data))\r\n      (System.instance.context as WebGL2RenderingContext).uniform1ui(this._location, data);\r\n  }\r\n\r\n  public setUniformBitflags(data: number) {\r\n    if (System.instance.capabilities.isWebGL2)\r\n      this.setUniform1ui(data);\r\n    else\r\n      this.setUniform1f(data);\r\n  }\r\n}\r\n"]}

package/lib/cjs/render/webgl/VisibleTileFeatures.js

@@ -28,14 +28,14 @@ class VisibleTileFeatures {
 }
 exports.VisibleTileFeatures = VisibleTileFeatures;
 const clippedPasses = [
-    14 /* BackgroundMap */,
+    15 /* BackgroundMap */,
     1 /* OpaqueLayers */,
     2 /* OpaqueLinear */,
     3 /* OpaquePlanar */,
-    4 /* OpaqueGeneral */,
-    6 /* TranslucentLayers */,
-    7 /* Translucent */,
-    10 /* OverlayLayers */,
+    5 /* OpaqueGeneral */,
+    7 /* TranslucentLayers */,
+    8 /* Translucent */,
+    11 /* OverlayLayers */,
 ];
 function isFeatureVisible(feature, target, modelIdParts, includeNonLocatable) {
     const ovrs = target.currentFeatureSymbologyOverrides;

package/lib/cjs/render/webgl/glsl/EDL.d.ts

@@ -0,0 +1,14 @@
+/** @packageDocumentation
+ * @module WebGL
+ */
+import { WebGLContext } from "@itwin/webgl-compatibility";
+import { ShaderProgram } from "../ShaderProgram";
+/** @internal */
+export declare function createEDLCalcBasicProgram(context: WebGLContext): ShaderProgram;
+/** @internal */
+export declare function createEDLCalcFullProgram(context: WebGLContext): ShaderProgram;
+/** @internal */
+export declare function createEDLFilterProgram(context: WebGLContext): ShaderProgram;
+/** @internal */
+export declare function createEDLMixProgram(context: WebGLContext): ShaderProgram;
+//# sourceMappingURL=EDL.d.ts.map

package/lib/cjs/render/webgl/glsl/EDL.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EDL.d.ts","sourceRoot":"","sources":["../../../../../src/render/webgl/glsl/EDL.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAqCjD,gBAAgB;AAChB,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,YAAY,GAAG,aAAa,CAuC9E;AAmCD,gBAAgB;AAChB,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,aAAa,CAuC7E;AAwCD,gBAAgB;AAChB,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,YAAY,GAAG,aAAa,CAgC3E;AAcD,gBAAgB;AAChB,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,aAAa,CAuCxE"}

package/lib/cjs/render/webgl/glsl/EDL.js

@@ -0,0 +1,260 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module WebGL
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createEDLMixProgram = exports.createEDLFilterProgram = exports.createEDLCalcFullProgram = exports.createEDLCalcBasicProgram = void 0;
+const RenderFlags_1 = require("../RenderFlags");
+const Texture_1 = require("../Texture");
+const Fragment_1 = require("./Fragment");
+const ViewportQuad_1 = require("./ViewportQuad");
+// This shader calculates a more basic version of EDL, and only for the original size, so single pass
+const calcBasicEDL = `
+    float strength = u_pointCloudEDL1.x;
+    float scaleFactor = u_pointCloudEDL1.z;
+    float pixRadius = u_pointCloudEDL1.y;
+    vec2 invTexSize = u_texInfo.xy;
+    float is3d = u_pointCloudEDL1.w;
+
+    vec4 color = TEXTURE(u_colorTexture, v_texCoord);
+    if (color.a == 0.0)
+        discard;
+    else {
+        const vec2 neighbors[8] = vec2[8] (  //neighbor relative position
+            vec2( 1.0, 0.0), vec2( 0.70710678,  0.70710678), vec2(0.0,  1.0), vec2(-0.70710678,  0.70710678),
+            vec2(-1.0, 0.0), vec2(-0.70710678, -0.70710678), vec2(0.0, -1.0), vec2( 0.70710678, -0.70710678));
+        float depth = TEXTURE(u_depthTexture, v_texCoord).r;
+        float sum = 0.0;
+        vec2 posScale = pixRadius * invTexSize;
+        // contribution of each neighbor
+        // NOTE: this is currently using neighbor depths regardless of if they were written by point cloud
+        for (int c = 0; c < 8; c++) {
+            vec2 nRelPos = posScale * neighbors[c];
+            vec2 nPos = v_texCoord + nRelPos;
+            float zN = TEXTURE(u_depthTexture, nPos).r;  // neighbor depth
+            sum += max(0.0, (is3d > 0.5) ? depth - zN : log (depth/zN));
+        }
+        float f = sum / 8.0;
+        f = exp(-f * 33.5 * strength * scaleFactor); // 33.5 factor to aim for a typical (unfactored) strength of 5
+        return vec4(f * color.rgb, 1.0);
+    }
+`;
+/** @internal */
+function createEDLCalcBasicProgram(context) {
+    const builder = (0, ViewportQuad_1.createViewportQuadBuilder)(true);
+    const frag = builder.frag;
+    frag.set(1 /* ComputeBaseColor */, calcBasicEDL);
+    frag.set(16 /* AssignFragData */, Fragment_1.assignFragColor);
+    frag.addUniform("u_texInfo", 4 /* Vec3 */, (prog) => {
+        prog.addGraphicUniform("u_texInfo", (uniform, params) => {
+            const geom = params.geometry;
+            uniform.setUniform3fv(geom.texInfo);
+        });
+    });
+    frag.addUniform("u_colorTexture", 8 /* Sampler2D */, (prog) => {
+        prog.addGraphicUniform("u_colorTexture", (uniform, params) => {
+            const geom = params.geometry;
+            Texture_1.Texture2DHandle.bindSampler(uniform, geom.colorTexture, RenderFlags_1.TextureUnit.Zero);
+        });
+    });
+    frag.addUniform("u_depthTexture", 8 /* Sampler2D */, (prog) => {
+        prog.addGraphicUniform("u_depthTexture", (uniform, params) => {
+            const geom = params.geometry;
+            Texture_1.Texture2DHandle.bindSampler(uniform, geom.depthTexture, RenderFlags_1.TextureUnit.One);
+        });
+    });
+    // Uniforms based on the PointCloudDisplaySettings.
+    frag.addUniform("u_pointCloudEDL1", 5 /* Vec4 */, (prog) => {
+        prog.addGraphicUniform("u_pointCloudEDL1", (uniform, params) => {
+            params.target.uniforms.realityModel.pointCloud.bindEDL1(uniform);
+        });
+    });
+    builder.vert.headerComment = "//!V! EDLCalcBasic";
+    builder.frag.headerComment = "//!F! EDLCalcBasic";
+    return builder.buildProgram(context);
+}
+exports.createEDLCalcBasicProgram = createEDLCalcBasicProgram;
+// This shader calculates the full version of EDL, and can be run at full, 1/2 and 1/4 scale
+const calcFullEDL = `
+    float strength = u_pointCloudEDL1.x;
+    float scaleFactor = u_pointCloudEDL1.z;
+    float pixRadius = u_pointCloudEDL1.y;
+    float scale = u_texInfo.z;  // 1, 2, 4
+    vec2 invTexSize = u_texInfo.xy;
+    float is3d = u_pointCloudEDL1.w;
+
+    vec4 color = TEXTURE(u_colorTexture, v_texCoord);
+    if (color.a == 0.0)
+        return color;
+    else {
+        const vec2 neighbors[8] = vec2[8] (  //neighbor relative position
+            vec2( 1.0, 0.0), vec2( 0.70710678,  0.70710678), vec2(0.0,  1.0), vec2(-0.70710678,  0.70710678),
+            vec2(-1.0, 0.0), vec2(-0.70710678, -0.70710678), vec2(0.0, -1.0), vec2( 0.70710678, -0.70710678));
+        float depth = TEXTURE(u_depthTexture, v_texCoord).r;
+        float sum = 0.0;
+        vec2 posScale = pixRadius * invTexSize;
+        // contribution of each neighbor
+        // NOTE: this is currently using neighbor depths regardless of if they were written by point cloud
+        for (int c = 0; c < 8; c++) {
+            vec2 nRelPos = posScale * neighbors[c];
+            vec2 nPos = v_texCoord + nRelPos;
+            float zN = TEXTURE(u_depthTexture, nPos).r;  // neighbor depth
+            sum += max(0.0, (is3d > 0.5) ? depth - zN : log (depth/zN)) / scale;
+        }
+        float f = sum / 8.0;
+        f = exp(-f * 33.5 * strength * scaleFactor); // 33.5 factor to aim for a typical (unfactored) strength of 5
+        return vec4(f * color.rgb, 1.0);
+    }
+`;
+/** @internal */
+function createEDLCalcFullProgram(context) {
+    const builder = (0, ViewportQuad_1.createViewportQuadBuilder)(true);
+    const frag = builder.frag;
+    frag.set(1 /* ComputeBaseColor */, calcFullEDL);
+    frag.set(16 /* AssignFragData */, Fragment_1.assignFragColor);
+    frag.addUniform("u_texInfo", 4 /* Vec3 */, (prog) => {
+        prog.addGraphicUniform("u_texInfo", (uniform, params) => {
+            const geom = params.geometry;
+            uniform.setUniform3fv(geom.texInfo);
+        });
+    });
+    frag.addUniform("u_colorTexture", 8 /* Sampler2D */, (prog) => {
+        prog.addGraphicUniform("u_colorTexture", (uniform, params) => {
+            const geom = params.geometry;
+            Texture_1.Texture2DHandle.bindSampler(uniform, geom.colorTexture, RenderFlags_1.TextureUnit.Zero);
+        });
+    });
+    frag.addUniform("u_depthTexture", 8 /* Sampler2D */, (prog) => {
+        prog.addGraphicUniform("u_depthTexture", (uniform, params) => {
+            const geom = params.geometry;
+            Texture_1.Texture2DHandle.bindSampler(uniform, geom.depthTexture, RenderFlags_1.TextureUnit.One);
+        });
+    });
+    // Uniforms based on the PointCloudDisplaySettings.
+    frag.addUniform("u_pointCloudEDL1", 5 /* Vec4 */, (prog) => {
+        prog.addGraphicUniform("u_pointCloudEDL1", (uniform, params) => {
+            params.target.uniforms.realityModel.pointCloud.bindEDL1(uniform);
+        });
+    });
+    builder.vert.headerComment = "//!V! EDLCalcFull";
+    builder.frag.headerComment = "//!F! EDLCalcFull";
+    return builder.buildProgram(context);
+}
+exports.createEDLCalcFullProgram = createEDLCalcFullProgram;
+// This shader filters the EDL image, and can be run at 1/2 and 1/4 scale
+const filterEDL = `
+    // NB: this bilateral filter hardcodes spatialSigma to 2.0 and depthSigma to 0.4, with halfSize = 2
+    float distCoefs[] = float[] (
+        1.0, 0.9692332344763441, 0.8824969025845955, 0.9692332344763441, 0.9394130628134758,
+        0.8553453273074225, 0.8824969025845955, 0.8553453273074225, 0.8553453273074225, 0.7788007830714049);
+    const float depthSigma = 0.4;
+    vec2 invTexSize = u_texInfo.xy;
+
+    float depth = TEXTURE(u_depthTexture, v_texCoord).r;
+    float wsum = 0.0;  // sum of all weights
+    vec3  csum = vec3(0.0);  // sum of all contributions
+    vec2  coordi = vec2(0.0, 0.0);  // ith neighbor position x,y
+
+    for (int c = -2; c <= 2; c++) {
+        coordi.x = float(c) * invTexSize.x;
+        int cabs = (c < 0) ? -c : c;
+
+        for (int d = -2; d <= 2; d++) {
+            coordi.y = float(d) * invTexSize.y;
+            vec4 ci = TEXTURE(u_colorTexture, v_texCoord + coordi); // neighbor color
+
+            //pixel distance based damping
+            int dabs = (d < 0) ? -d : d;
+            float fi = distCoefs[cabs * 3 + dabs];
+
+            //pixel depth difference based damping
+            float zi = TEXTURE(u_depthTexture, v_texCoord + coordi).r; // neighbor depth
+            float dz = (depth - zi) / depthSigma;
+            fi *= exp(-dz * dz / 2.0);
+
+            csum += ci.rgb * fi;
+            wsum += fi;
+        }
+    }
+    return vec4(csum / wsum, 1.0);
+`;
+/** @internal */
+function createEDLFilterProgram(context) {
+    const builder = (0, ViewportQuad_1.createViewportQuadBuilder)(true);
+    const frag = builder.frag;
+    frag.set(1 /* ComputeBaseColor */, filterEDL);
+    frag.set(16 /* AssignFragData */, Fragment_1.assignFragColor);
+    frag.addUniform("u_texInfo", 4 /* Vec3 */, (prog) => {
+        prog.addGraphicUniform("u_texInfo", (uniform, params) => {
+            const geom = params.geometry;
+            uniform.setUniform3fv(geom.texInfo);
+        });
+    });
+    frag.addUniform("u_colorTexture", 8 /* Sampler2D */, (prog) => {
+        prog.addGraphicUniform("u_colorTexture", (uniform, params) => {
+            const geom = params.geometry;
+            Texture_1.Texture2DHandle.bindSampler(uniform, geom.colorTexture, RenderFlags_1.TextureUnit.Zero);
+        });
+    });
+    frag.addUniform("u_depthTexture", 8 /* Sampler2D */, (prog) => {
+        prog.addGraphicUniform("u_depthTexture", (uniform, params) => {
+            const geom = params.geometry;
+            Texture_1.Texture2DHandle.bindSampler(uniform, geom.depthTexture, RenderFlags_1.TextureUnit.One);
+        });
+    });
+    builder.vert.headerComment = "//!V! EDLFilter";
+    builder.frag.headerComment = "//!F! EDLFilter";
+    return builder.buildProgram(context);
+}
+exports.createEDLFilterProgram = createEDLFilterProgram;
+// This shader mixes the 3 EDL images into the final image
+const mixEDL = `
+  vec4 col1 = TEXTURE(u_colorTexture1, v_texCoord);
+  if (col1.a == 0.0)
+      discard;
+  else {
+      vec3 col2 = TEXTURE(u_colorTexture2, v_texCoord).rgb;
+      vec3 col4 = TEXTURE(u_colorTexture4, v_texCoord).rgb;
+      return vec4 ((u_weights.x * col1.rgb + u_weights.y * col2 + u_weights.z * col4) / (u_weights.x + u_weights.y + u_weights.z), 1.0);
+  }
+`;
+/** @internal */
+function createEDLMixProgram(context) {
+    const builder = (0, ViewportQuad_1.createViewportQuadBuilder)(true);
+    const frag = builder.frag;
+    frag.set(1 /* ComputeBaseColor */, mixEDL);
+    frag.set(16 /* AssignFragData */, Fragment_1.assignFragColor);
+    frag.addUniform("u_colorTexture1", 8 /* Sampler2D */, (prog) => {
+        prog.addGraphicUniform("u_colorTexture1", (uniform, params) => {
+            const geom = params.geometry;
+            Texture_1.Texture2DHandle.bindSampler(uniform, geom.colorTexture1, RenderFlags_1.TextureUnit.Zero);
+        });
+    });
+    frag.addUniform("u_colorTexture2", 8 /* Sampler2D */, (prog) => {
+        prog.addGraphicUniform("u_colorTexture2", (uniform, params) => {
+            const geom = params.geometry;
+            Texture_1.Texture2DHandle.bindSampler(uniform, geom.colorTexture2, RenderFlags_1.TextureUnit.One);
+        });
+    });
+    frag.addUniform("u_colorTexture4", 8 /* Sampler2D */, (prog) => {
+        prog.addGraphicUniform("u_colorTexture4", (uniform, params) => {
+            const geom = params.geometry;
+            Texture_1.Texture2DHandle.bindSampler(uniform, geom.colorTexture4, RenderFlags_1.TextureUnit.Two);
+        });
+    });
+    // Uniforms based on the PointCloudDisplaySettings.
+    frag.addUniform("u_weights", 5 /* Vec4 */, (prog) => {
+        prog.addGraphicUniform("u_weights", (uniform, params) => {
+            params.target.uniforms.realityModel.pointCloud.bindEDL2(uniform);
+        });
+    });
+    builder.vert.headerComment = "//!V! EDLMix";
+    builder.frag.headerComment = "//!F! EDLMix";
+    return builder.buildProgram(context);
+}
+exports.createEDLMixProgram = createEDLMixProgram;
+//# sourceMappingURL=EDL.js.map

package/lib/cjs/render/webgl/glsl/EDL.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EDL.js","sourceRoot":"","sources":["../../../../../src/render/webgl/glsl/EDL.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module WebGL\r\n */\r\n\r\nimport { WebGLContext } from \"@itwin/webgl-compatibility\";\r\nimport { EDLCalcBasicGeometry, EDLCalcFullGeometry, EDLFilterGeometry, EDLMixGeometry } from \"../CachedGeometry\";\r\nimport { TextureUnit } from \"../RenderFlags\";\r\nimport { FragmentShaderComponent, VariableType } from \"../ShaderBuilder\";\r\nimport { ShaderProgram } from \"../ShaderProgram\";\r\nimport { Texture2DHandle } from \"../Texture\";\r\nimport { assignFragColor } from \"./Fragment\";\r\nimport { createViewportQuadBuilder } from \"./ViewportQuad\";\r\n\r\n// This shader calculates a more basic version of EDL, and only for the original size, so single pass\r\nconst calcBasicEDL = `\r\n    float strength = u_pointCloudEDL1.x;\r\n    float scaleFactor = u_pointCloudEDL1.z;\r\n    float pixRadius = u_pointCloudEDL1.y;\r\n    vec2 invTexSize = u_texInfo.xy;\r\n    float is3d = u_pointCloudEDL1.w;\r\n\r\n    vec4 color = TEXTURE(u_colorTexture, v_texCoord);\r\n    if (color.a == 0.0)\r\n        discard;\r\n    else {\r\n        const vec2 neighbors[8] = vec2[8] (  //neighbor relative position\r\n            vec2( 1.0, 0.0), vec2( 0.70710678,  0.70710678), vec2(0.0,  1.0), vec2(-0.70710678,  0.70710678),\r\n            vec2(-1.0, 0.0), vec2(-0.70710678, -0.70710678), vec2(0.0, -1.0), vec2( 0.70710678, -0.70710678));\r\n        float depth = TEXTURE(u_depthTexture, v_texCoord).r;\r\n        float sum = 0.0;\r\n        vec2 posScale = pixRadius * invTexSize;\r\n        // contribution of each neighbor\r\n        // NOTE: this is currently using neighbor depths regardless of if they were written by point cloud\r\n        for (int c = 0; c < 8; c++) {\r\n            vec2 nRelPos = posScale * neighbors[c];\r\n            vec2 nPos = v_texCoord + nRelPos;\r\n            float zN = TEXTURE(u_depthTexture, nPos).r;  // neighbor depth\r\n            sum += max(0.0, (is3d > 0.5) ? depth - zN : log (depth/zN));\r\n        }\r\n        float f = sum / 8.0;\r\n        f = exp(-f * 33.5 * strength * scaleFactor); // 33.5 factor to aim for a typical (unfactored) strength of 5\r\n        return vec4(f * color.rgb, 1.0);\r\n    }\r\n`;\r\n\r\n/** @internal */\r\nexport function createEDLCalcBasicProgram(context: WebGLContext): ShaderProgram {\r\n  const builder = createViewportQuadBuilder(true);\r\n  const frag = builder.frag;\r\n\r\n  frag.set(FragmentShaderComponent.ComputeBaseColor, calcBasicEDL);\r\n  frag.set(FragmentShaderComponent.AssignFragData, assignFragColor);\r\n\r\n  frag.addUniform(\"u_texInfo\", VariableType.Vec3, (prog) => {\r\n    prog.addGraphicUniform(\"u_texInfo\", (uniform, params) => {\r\n      const geom = params.geometry as EDLCalcBasicGeometry;\r\n      uniform.setUniform3fv(geom.texInfo);\r\n    });\r\n  });\r\n\r\n  frag.addUniform(\"u_colorTexture\", VariableType.Sampler2D, (prog) => {\r\n    prog.addGraphicUniform(\"u_colorTexture\", (uniform, params) => {\r\n      const geom = params.geometry as EDLCalcBasicGeometry;\r\n      Texture2DHandle.bindSampler(uniform, geom.colorTexture, TextureUnit.Zero);\r\n    });\r\n  });\r\n\r\n  frag.addUniform(\"u_depthTexture\", VariableType.Sampler2D, (prog) => {\r\n    prog.addGraphicUniform(\"u_depthTexture\", (uniform, params) => {\r\n      const geom = params.geometry as EDLCalcBasicGeometry;\r\n      Texture2DHandle.bindSampler(uniform, geom.depthTexture, TextureUnit.One);\r\n    });\r\n  });\r\n\r\n  // Uniforms based on the PointCloudDisplaySettings.\r\n  frag.addUniform(\"u_pointCloudEDL1\", VariableType.Vec4, (prog) => {\r\n    prog.addGraphicUniform(\"u_pointCloudEDL1\", (uniform, params) => {\r\n      params.target.uniforms.realityModel.pointCloud.bindEDL1(uniform);\r\n    });\r\n  });\r\n\r\n  builder.vert.headerComment = \"//!V! EDLCalcBasic\";\r\n  builder.frag.headerComment = \"//!F! EDLCalcBasic\";\r\n\r\n  return builder.buildProgram(context);\r\n}\r\n\r\n// This shader calculates the full version of EDL, and can be run at full, 1/2 and 1/4 scale\r\nconst calcFullEDL = `\r\n    float strength = u_pointCloudEDL1.x;\r\n    float scaleFactor = u_pointCloudEDL1.z;\r\n    float pixRadius = u_pointCloudEDL1.y;\r\n    float scale = u_texInfo.z;  // 1, 2, 4\r\n    vec2 invTexSize = u_texInfo.xy;\r\n    float is3d = u_pointCloudEDL1.w;\r\n\r\n    vec4 color = TEXTURE(u_colorTexture, v_texCoord);\r\n    if (color.a == 0.0)\r\n        return color;\r\n    else {\r\n        const vec2 neighbors[8] = vec2[8] (  //neighbor relative position\r\n            vec2( 1.0, 0.0), vec2( 0.70710678,  0.70710678), vec2(0.0,  1.0), vec2(-0.70710678,  0.70710678),\r\n            vec2(-1.0, 0.0), vec2(-0.70710678, -0.70710678), vec2(0.0, -1.0), vec2( 0.70710678, -0.70710678));\r\n        float depth = TEXTURE(u_depthTexture, v_texCoord).r;\r\n        float sum = 0.0;\r\n        vec2 posScale = pixRadius * invTexSize;\r\n        // contribution of each neighbor\r\n        // NOTE: this is currently using neighbor depths regardless of if they were written by point cloud\r\n        for (int c = 0; c < 8; c++) {\r\n            vec2 nRelPos = posScale * neighbors[c];\r\n            vec2 nPos = v_texCoord + nRelPos;\r\n            float zN = TEXTURE(u_depthTexture, nPos).r;  // neighbor depth\r\n            sum += max(0.0, (is3d > 0.5) ? depth - zN : log (depth/zN)) / scale;\r\n        }\r\n        float f = sum / 8.0;\r\n        f = exp(-f * 33.5 * strength * scaleFactor); // 33.5 factor to aim for a typical (unfactored) strength of 5\r\n        return vec4(f * color.rgb, 1.0);\r\n    }\r\n`;\r\n\r\n/** @internal */\r\nexport function createEDLCalcFullProgram(context: WebGLContext): ShaderProgram {\r\n  const builder = createViewportQuadBuilder(true);\r\n  const frag = builder.frag;\r\n\r\n  frag.set(FragmentShaderComponent.ComputeBaseColor, calcFullEDL);\r\n  frag.set(FragmentShaderComponent.AssignFragData, assignFragColor);\r\n\r\n  frag.addUniform(\"u_texInfo\", VariableType.Vec3, (prog) => {\r\n    prog.addGraphicUniform(\"u_texInfo\", (uniform, params) => {\r\n      const geom = params.geometry as EDLCalcFullGeometry;\r\n      uniform.setUniform3fv(geom.texInfo);\r\n    });\r\n  });\r\n\r\n  frag.addUniform(\"u_colorTexture\", VariableType.Sampler2D, (prog) => {\r\n    prog.addGraphicUniform(\"u_colorTexture\", (uniform, params) => {\r\n      const geom = params.geometry as EDLCalcFullGeometry;\r\n      Texture2DHandle.bindSampler(uniform, geom.colorTexture, TextureUnit.Zero);\r\n    });\r\n  });\r\n\r\n  frag.addUniform(\"u_depthTexture\", VariableType.Sampler2D, (prog) => {\r\n    prog.addGraphicUniform(\"u_depthTexture\", (uniform, params) => {\r\n      const geom = params.geometry as EDLCalcFullGeometry;\r\n      Texture2DHandle.bindSampler(uniform, geom.depthTexture, TextureUnit.One);\r\n    });\r\n  });\r\n\r\n  // Uniforms based on the PointCloudDisplaySettings.\r\n  frag.addUniform(\"u_pointCloudEDL1\", VariableType.Vec4, (prog) => {\r\n    prog.addGraphicUniform(\"u_pointCloudEDL1\", (uniform, params) => {\r\n      params.target.uniforms.realityModel.pointCloud.bindEDL1(uniform);\r\n    });\r\n  });\r\n\r\n  builder.vert.headerComment = \"//!V! EDLCalcFull\";\r\n  builder.frag.headerComment = \"//!F! EDLCalcFull\";\r\n\r\n  return builder.buildProgram(context);\r\n}\r\n\r\n// This shader filters the EDL image, and can be run at 1/2 and 1/4 scale\r\nconst filterEDL = `\r\n    // NB: this bilateral filter hardcodes spatialSigma to 2.0 and depthSigma to 0.4, with halfSize = 2\r\n    float distCoefs[] = float[] (\r\n        1.0, 0.9692332344763441, 0.8824969025845955, 0.9692332344763441, 0.9394130628134758,\r\n        0.8553453273074225, 0.8824969025845955, 0.8553453273074225, 0.8553453273074225, 0.7788007830714049);\r\n    const float depthSigma = 0.4;\r\n    vec2 invTexSize = u_texInfo.xy;\r\n\r\n    float depth = TEXTURE(u_depthTexture, v_texCoord).r;\r\n    float wsum = 0.0;  // sum of all weights\r\n    vec3  csum = vec3(0.0);  // sum of all contributions\r\n    vec2  coordi = vec2(0.0, 0.0);  // ith neighbor position x,y\r\n\r\n    for (int c = -2; c <= 2; c++) {\r\n        coordi.x = float(c) * invTexSize.x;\r\n        int cabs = (c < 0) ? -c : c;\r\n\r\n        for (int d = -2; d <= 2; d++) {\r\n            coordi.y = float(d) * invTexSize.y;\r\n            vec4 ci = TEXTURE(u_colorTexture, v_texCoord + coordi); // neighbor color\r\n\r\n            //pixel distance based damping\r\n            int dabs = (d < 0) ? -d : d;\r\n            float fi = distCoefs[cabs * 3 + dabs];\r\n\r\n            //pixel depth difference based damping\r\n            float zi = TEXTURE(u_depthTexture, v_texCoord + coordi).r; // neighbor depth\r\n            float dz = (depth - zi) / depthSigma;\r\n            fi *= exp(-dz * dz / 2.0);\r\n\r\n            csum += ci.rgb * fi;\r\n            wsum += fi;\r\n        }\r\n    }\r\n    return vec4(csum / wsum, 1.0);\r\n`;\r\n\r\n/** @internal */\r\nexport function createEDLFilterProgram(context: WebGLContext): ShaderProgram {\r\n  const builder = createViewportQuadBuilder(true);\r\n  const frag = builder.frag;\r\n\r\n  frag.set(FragmentShaderComponent.ComputeBaseColor, filterEDL);\r\n  frag.set(FragmentShaderComponent.AssignFragData, assignFragColor);\r\n\r\n  frag.addUniform(\"u_texInfo\", VariableType.Vec3, (prog) => {\r\n    prog.addGraphicUniform(\"u_texInfo\", (uniform, params) => {\r\n      const geom = params.geometry as EDLFilterGeometry;\r\n      uniform.setUniform3fv(geom.texInfo);\r\n    });\r\n  });\r\n\r\n  frag.addUniform(\"u_colorTexture\", VariableType.Sampler2D, (prog) => {\r\n    prog.addGraphicUniform(\"u_colorTexture\", (uniform, params) => {\r\n      const geom = params.geometry as EDLFilterGeometry;\r\n      Texture2DHandle.bindSampler(uniform, geom.colorTexture, TextureUnit.Zero);\r\n    });\r\n  });\r\n\r\n  frag.addUniform(\"u_depthTexture\", VariableType.Sampler2D, (prog) => {\r\n    prog.addGraphicUniform(\"u_depthTexture\", (uniform, params) => {\r\n      const geom = params.geometry as EDLFilterGeometry;\r\n      Texture2DHandle.bindSampler(uniform, geom.depthTexture, TextureUnit.One);\r\n    });\r\n  });\r\n\r\n  builder.vert.headerComment = \"//!V! EDLFilter\";\r\n  builder.frag.headerComment = \"//!F! EDLFilter\";\r\n\r\n  return builder.buildProgram(context);\r\n}\r\n\r\n// This shader mixes the 3 EDL images into the final image\r\nconst mixEDL = `\r\n  vec4 col1 = TEXTURE(u_colorTexture1, v_texCoord);\r\n  if (col1.a == 0.0)\r\n      discard;\r\n  else {\r\n      vec3 col2 = TEXTURE(u_colorTexture2, v_texCoord).rgb;\r\n      vec3 col4 = TEXTURE(u_colorTexture4, v_texCoord).rgb;\r\n      return vec4 ((u_weights.x * col1.rgb + u_weights.y * col2 + u_weights.z * col4) / (u_weights.x + u_weights.y + u_weights.z), 1.0);\r\n  }\r\n`;\r\n\r\n/** @internal */\r\nexport function createEDLMixProgram(context: WebGLContext): ShaderProgram {\r\n  const builder = createViewportQuadBuilder(true);\r\n  const frag = builder.frag;\r\n\r\n  frag.set(FragmentShaderComponent.ComputeBaseColor, mixEDL);\r\n  frag.set(FragmentShaderComponent.AssignFragData, assignFragColor);\r\n\r\n  frag.addUniform(\"u_colorTexture1\", VariableType.Sampler2D, (prog) => {\r\n    prog.addGraphicUniform(\"u_colorTexture1\", (uniform, params) => {\r\n      const geom = params.geometry as EDLMixGeometry;\r\n      Texture2DHandle.bindSampler(uniform, geom.colorTexture1, TextureUnit.Zero);\r\n    });\r\n  });\r\n\r\n  frag.addUniform(\"u_colorTexture2\", VariableType.Sampler2D, (prog) => {\r\n    prog.addGraphicUniform(\"u_colorTexture2\", (uniform, params) => {\r\n      const geom = params.geometry as EDLMixGeometry;\r\n      Texture2DHandle.bindSampler(uniform, geom.colorTexture2, TextureUnit.One);\r\n    });\r\n  });\r\n\r\n  frag.addUniform(\"u_colorTexture4\", VariableType.Sampler2D, (prog) => {\r\n    prog.addGraphicUniform(\"u_colorTexture4\", (uniform, params) => {\r\n      const geom = params.geometry as EDLMixGeometry;\r\n      Texture2DHandle.bindSampler(uniform, geom.colorTexture4, TextureUnit.Two);\r\n    });\r\n  });\r\n\r\n  // Uniforms based on the PointCloudDisplaySettings.\r\n  frag.addUniform(\"u_weights\", VariableType.Vec4, (prog) => {\r\n    prog.addGraphicUniform(\"u_weights\", (uniform, params) => {\r\n      params.target.uniforms.realityModel.pointCloud.bindEDL2(uniform);\r\n    });\r\n  });\r\n\r\n  builder.vert.headerComment = \"//!V! EDLMix\";\r\n  builder.frag.headerComment = \"//!F! EDLMix\";\r\n\r\n  return builder.buildProgram(context);\r\n}\r\n"]}

package/lib/cjs/render/webgl/glsl/RenderPass.js

@@ -14,14 +14,14 @@ const renderPasses = [
     [1 /* OpaqueLayers */, "Layers"],
     [2 /* OpaqueLinear */, "OpaqueLinear"],
     [3 /* OpaquePlanar */, "OpaquePlanar"],
-    [4 /* OpaqueGeneral */, "OpaqueGeneral"],
-    [5 /* Classification */, "Classification"],
-    [7 /* Translucent */, "Translucent"],
-    [8 /* HiddenEdge */, "HiddenEdge"],
-    [9 /* Hilite */, "Hilite"],
-    [11 /* WorldOverlay */, "WorldOverlay"],
-    [12 /* ViewOverlay */, "ViewOverlay"],
-    [18 /* PlanarClassification */, "PlanarClassification"],
+    [5 /* OpaqueGeneral */, "OpaqueGeneral"],
+    [6 /* Classification */, "Classification"],
+    [8 /* Translucent */, "Translucent"],
+    [9 /* HiddenEdge */, "HiddenEdge"],
+    [10 /* Hilite */, "Hilite"],
+    [12 /* WorldOverlay */, "WorldOverlay"],
+    [13 /* ViewOverlay */, "ViewOverlay"],
+    [19 /* PlanarClassification */, "PlanarClassification"],
 ];
 /**
  * Adds a uniform holding the current render pass and a set of kRenderPass_* constants
@@ -33,11 +33,11 @@ function addRenderPass(builder) {
         prog.addProgramUniform("u_renderPass", (uniform, params) => {
             let renderPass = params.renderPass;
             switch (renderPass) {
-                case 8 /* HiddenEdge */:
-                    renderPass = 4 /* OpaqueGeneral */; // no distinction from shader POV...
+                case 9 /* HiddenEdge */:
+                    renderPass = 5 /* OpaqueGeneral */; // no distinction from shader POV...
                     break;
-                case 10 /* OverlayLayers */:
-                case 6 /* TranslucentLayers */:
+                case 11 /* OverlayLayers */:
+                case 7 /* TranslucentLayers */:
                     renderPass = 1 /* OpaqueLayers */; // no distinction from shader POV...
                     break;
             }

package/lib/cjs/render/webgl/glsl/RenderPass.js.map

@@ -1 +1 @@
-{"version":3,"file":"RenderPass.js","sourceRoot":"","sources":["../../../../../src/render/webgl/glsl/RenderPass.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAKH,8CAA8C;AAC9C,MAAM,YAAY,GAAG;IACnB,qBAAwB,YAAY,CAAC;IACrC,uBAA0B,QAAQ,CAAC;IACnC,uBAA0B,cAAc,CAAC;IACzC,uBAA0B,cAAc,CAAC;IACzC,wBAA2B,eAAe,CAAC;IAC3C,yBAA4B,gBAAgB,CAAC;IAC7C,sBAAyB,aAAa,CAAC;IACvC,qBAAwB,YAAY,CAAC;IACrC,iBAAoB,QAAQ,CAAC;IAC7B,wBAA0B,cAAc,CAAC;IACzC,uBAAyB,aAAa,CAAC;IACvC,gCAAkC,sBAAsB,CAAC;CAC1D,CAAC;AAEF;;;;GAIG;AACH,SAAgB,aAAa,CAAC,OAAsB;IAClD,OAAO,CAAC,UAAU,CAAC,cAAc,iBAAsB,CAAC,IAAI,EAAE,EAAE;QAC9D,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzD,IAAI,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;YACnC,QAAQ,UAAU,EAAE;gBAClB;oBACE,UAAU,wBAA2B,CAAC,CAAC,oCAAoC;oBAC3E,MAAM;gBACR,4BAA8B;gBAC9B;oBACE,UAAU,uBAA0B,CAAC,CAAC,oCAAoC;oBAC1E,MAAM;aACT;YAED,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,UAAU,IAAI,YAAY;QACnC,OAAO,CAAC,SAAS,CAAC,eAAe,UAAU,CAAC,CAAC,CAAC,EAAE,iBAAsB,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACjH,CAAC;AApBD,sCAoBC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module WebGL\r\n */\r\n\r\nimport { RenderPass } from \"../RenderFlags\";\r\nimport { ShaderBuilder, VariableType } from \"../ShaderBuilder\";\r\n\r\n// render passes actually used in shader code.\r\nconst renderPasses = [\r\n  [RenderPass.Background, \"Background\"],\r\n  [RenderPass.OpaqueLayers, \"Layers\"], // Shaders treat all layer passes the same\r\n  [RenderPass.OpaqueLinear, \"OpaqueLinear\"],\r\n  [RenderPass.OpaquePlanar, \"OpaquePlanar\"],\r\n  [RenderPass.OpaqueGeneral, \"OpaqueGeneral\"],\r\n  [RenderPass.Classification, \"Classification\"],\r\n  [RenderPass.Translucent, \"Translucent\"],\r\n  [RenderPass.HiddenEdge, \"HiddenEdge\"],\r\n  [RenderPass.Hilite, \"Hilite\"],\r\n  [RenderPass.WorldOverlay, \"WorldOverlay\"],\r\n  [RenderPass.ViewOverlay, \"ViewOverlay\"],\r\n  [RenderPass.PlanarClassification, \"PlanarClassification\"],\r\n];\r\n\r\n/**\r\n * Adds a uniform holding the current render pass and a set of kRenderPass_* constants\r\n * uniform float u_renderPass\r\n * @internal\r\n */\r\nexport function addRenderPass(builder: ShaderBuilder) {\r\n  builder.addUniform(\"u_renderPass\", VariableType.Float, (prog) => {\r\n    prog.addProgramUniform(\"u_renderPass\", (uniform, params) => {\r\n      let renderPass = params.renderPass;\r\n      switch (renderPass) {\r\n        case RenderPass.HiddenEdge:\r\n          renderPass = RenderPass.OpaqueGeneral; // no distinction from shader POV...\r\n          break;\r\n        case RenderPass.OverlayLayers:\r\n        case RenderPass.TranslucentLayers:\r\n          renderPass = RenderPass.OpaqueLayers; // no distinction from shader POV...\r\n          break;\r\n      }\r\n\r\n      uniform.setUniform1f(renderPass);\r\n    });\r\n  });\r\n\r\n  for (const renderPass of renderPasses)\r\n    builder.addGlobal(`kRenderPass_${renderPass[1]}`, VariableType.Float, `${renderPass[0].toString()}.0`, true);\r\n}\r\n"]}
+{"version":3,"file":"RenderPass.js","sourceRoot":"","sources":["../../../../../src/render/webgl/glsl/RenderPass.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAKH,8CAA8C;AAC9C,MAAM,YAAY,GAAG;IACnB,qBAAwB,YAAY,CAAC;IACrC,uBAA0B,QAAQ,CAAC;IACnC,uBAA0B,cAAc,CAAC;IACzC,uBAA0B,cAAc,CAAC;IACzC,wBAA2B,eAAe,CAAC;IAC3C,yBAA4B,gBAAgB,CAAC;IAC7C,sBAAyB,aAAa,CAAC;IACvC,qBAAwB,YAAY,CAAC;IACrC,kBAAoB,QAAQ,CAAC;IAC7B,wBAA0B,cAAc,CAAC;IACzC,uBAAyB,aAAa,CAAC;IACvC,gCAAkC,sBAAsB,CAAC;CAC1D,CAAC;AAEF;;;;GAIG;AACH,SAAgB,aAAa,CAAC,OAAsB;IAClD,OAAO,CAAC,UAAU,CAAC,cAAc,iBAAsB,CAAC,IAAI,EAAE,EAAE;QAC9D,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzD,IAAI,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;YACnC,QAAQ,UAAU,EAAE;gBAClB;oBACE,UAAU,wBAA2B,CAAC,CAAC,oCAAoC;oBAC3E,MAAM;gBACR,4BAA8B;gBAC9B;oBACE,UAAU,uBAA0B,CAAC,CAAC,oCAAoC;oBAC1E,MAAM;aACT;YAED,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,UAAU,IAAI,YAAY;QACnC,OAAO,CAAC,SAAS,CAAC,eAAe,UAAU,CAAC,CAAC,CAAC,EAAE,iBAAsB,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACjH,CAAC;AApBD,sCAoBC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module WebGL\r\n */\r\n\r\nimport { RenderPass } from \"../RenderFlags\";\r\nimport { ShaderBuilder, VariableType } from \"../ShaderBuilder\";\r\n\r\n// render passes actually used in shader code.\r\nconst renderPasses = [\r\n  [RenderPass.Background, \"Background\"],\r\n  [RenderPass.OpaqueLayers, \"Layers\"], // Shaders treat all layer passes the same\r\n  [RenderPass.OpaqueLinear, \"OpaqueLinear\"],\r\n  [RenderPass.OpaquePlanar, \"OpaquePlanar\"],\r\n  [RenderPass.OpaqueGeneral, \"OpaqueGeneral\"],\r\n  [RenderPass.Classification, \"Classification\"],\r\n  [RenderPass.Translucent, \"Translucent\"],\r\n  [RenderPass.HiddenEdge, \"HiddenEdge\"],\r\n  [RenderPass.Hilite, \"Hilite\"],\r\n  [RenderPass.WorldOverlay, \"WorldOverlay\"],\r\n  [RenderPass.ViewOverlay, \"ViewOverlay\"],\r\n  [RenderPass.PlanarClassification, \"PlanarClassification\"],\r\n];\r\n\r\n/**\r\n * Adds a uniform holding the current render pass and a set of kRenderPass_* constants\r\n * uniform float u_renderPass\r\n * @internal\r\n */\r\nexport function addRenderPass(builder: ShaderBuilder) {\r\n  builder.addUniform(\"u_renderPass\", VariableType.Float, (prog) => {\r\n    prog.addProgramUniform(\"u_renderPass\", (uniform, params) => {\r\n      let renderPass = params.renderPass;\r\n      switch (renderPass) {\r\n        case RenderPass.HiddenEdge:\r\n          renderPass = RenderPass.OpaqueGeneral; // no distinction from shader POV...\r\n          break;\r\n        case RenderPass.OverlayLayers:\r\n        case RenderPass.TranslucentLayers:\r\n          renderPass = RenderPass.OpaqueLayers; // no distinction from shader POV...\r\n          break;\r\n      }\r\n\r\n      uniform.setUniform1f(renderPass);\r\n    });\r\n  });\r\n\r\n  for (const renderPass of renderPasses)\r\n    builder.addGlobal(`kRenderPass_${renderPass[1]}`, VariableType.Float, `${renderPass[0].toString()}.0`, true);\r\n}\r\n"]}

package/lib/cjs/render/webgl/glsl/Surface.js

@@ -452,7 +452,7 @@ function addNormal(builder, instanced, animated) {
                     undefined !== params.geometry.materialInfo.textureMapping &&
                     undefined !== params.geometry.materialInfo.textureMapping.normalMapParams) {
                     normalMapScale = (_a = params.geometry.materialInfo.textureMapping.normalMapParams.scale) !== null && _a !== void 0 ? _a : 1.0;
-                    if (!params.geometry.materialInfo.textureMapping.normalMapParams.greenDown)
+                    if (params.geometry.materialInfo.textureMapping.normalMapParams.greenUp)
                         normalMapScale = -normalMapScale;
                 }
                 uniform.setUniform1f(normalMapScale);