@itwin/rpcinterface-full-stack-tests 3.5.0-dev.63 → 3.5.0-dev.65

package/lib/dist/bundled-tests.js

@@ -64191,6 +64191,8 @@ var TypeOfChange;
     TypeOfChange[TypeOfChange["Indirect"] = 8] = "Indirect";
     /** Hidden properties of the element changed */
     TypeOfChange[TypeOfChange["Hidden"] = 16] = "Hidden";
+    /** The top-most parent of the element has changed */
+    TypeOfChange[TypeOfChange["Parent"] = 32] = "Parent";
 })(TypeOfChange || (TypeOfChange = {}));
 
 
@@ -79114,8 +79116,16 @@ class ViewDetails {
         return this._clipVector.isValid ? this._clipVector : undefined;
     }
     set clipVector(clip) {
-        if (!clip)
-            clip = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.ClipVector.createEmpty();
+        const curClip = this.clipVector;
+        if (curClip === clip)
+            return;
+        if (!curClip) {
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== clip);
+            // An empty clip is equivalent to no clip.
+            if (!clip.isValid)
+                return;
+        }
+        clip = clip !== null && clip !== void 0 ? clip : _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.ClipVector.createEmpty();
         this.onClipVectorChanged.raiseEvent(clip.isValid ? clip : undefined);
         this._clipVector = clip;
         if (clip.isValid)
@@ -114116,6 +114126,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "ViewPose3d": () => (/* binding */ ViewPose3d)
 /* harmony export */ });
 /* harmony import */ var _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-geometry */ "../../core/geometry/lib/esm/core-geometry.js");
+/* harmony import */ var _ViewState__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ViewState */ "../../core/frontend/lib/esm/ViewState.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -114124,8 +114135,10 @@ __webpack_require__.r(__webpack_exports__);
  * @module Views
  */
 
-/** The "pose" for a view. This is either the volume or area, depending on whether the view is 3d or 2d,
- * plus the camera position/angle, if it is enabled.
+
+/** The "pose" for a [View]($docs/learning/frontend/views#viewstate-parameters) describing the viewed area or volume, depending upon whether
+ * the view is 2d or 3d.
+ * @see [[ViewState.savePose]] to extract a pose from a view and [[ViewState.applyPose]] to apply a pose to a view.
  * @note a ViewPose is immutable.
  * @public
  * @extensions
@@ -114134,15 +114147,22 @@ class ViewPose {
     constructor(cameraOn) {
         this.cameraOn = cameraOn;
     }
+    /** Computes the center of the viewed volume. */
     get center() {
         const delta = this.rotation.multiplyTransposeVector(this.extents);
         return this.origin.plusScaled(delta, 0.5);
     }
+    /** Returns the target point of the view. This is the same as [[center]] unless [[cameraOn]] is `true`. */
     get target() { return this.center; }
+    /** Computes the Z vector of the [[rotation]] matrix. */
     get zVec() { return this.rotation.getRow(2); }
 }
-/** @internal */
+/** The "pose" for a [[ViewState3d]], including information about the view's [Camera]($common) if it is enabled.
+ * @public
+ * @extensions
+ */
 class ViewPose3d extends ViewPose {
+    /** Construct a pose from the specified 3d view. */
     constructor(view) {
         super(view.isCameraOn);
         this.origin = view.origin.clone();
@@ -114150,17 +114170,24 @@ class ViewPose3d extends ViewPose {
         this.rotation = view.rotation.clone();
         this.camera = view.camera.clone();
     }
+    /** @internal override */
     get target() {
         return this.cameraOn ? this.camera.eye.plusScaled(this.rotation.getRow(2), -1.0 * this.camera.focusDist) : this.center;
     }
+    /** @internal override */
     equal(other) {
+        if (!(other instanceof ViewPose3d))
+            return false;
         return this.cameraOn === other.cameraOn &&
             this.origin.isAlmostEqual(other.origin) &&
             this.extents.isAlmostEqual(other.extents) &&
             this.rotation.isAlmostEqual(other.rotation) &&
             (!this.cameraOn || this.camera.equals(other.camera));
     }
+    /** @internal override */
     equalState(view) {
+        if (!(view instanceof _ViewState__WEBPACK_IMPORTED_MODULE_1__.ViewState3d))
+            return false;
         return this.cameraOn === view.isCameraOn &&
             this.origin.isAlmostEqual(view.origin) &&
             this.extents.isAlmostEqual(view.extents) &&
@@ -114168,26 +114195,39 @@ class ViewPose3d extends ViewPose {
             (!this.cameraOn || this.camera.equals(view.camera));
     }
 }
-/** @internal */
+/** The "pose" for a [[ViewState2d]].
+ * @public
+ * @extensions
+ */
 class ViewPose2d extends ViewPose {
+    /** Construct a pose from the specified 2d view. */
     constructor(view) {
         super(false);
-        this.origin2 = view.origin.clone();
+        this.origin2d = view.origin.clone();
         this.delta = view.delta.clone();
         this.angle = view.angle.clone();
     }
+    /** @internal override */
     equal(other) {
-        return this.origin2.isAlmostEqual(other.origin) &&
+        if (!(other instanceof ViewPose2d))
+            return false;
+        return this.origin2d.isAlmostEqual(other.origin) &&
             this.delta.isAlmostEqual(other.delta) &&
             this.angle.isAlmostEqualNoPeriodShift(other.angle);
     }
+    /** @internal override */
     equalState(view) {
-        return this.origin2.isAlmostEqual(view.origin) &&
+        if (!(view instanceof _ViewState__WEBPACK_IMPORTED_MODULE_1__.ViewState2d))
+            return false;
+        return this.origin2d.isAlmostEqual(view.origin) &&
             this.delta.isAlmostEqual(view.delta) &&
             this.angle.isAlmostEqualNoPeriodShift(view.angle);
     }
-    get origin() { return new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Point3d(this.origin2.x, this.origin2.y); }
+    /** @internal override */
+    get origin() { return new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Point3d(this.origin2d.x, this.origin2d.y); }
+    /** @internal override */
     get extents() { return new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Vector3d(this.delta.x, this.delta.y); }
+    /** @internal override */
     get rotation() { return _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Matrix3d.createRotationAroundVector(_itwin_core_geometry__WEBPACK_IMPORTED_MODULE_0__.Vector3d.unitZ(), this.angle); }
 }
 
@@ -115429,16 +115469,18 @@ class ViewState3d extends ViewState {
         const index = this.details.modelClipGroups.findGroupIndex(modelId);
         return -1 !== index ? this._modelClips[index] : undefined;
     }
-    /** @internal */
+    /** Capture a copy of the viewed volume and camera parameters. */
     savePose() { return new _ViewPose__WEBPACK_IMPORTED_MODULE_14__.ViewPose3d(this); }
-    /** @internal */
+    /** @internal override */
     applyPose(val) {
-        this._cameraOn = val.cameraOn;
-        this.setOrigin(val.origin);
-        this.setExtents(val.extents);
-        this.rotation.setFrom(val.rotation);
-        this.camera.setFrom(val.camera);
-        this._updateMaxGlobalScopeFactor();
+        if (val instanceof _ViewPose__WEBPACK_IMPORTED_MODULE_14__.ViewPose3d) {
+            this._cameraOn = val.cameraOn;
+            this.setOrigin(val.origin);
+            this.setExtents(val.extents);
+            this.rotation.setFrom(val.rotation);
+            this.camera.setFrom(val.camera);
+            this._updateMaxGlobalScopeFactor();
+        }
         return this;
     }
     toJSON() {
@@ -116134,13 +116176,15 @@ class ViewState2d extends ViewState {
     is3d() { return false; }
     /** @internal */
     isSpatialView() { return false; }
-    /** @internal */
+    /** Capture a copy of the viewed area. */
     savePose() { return new _ViewPose__WEBPACK_IMPORTED_MODULE_14__.ViewPose2d(this); }
-    /** @internal */
+    /** @internal override */
     applyPose(val) {
-        this.setOrigin(val.origin);
-        this.setExtents(val.delta);
-        this.angle.setFrom(val.angle);
+        if (val instanceof _ViewPose__WEBPACK_IMPORTED_MODULE_14__.ViewPose2d) {
+            this.setOrigin(val.origin);
+            this.setExtents(val.delta);
+            this.angle.setFrom(val.angle);
+        }
         return this;
     }
     /** Return the model for this 2d view. */
@@ -137381,6 +137425,19 @@ class MeshData {
         if (undefined !== params.surface.textureMapping) {
             this.texture = params.surface.textureMapping.texture;
             this._textureAlwaysDisplayed = params.surface.textureMapping.alwaysDisplayed;
+            if (undefined !== params.surface.material && !params.surface.material.isAtlas) {
+                const matTM = params.surface.material.material.textureMapping;
+                if (undefined !== matTM && undefined !== matTM.normalMapParams) {
+                    if (undefined !== matTM.normalMapParams.normalMap) {
+                        this.normalMap = matTM.normalMapParams.normalMap;
+                    }
+                    else {
+                        // If there are normal map params but the normal map is not present, use the texture as a normal map instead of a pattern map.
+                        this.normalMap = this.texture;
+                        this.texture = undefined;
+                    }
+                }
+            }
         }
         else {
             this.texture = undefined;
@@ -137465,6 +137522,7 @@ class MeshGeometry extends _CachedGeometry__WEBPACK_IMPORTED_MODULE_1__.LUTGeome
     get colorInfo() { return this.mesh.lut.colorInfo; }
     get uniformColor() { return this.colorInfo.isUniform ? this.colorInfo.uniform : undefined; }
     get texture() { return this.mesh.texture; }
+    get normalMap() { return this.mesh.normalMap; }
     get hasBakedLighting() { return this.mesh.hasBakedLighting; }
     get lut() { return this.mesh.lut; }
     get hasScalarAnimation() { return this.mesh.lut.hasScalarAnimation; }
@@ -140275,6 +140333,8 @@ var TextureUnit;
     TextureUnit[TextureUnit["RealityMeshThematicGradient"] = WebGLRenderingContext.TEXTURE11] = "RealityMeshThematicGradient";
     // Lookup table for indexed edges - used only if WebGL 2 is available.
     TextureUnit[TextureUnit["EdgeLUT"] = WebGLRenderingContext.TEXTURE12] = "EdgeLUT";
+    // Normal map texture - used only if WebGL 2 is available.
+    TextureUnit[TextureUnit["NormalMap"] = WebGLRenderingContext.TEXTURE13] = "NormalMap";
 })(TextureUnit || (TextureUnit = {}));
 /** @internal */
 function isPlanar(order) {
@@ -143780,7 +143840,7 @@ class VertexShaderBuilder extends ShaderBuilder {
  */
 class FragmentShaderBuilder extends ShaderBuilder {
     constructor(flags = {}) {
-        super(21 /* COUNT */, flags);
+        super(22 /* COUNT */, flags);
         this.requiresEarlyZWorkaround = false;
         if (_System__WEBPACK_IMPORTED_MODULE_5__.System.instance.capabilities.isWebGL2)
             this.addFragOutput("FragColor", -1);
@@ -143826,6 +143886,11 @@ class FragmentShaderBuilder extends ShaderBuilder {
             prelude.addFunction("bool checkForEarlyDiscard()", checkForEarlyDiscard);
             main.addline("  if (checkForEarlyDiscard()) { discard; return; }");
         }
+        const finalizeNormal = this.get(21 /* FinalizeNormal */);
+        if (undefined !== finalizeNormal) {
+            prelude.addFunction("vec3 finalizeNormal()", finalizeNormal);
+            main.addline("  g_normal = finalizeNormal();");
+        }
         main.addline("  vec4 baseColor = computeBaseColor();");
         const finalizeDepth = this.get(18 /* FinalizeDepth */);
         if (undefined !== finalizeDepth) {
@@ -145358,6 +145423,7 @@ class SurfaceGeometry extends _MeshGeometry__WEBPACK_IMPORTED_MODULE_7__.MeshGeo
     get isLit() { return _primitives_SurfaceParams__WEBPACK_IMPORTED_MODULE_2__.SurfaceType.Lit === this.surfaceType || _primitives_SurfaceParams__WEBPACK_IMPORTED_MODULE_2__.SurfaceType.TexturedLit === this.surfaceType; }
     get isTexturedType() { return _primitives_SurfaceParams__WEBPACK_IMPORTED_MODULE_2__.SurfaceType.Textured === this.surfaceType || _primitives_SurfaceParams__WEBPACK_IMPORTED_MODULE_2__.SurfaceType.TexturedLit === this.surfaceType; }
     get hasTexture() { return this.isTexturedType && undefined !== this.texture; }
+    get hasNormalMap() { return this.isLit && this.isTexturedType && undefined !== this.normalMap; }
     get isGlyph() { return this.mesh.isGlyph; }
     get alwaysRenderTranslucent() { return this.isGlyph; }
     get isTileSection() { return undefined !== this.texture && this.texture.isTileSection; }
@@ -145474,6 +145540,9 @@ class SurfaceGeometry extends _MeshGeometry__WEBPACK_IMPORTED_MODULE_7__.MeshGeo
     useTexture(params) {
         return this.wantTextures(params.target, this.hasTexture);
     }
+    useNormalMap(params) {
+        return this.wantNormalMaps(params.target, this.hasNormalMap);
+    }
     computeSurfaceFlags(params, flags) {
         const target = params.target;
         const vf = target.currentViewFlags;
@@ -145481,7 +145550,6 @@ class SurfaceGeometry extends _MeshGeometry__WEBPACK_IMPORTED_MODULE_7__.MeshGeo
         flags[3 /* IgnoreMaterial */] = useMaterial ? 0 : 1;
         flags[9 /* HasMaterialAtlas */] = useMaterial && this.hasMaterialAtlas ? 1 : 0;
         flags[1 /* ApplyLighting */] = 0;
-        flags[8 /* HasNormalMap */] = 0;
         flags[6 /* HasColorAndNormal */] = 0;
         if (this.isLit) {
             flags[2 /* HasNormals */] = 1;
@@ -145498,6 +145566,7 @@ class SurfaceGeometry extends _MeshGeometry__WEBPACK_IMPORTED_MODULE_7__.MeshGeo
             flags[2 /* HasNormals */] = 0;
         }
         flags[0 /* HasTexture */] = this.useTexture(params) ? 1 : 0;
+        flags[8 /* HasNormalMap */] = this.useNormalMap(params) ? 1 : 0;
         // The transparency threshold controls how transparent a surface must be to allow light to pass through; more opaque surfaces cast shadows.
         flags[4 /* TransparencyThreshold */] = params.target.isDrawingShadowMap ? 1 : 0;
         flags[5 /* BackgroundFill */] = 0;
@@ -145544,6 +145613,17 @@ class SurfaceGeometry extends _MeshGeometry__WEBPACK_IMPORTED_MODULE_7__.MeshGeo
                 return _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.Always === (fill & _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.Always);
         }
     }
+    wantNormalMaps(target, normalMapExists) {
+        if (!normalMapExists || !target.displayNormalMaps)
+            return false;
+        const flags = target.currentViewFlags;
+        switch (flags.renderMode) {
+            case _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.RenderMode.SmoothShade:
+                return flags.textures;
+            default:
+                return false;
+        }
+    }
 }
 
 
@@ -146218,6 +146298,7 @@ class System extends _RenderSystem__WEBPACK_IMPORTED_MODULE_7__.RenderSystem {
                 textureWeight: args.textureMapping.weight,
                 worldMapping: args.textureMapping.worldMapping,
             }));
+            params.textureMapping.normalMapParams = args.textureMapping.normalMapParams;
         }
         if (args.source) {
             params.key = args.source.id;
@@ -146561,6 +146642,7 @@ class Target extends _RenderTarget__WEBPACK_IMPORTED_MODULE_8__.RenderTarget {
         this.displayRealityTilePreload = false;
         this.displayRealityTileRanges = false;
         this.logRealityTiles = false;
+        this.displayNormalMaps = true;
         this.freezeRealityTiles = false;
         this._isDisposed = false;
         this._scratchRange = new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Range3d();
@@ -150805,9 +150887,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
 /* harmony import */ var _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-common */ "../../core/common/lib/esm/core-common.js");
-/* harmony import */ var _RenderFlags__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../RenderFlags */ "../../core/frontend/lib/esm/render/webgl/RenderFlags.js");
-/* harmony import */ var _Surface__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Surface */ "../../core/frontend/lib/esm/render/webgl/glsl/Surface.js");
-/* harmony import */ var _Vertex__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Vertex */ "../../core/frontend/lib/esm/render/webgl/glsl/Vertex.js");
+/* harmony import */ var _System__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../System */ "../../core/frontend/lib/esm/render/webgl/System.js");
+/* harmony import */ var _RenderFlags__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../RenderFlags */ "../../core/frontend/lib/esm/render/webgl/RenderFlags.js");
+/* harmony import */ var _Surface__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Surface */ "../../core/frontend/lib/esm/render/webgl/glsl/Surface.js");
+/* harmony import */ var _Vertex__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Vertex */ "../../core/frontend/lib/esm/render/webgl/glsl/Vertex.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -150820,6 +150903,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 const initialize = `
   g_anim_step = vec2(1.0) / u_animLUTParams.xy;
   g_anim_center = g_anim_step * 0.5;
@@ -150975,12 +151059,12 @@ function addAnimation(vert, isSurface, isThematic) {
     vert.addGlobal("g_anim_step", 3 /* Vec2 */);
     vert.addGlobal("g_anim_center", 3 /* Vec2 */);
     vert.addInitializer(initialize);
-    vert.addFunction(_Vertex__WEBPACK_IMPORTED_MODULE_4__.unquantizePosition);
+    vert.addFunction(_Vertex__WEBPACK_IMPORTED_MODULE_5__.unquantizePosition);
     vert.addUniform("u_animLUT", 8 /* Sampler2D */, (prog) => {
         prog.addGraphicUniform("u_animLUT", (uniform, params) => {
             const channels = (params.geometry.asLUT).lut.auxChannels;
             (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== channels);
-            channels.texture.bindSampler(uniform, _RenderFlags__WEBPACK_IMPORTED_MODULE_2__.TextureUnit.AuxChannelLUT);
+            channels.texture.bindSampler(uniform, _RenderFlags__WEBPACK_IMPORTED_MODULE_3__.TextureUnit.AuxChannelLUT);
         });
     });
     vert.addUniform("u_animLUTParams", 4 /* Vec3 */, (prog) => {
@@ -151032,7 +151116,7 @@ function addAnimation(vert, isSurface, isThematic) {
     });
     // Normal and param
     if (isSurface) {
-        vert.addFunction(_Surface__WEBPACK_IMPORTED_MODULE_3__.octDecodeNormal);
+        vert.addFunction(_Surface__WEBPACK_IMPORTED_MODULE_4__.octDecodeNormal);
         vert.addFunction(computeAnimationFrameNormal);
         vert.addFunction(computeAnimationNormal);
         vert.addFunction(computeAnimationFrameParam);
@@ -151046,7 +151130,7 @@ function addAnimation(vert, isSurface, isThematic) {
                 uniform.setUniform3fv(animParams);
             });
         });
-        if (isThematic === 0 /* No */) {
+        if (isThematic === 0 /* No */ || _System__WEBPACK_IMPORTED_MODULE_2__.System.instance.capabilities.isWebGL2) {
             vert.addUniform("u_animScalarParams", 4 /* Vec3 */, (prog) => {
                 prog.addGraphicUniform("u_animScalarParams", (uniform, params) => {
                     const scalars = getScalarChannel(params);
@@ -151691,7 +151775,8 @@ function createCombineTexturesProgram(context) {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "addChooseWithBitFlagFunctions": () => (/* binding */ addChooseWithBitFlagFunctions),
+/* harmony export */   "addChooseVec2WithBitFlagsFunction": () => (/* binding */ addChooseVec2WithBitFlagsFunction),
+/* harmony export */   "addChooseVec3WithBitFlagFunction": () => (/* binding */ addChooseVec3WithBitFlagFunction),
 /* harmony export */   "addExtractNthBit": () => (/* binding */ addExtractNthBit),
 /* harmony export */   "addEyeSpace": () => (/* binding */ addEyeSpace),
 /* harmony export */   "addFrustum": () => (/* binding */ addFrustum),
@@ -151711,17 +151796,18 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-const chooseFloatWithBitFlag = `
-float chooseFloatWithBitFlag(float f1, float f2, float flags, float n) { return nthBitSet(flags, n) ? f2 : f1; }
-`;
-const chooseFloatWithBitFlag2 = `
-float chooseFloatWithBitFlag(float f1, float f2, uint flags, uint n) { return 0u != (flags & n) ? f2 : f1; }
+// These are not used anywhere currently, but will leave them here commented out in case we want them later.
+// const chooseFloatWithBitFlag = `
+// float chooseFloatWithBitFlag(float f1, float f2, float flags, float n) { return nthBitSet(flags, n) ? f2 : f1; }
+// `;
+// const chooseFloatWithBitFlag2 = `
+// float chooseFloatWithBitFlag(float f1, float f2, uint flags, uint n) { return 0u != (flags & n) ? f2 : f1; }
+// `;
+const chooseVec2With2BitFlags = `
+vec2 chooseVec2With2BitFlags(vec2 v1, vec2 v2, float flags, float n1, float n2) { return (nthBitSet(flags, n1) || nthBitSet(flags, n2)) ? v2 : v1; }
 `;
-const chooseVec2WithBitFlag = `
-vec2 chooseVec2WithBitFlag(vec2 v1, vec2 v2, float flags, float n) { return nthBitSet(flags, n) ? v2 : v1; }
-`;
-const chooseVec2WithBitFlag2 = `
-vec2 chooseVec2WithBitFlag(vec2 v1, vec2 v2, uint flags, uint n) { return 0u != (flags & n) ? v2 : v1; }
+const chooseVec2With2BitFlags2 = `
+vec2 chooseVec2With2BitFlags(vec2 v1, vec2 v2, uint flags, uint n1, uint n2) { return 0u != (flags & (n1 | n2)) ? v2 : v1; }
 `;
 const chooseVec3WithBitFlag = `
 vec3 chooseVec3WithBitFlag(vec3 v1, vec3 v2, float flags, float n) { return nthBitSet(flags, n) ? v2 : v1; }
@@ -151730,41 +151816,34 @@ const chooseVec3WithBitFlag2 = `
 vec3 chooseVec3WithBitFlag(vec3 v1, vec3 v2, uint flags, uint n) { return 0u != (flags & n) ? v2 : v1; }
 `;
 /** @internal */
-function addChooseWithBitFlagFunctions(shader) {
+function addChooseVec2WithBitFlagsFunction(shader) {
     if (_System__WEBPACK_IMPORTED_MODULE_1__.System.instance.capabilities.isWebGL2) {
         shader.addFunction(extractNthBit2);
-        shader.addFunction(chooseFloatWithBitFlag2);
-        shader.addFunction(chooseVec2WithBitFlag2);
-        shader.addFunction(chooseVec3WithBitFlag2);
+        shader.addFunction(chooseVec2With2BitFlags2);
     }
     else {
         shader.addFunction(nthBitSet);
-        shader.addFunction(chooseFloatWithBitFlag);
-        shader.addFunction(chooseVec2WithBitFlag);
-        shader.addFunction(chooseVec3WithBitFlag);
+        shader.addFunction(chooseVec2With2BitFlags);
     }
 }
-function addShaderFlagsLookup(shader) {
-    shader.addConstant("kShaderBit_Monochrome", 1 /* Int */, "0");
-    shader.addConstant("kShaderBit_NonUniformColor", 1 /* Int */, "1");
-    shader.addConstant("kShaderBit_OITFlatAlphaWeight", 1 /* Int */, "2");
-    shader.addConstant("kShaderBit_OITScaleOutput", 1 /* Int */, "3");
-    shader.addConstant("kShaderBit_IgnoreNonLocatable", 1 /* Int */, "4");
-    addChooseWithBitFlagFunctions(shader);
+/** @internal */
+function addChooseVec3WithBitFlagFunction(shader) {
     if (_System__WEBPACK_IMPORTED_MODULE_1__.System.instance.capabilities.isWebGL2) {
         shader.addFunction(extractNthBit2);
-        shader.addFunction(chooseFloatWithBitFlag2);
-        shader.addFunction(chooseVec2WithBitFlag2);
         shader.addFunction(chooseVec3WithBitFlag2);
     }
     else {
         shader.addFunction(nthBitSet);
-        shader.addFunction(extractNthBit);
-        shader.addFunction(chooseFloatWithBitFlag);
-        shader.addFunction(chooseVec2WithBitFlag);
         shader.addFunction(chooseVec3WithBitFlag);
     }
 }
+function addShaderFlagsConstants(shader) {
+    shader.addConstant("kShaderBit_Monochrome", 1 /* Int */, "0");
+    shader.addConstant("kShaderBit_NonUniformColor", 1 /* Int */, "1");
+    shader.addConstant("kShaderBit_OITFlatAlphaWeight", 1 /* Int */, "2");
+    shader.addConstant("kShaderBit_OITScaleOutput", 1 /* Int */, "3");
+    shader.addConstant("kShaderBit_IgnoreNonLocatable", 1 /* Int */, "4");
+}
 const shaderFlagArray = new Int32Array(5);
 const kShaderBitMonochrome = 0;
 const kShaderBitNonUniformColor = 1;
@@ -151811,8 +151890,8 @@ function setShaderFlags(uniform, params) {
 }
 /** @internal */
 function addShaderFlags(builder) {
-    addShaderFlagsLookup(builder.vert);
-    addShaderFlagsLookup(builder.frag);
+    addShaderFlagsConstants(builder.vert);
+    addShaderFlagsConstants(builder.frag);
     builder.addUniformArray("u_shaderFlags", 0 /* Boolean */, 5, (prog) => {
         prog.addGraphicUniform("u_shaderFlags", (uniform, params) => setShaderFlags(uniform, params));
     });
@@ -154058,8 +154137,6 @@ const applyLighting = `
 
   // Extract surface properties
   vec3 rgb = baseColor.rgb;
-  vec3 normal = normalize(v_n.xyz);
-  normal *= 2.0 * float(gl_FrontFacing) - 1.0;
   vec3 toEye = kFrustumType_Perspective == u_frustum.z ? normalize(v_eyeSpace.xyz) : vec3(0.0, 0.0, -1.0);
 
   // Extract material properties
@@ -154076,8 +154153,8 @@ const applyLighting = `
 
   float directionalDiffuseIntensity = 0.0;
   float directionalSpecularIntensity = 0.0;
-  computeDirectionalLight(directionalDiffuseIntensity, directionalSpecularIntensity, normal, toEye, u_sunDir, sunIntensity, specularExponent);
-  computeDirectionalLight(directionalDiffuseIntensity, directionalSpecularIntensity, normal ,toEye, portraitDir, portraitIntensity, specularExponent);
+  computeDirectionalLight(directionalDiffuseIntensity, directionalSpecularIntensity, g_normal, toEye, u_sunDir, sunIntensity, specularExponent);
+  computeDirectionalLight(directionalDiffuseIntensity, directionalSpecularIntensity, g_normal ,toEye, portraitDir, portraitIntensity, specularExponent);
 
   const float directionalFudge = 0.92; // leftover from old lighting implementation
   vec3 diffuseAccum = directionalDiffuseIntensity * diffuseWeight * rgb * directionalFudge; // directional light is white.
@@ -154097,18 +154174,18 @@ const applyLighting = `
   float hemiIntensity = u_lightSettings[11];
 
   //  diffuse
-  float hemiDot = dot(normal, u_upVector);
+  float hemiDot = dot(g_normal, u_upVector);
   float hemiDiffuseWeight = 0.5 * hemiDot + 0.5;
   vec3 hemiColor = mix(ground, sky, hemiDiffuseWeight);
   diffuseAccum += hemiIntensity * hemiColor * rgb;
 
   //  sky specular
-  vec3 reflectSky = normalize(reflect(u_upVector, normal));
+  vec3 reflectSky = normalize(reflect(u_upVector, g_normal));
   float skyDot = max(dot(reflectSky, toEye), 0.0001);
   float hemiSpecWeight = hemiIntensity * pow(skyDot, specularExponent);
 
   //  ground specular
-  vec3 reflectGround = normalize(reflect(-u_upVector, normal));
+  vec3 reflectGround = normalize(reflect(-u_upVector, g_normal));
   float groundDot = max(dot(reflectGround, toEye), 0.0001);
   hemiSpecWeight += hemiIntensity * pow(groundDot, specularExponent);
 
@@ -154119,7 +154196,7 @@ const applyLighting = `
   // Apply fresnel reflection.
   float fresnelIntensity = u_lightSettings[15];
   if (0.0 != fresnelIntensity) {
-    float fresnel = -dot(toEye, normal);
+    float fresnel = -dot(toEye, g_normal);
     if (fresnelIntensity < 0.0) {
       fresnelIntensity = abs(fresnelIntensity);
       fresnel = 1.0 - fresnel;
@@ -154989,7 +155066,7 @@ function createPointCloudBuilder(classified, featureMode, thematic) {
     }
     if (1 /* Yes */ === thematic) {
         (0,_Thematic__WEBPACK_IMPORTED_MODULE_7__.addThematicDisplay)(builder, true);
-        (0,_Surface__WEBPACK_IMPORTED_MODULE_8__.addTexture)(builder, 0 /* No */, 1 /* Yes */, true);
+        (0,_Surface__WEBPACK_IMPORTED_MODULE_8__.addTexture)(builder, 0 /* No */, 1 /* Yes */, true, false);
     }
     return builder;
 }
@@ -155456,7 +155533,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "addColorOverrideMix": () => (/* binding */ addColorOverrideMix),
 /* harmony export */   "createClassifierRealityMeshHiliter": () => (/* binding */ createClassifierRealityMeshHiliter),
 /* harmony export */   "createRealityMeshBuilder": () => (/* binding */ createRealityMeshBuilder),
-/* harmony export */   "createRealityMeshHiliter": () => (/* binding */ createRealityMeshHiliter)
+/* harmony export */   "createRealityMeshHiliter": () => (/* binding */ createRealityMeshHiliter),
+/* harmony export */   "finalizeNormal": () => (/* binding */ finalizeNormal)
 /* harmony export */ });
 /* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
 /* harmony import */ var _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-common */ "../../core/common/lib/esm/core-common.js");
@@ -155509,6 +155587,9 @@ const computeNormal = `
   g_hillshadeIndex = normal.z;           // save off world Z for thematic hill shade mode index
   return normalize(u_worldToViewN * normal);
 `;
+const finalizeNormal = `
+  return normalize(v_n) * (2.0 * float(gl_FrontFacing) - 1.0);
+`;
 const testInside = `
 bool testInside(float x0, float y0, float x1, float y1, float x, float y) {
   vec2 perp = vec2(y0 - y1, x1 - x0), test = vec2(x - x0, y - y0);
@@ -155683,6 +155764,8 @@ function addThematicToRealityMesh(builder, gradientTextureUnit) {
     builder.vert.addFunction(_Surface__WEBPACK_IMPORTED_MODULE_15__.octDecodeNormal);
     builder.vert.addGlobal("g_hillshadeIndex", 2 /* Float */);
     builder.addFunctionComputedVarying("v_n", 4 /* Vec3 */, "computeLightingNormal", computeNormal);
+    builder.frag.addGlobal("g_normal", 4 /* Vec3 */);
+    builder.frag.set(21 /* FinalizeNormal */, finalizeNormal);
     (0,_Thematic__WEBPACK_IMPORTED_MODULE_16__.addThematicDisplay)(builder, false, true);
     builder.addInlineComputedVarying("v_thematicIndex", 2 /* Float */, (0,_Thematic__WEBPACK_IMPORTED_MODULE_16__.getComputeThematicIndex)(builder.vert.usesInstancedGeometry, false, false));
     builder.vert.addUniform("u_worldToViewN", 6 /* Mat3 */, (prog) => {
@@ -156321,10 +156404,7 @@ float shadowMapEVSM(vec3 shadowPos) {
 const applySolarShadowMap = `
   if (v_shadowPos.x < 0.0 || v_shadowPos.x > 1.0 || v_shadowPos.y < 0.0 || v_shadowPos.y > 1.0 || v_shadowPos.z < 0.0 || v_shadowPos.z > 1.0)
     return baseColor;
-  vec3 toEye = kFrustumType_Perspective == u_frustum.z ? normalize(v_eyeSpace) : vec3(0.0, 0.0, -1.0);
-  vec3 normal = normalize(v_n);
-  normal = (dot(normal, toEye) > 0.0) ? -normal : normal;
-  float visible = (u_surfaceFlags[kSurfaceBitIndex_HasNormals] && (dot(normal, u_sunDir) < 0.0)) ? 0.0 : shadowMapEVSM(v_shadowPos);
+  float visible = (u_surfaceFlags[kSurfaceBitIndex_HasNormals] && (dot(g_normal, u_sunDir) < 0.0)) ? 0.0 : shadowMapEVSM(v_shadowPos);
   return vec4(baseColor.rgb * mix(u_shadowParams.rgb, vec3(1.0), visible), baseColor.a);
 `;
 const applySolarShadowMapTerrain = `
@@ -156558,7 +156638,7 @@ function addMaterial(builder, instanced) {
     (0,_Decode__WEBPACK_IMPORTED_MODULE_10__.addUnpackAndNormalize2Bytes)(frag);
     frag.addFunction(decodeFragMaterialParams);
     frag.addInitializer("decodeMaterialParams(v_materialParams);");
-    (0,_Common__WEBPACK_IMPORTED_MODULE_9__.addChooseWithBitFlagFunctions)(frag);
+    (0,_Common__WEBPACK_IMPORTED_MODULE_9__.addChooseVec3WithBitFlagFunction)(frag);
     frag.set(2 /* ApplyMaterialOverrides */, applyTextureWeight);
     const vert = builder.vert;
     vert.addGlobal("mat_rgb", 5 /* Vec4 */); // a = 0 if not overridden, else 1
@@ -156647,7 +156727,7 @@ function createCommon(isInstanced, animated, shadowable, isThematic, isHiliter,
 function createSurfaceHiliter(instanced, classified, posType) {
     const builder = createCommon(instanced, 0 /* No */, 0 /* No */, 0 /* No */, true, posType);
     addSurfaceFlags(builder, true, false);
-    addTexture(builder, 0 /* No */, 0 /* No */);
+    addTexture(builder, 0 /* No */, 0 /* No */, false, true);
     if (classified) {
         (0,_PlanarClassification__WEBPACK_IMPORTED_MODULE_15__.addHilitePlanarClassifier)(builder);
         builder.vert.addGlobal("feature_ignore_material", 0 /* Boolean */, "false");
@@ -156681,12 +156761,14 @@ function addSurfaceFlagsLookup(builder) {
     builder.addBitFlagConstant("kSurfaceBit_HasTexture", 0 /* HasTexture */);
     builder.addBitFlagConstant("kSurfaceBit_IgnoreMaterial", 3 /* IgnoreMaterial */);
     builder.addBitFlagConstant("kSurfaceBit_OverrideRgb", 7 /* OverrideRgb */);
+    builder.addBitFlagConstant("kSurfaceBit_HasNormalMap", 8 /* HasNormalMap */);
     // Only need masks for flags modified in vertex shader
     const suffix = _System__WEBPACK_IMPORTED_MODULE_5__.System.instance.capabilities.isWebGL2 ? "u" : ".0";
     const type = _System__WEBPACK_IMPORTED_MODULE_5__.System.instance.capabilities.isWebGL2 ? 10 /* Uint */ : 2 /* Float */;
     builder.addConstant("kSurfaceMask_HasTexture", type, 1 /* HasTexture */.toString() + suffix);
     builder.addConstant("kSurfaceMask_IgnoreMaterial", type, 8 /* IgnoreMaterial */.toString() + suffix);
     builder.addConstant("kSurfaceMask_OverrideRgb", type, 128 /* OverrideRgb */.toString() + suffix);
+    builder.addConstant("kSurfaceMask_HasNormalMap", type, 256 /* HasNormalMap */.toString() + suffix);
     (0,_Common__WEBPACK_IMPORTED_MODULE_9__.addExtractNthBit)(builder);
     if (_System__WEBPACK_IMPORTED_MODULE_5__.System.instance.capabilities.isWebGL2) {
         builder.addFunction(isSurfaceBitSet2);
@@ -156701,19 +156783,20 @@ const initSurfaceFlags = `
   surfaceFlags = u_surfaceFlags[kSurfaceBitIndex_HasTexture] ? kSurfaceMask_HasTexture : 0.0;
   surfaceFlags += u_surfaceFlags[kSurfaceBitIndex_IgnoreMaterial] ? kSurfaceMask_IgnoreMaterial : 0.0;
   surfaceFlags += u_surfaceFlags[kSurfaceBitIndex_OverrideRgb] ? kSurfaceMask_OverrideRgb : 0.0;
+  surfaceFlags += u_surfaceFlags[kSurfaceBitIndex_HasNormalMap] ? kSurfaceMask_HasNormalMap : 0.0;
 `;
 const initSurfaceFlags2 = `
   surfaceFlags = u_surfaceFlags[kSurfaceBitIndex_HasTexture] ? kSurfaceMask_HasTexture : 0u;
   surfaceFlags += u_surfaceFlags[kSurfaceBitIndex_IgnoreMaterial] ? kSurfaceMask_IgnoreMaterial : 0u;
   surfaceFlags += u_surfaceFlags[kSurfaceBitIndex_OverrideRgb] ? kSurfaceMask_OverrideRgb : 0u;
+  surfaceFlags += u_surfaceFlags[kSurfaceBitIndex_HasNormalMap] ? kSurfaceMask_HasNormalMap : 0u;
 `;
 const computeBaseSurfaceFlags = `
-  bool hasTexture = u_surfaceFlags[kSurfaceBitIndex_HasTexture];
   if (feature_ignore_material) {
-    if (hasTexture) {
-      hasTexture = false;
+    if (u_surfaceFlags[kSurfaceBitIndex_HasTexture])
       surfaceFlags -= kSurfaceMask_HasTexture;
-    }
+    if (u_surfaceFlags[kSurfaceBitIndex_HasNormalMap])
+      surfaceFlags -= kSurfaceMask_HasNormalMap;
 
     surfaceFlags += kSurfaceMask_IgnoreMaterial;
   }
@@ -156751,6 +156834,39 @@ function getComputeNormal(quantized) {
   return normalize(MAT_NORM * octDecodeNormal(normal));
 `;
 }
+const finalizeNormalPrelude = `
+  vec3 normal = normalize(v_n) * (2.0 * float(gl_FrontFacing) - 1.0);
+`;
+const finalizeNormalNormalMap = `
+  if (isSurfaceBitSet(kSurfaceBit_HasNormalMap)) {
+    // Modify the normal with the normal map texture.
+    // First calculate the tangent.
+    vec3 dp1 = dFdx(v_eyeSpace);
+    vec3 dp2 = dFdy(v_eyeSpace);
+    vec2 duv1 = dFdx(v_texCoord);
+    vec2 duv2 = dFdy(v_texCoord);
+    vec3 tangent = normalize(duv2.y * dp1 - duv1.y * dp2);
+    tangent = normalize (tangent - normal * dot (normal, tangent));  // re-orthogonalize with normal
+    bool flip = (duv1.x * duv2.y - duv2.x * duv1.y) < 0.0;
+    if (flip)
+      tangent = -tangent;
+    vec3 biTangent = cross (normal, tangent);
+    if (flip)
+      biTangent = -biTangent;
+    vec3 normM = TEXTURE(s_normalMap, v_texCoord).xyz;
+    if (length (normM) > 0.0001) { // check for empty normal texture
+      normM = (normM - 0.5) * 2.0;
+      normM = normalize (normM);
+      normM.x *= abs(u_normalMapScale);
+      normM.y *= u_normalMapScale;
+      normM = normalize (normM);
+      normal = normalize (normM.x * tangent + normM.y * biTangent + normM.z * normal);
+    }
+  }
+`;
+const finalizeNormalPostlude = `
+  return normal;
+`;
 function getComputeAnimatedNormal(quantized) {
     return `
   if (u_animNormalParams.x >= 0.0)
@@ -156766,7 +156882,7 @@ function getComputeTexCoord(quantized) {
     return `
   vec4 rgba = ${vertData};
   vec2 qcoords = vec2(decodeUInt16(rgba.xy), decodeUInt16(rgba.zw));
-  return chooseVec2WithBitFlag(vec2(0.0), unquantize2d(qcoords, u_qTexCoordParams), surfaceFlags, kSurfaceBit_HasTexture);
+  return chooseVec2With2BitFlags(vec2(0.0), unquantize2d(qcoords, u_qTexCoordParams), surfaceFlags, kSurfaceBit_HasTexture, kSurfaceBit_HasNormalMap);
 `;
 }
 function getComputeAnimatedTexCoord(quantized) {
@@ -156828,9 +156944,29 @@ function addNormal(builder, instanced, animated) {
     (0,_Vertex__WEBPACK_IMPORTED_MODULE_20__.addNormalMatrix)(builder.vert, instanced);
     const quantized = "quantized" === builder.vert.positionType;
     builder.vert.addFunction(octDecodeNormal);
-    (0,_Common__WEBPACK_IMPORTED_MODULE_9__.addChooseWithBitFlagFunctions)(builder.vert);
     builder.vert.addFunction("vec3 computeSurfaceNormal()", getComputeNormal(quantized));
     builder.addFunctionComputedVarying("v_n", 4 /* Vec3 */, "computeLightingNormal", animated ? getComputeAnimatedNormal(quantized) : "return computeSurfaceNormal();");
+    builder.frag.addGlobal("g_normal", 4 /* Vec3 */);
+    let finalizeNormal = finalizeNormalPrelude;
+    if (_System__WEBPACK_IMPORTED_MODULE_5__.System.instance.capabilities.isWebGL2) {
+        finalizeNormal += finalizeNormalNormalMap;
+        builder.frag.addUniform("u_normalMapScale", 2 /* Float */, (prog) => {
+            prog.addGraphicUniform("u_normalMapScale", (uniform, params) => {
+                var _a;
+                let normalMapScale = 1.0;
+                if (undefined !== params.geometry.materialInfo && !params.geometry.materialInfo.isAtlas &&
+                    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)
+                        normalMapScale = -normalMapScale;
+                }
+                uniform.setUniform1f(normalMapScale);
+            });
+        });
+    }
+    finalizeNormal += finalizeNormalPostlude;
+    builder.frag.set(21 /* FinalizeNormal */, finalizeNormal);
     // Set to true to colorize surfaces based on normals (in world space).
     // You must also set checkMaxVarying to false in ProgramBuilder.buildProgram to avoid assertions, if using a non-optimized build.
     const debugNormals = false;
@@ -156840,19 +156976,21 @@ function addNormal(builder, instanced, animated) {
     }
 }
 /** @internal */
-function addTexture(builder, animated, isThematic, isPointCloud = false) {
+function addTexture(builder, animated, isThematic, isPointCloud, isHilite) {
     if (isThematic) {
         builder.addInlineComputedVarying("v_thematicIndex", 2 /* Float */, (0,_Thematic__WEBPACK_IMPORTED_MODULE_18__.getComputeThematicIndex)(builder.vert.usesInstancedGeometry, isPointCloud, true));
     }
-    else {
+    // Point clouds do not need to compute texture coordinates since the only texture they use is the thematic gradient.
+    // Surfaces now need texture coordinates even for thematic in case they have a normal map (except for webgl1 which does not have normal maps).
+    if (!isPointCloud && (_System__WEBPACK_IMPORTED_MODULE_5__.System.instance.capabilities.isWebGL2 || !isThematic)) {
         builder.vert.addFunction(_Decode__WEBPACK_IMPORTED_MODULE_10__.unquantize2d);
-        (0,_Common__WEBPACK_IMPORTED_MODULE_9__.addChooseWithBitFlagFunctions)(builder.vert);
+        (0,_Common__WEBPACK_IMPORTED_MODULE_9__.addChooseVec2WithBitFlagsFunction)(builder.vert);
         const quantized = "quantized" === builder.vert.positionType;
         builder.addFunctionComputedVarying("v_texCoord", 3 /* Vec2 */, "computeTexCoord", animated ? getComputeAnimatedTexCoord(quantized) : getComputeTexCoord(quantized));
         builder.vert.addUniform("u_qTexCoordParams", 5 /* Vec4 */, (prog) => {
             prog.addGraphicUniform("u_qTexCoordParams", (uniform, params) => {
                 const surfGeom = params.geometry.asSurface;
-                if (surfGeom.useTexture(params.programParams)) {
+                if (surfGeom.useTexture(params.programParams) || (surfGeom.useNormalMap(params.programParams) && !isPointCloud)) {
                     const uvQParams = surfGeom.lut.uvQParams;
                     if (undefined !== uvQParams) {
                         uniform.setUniform4fv(uvQParams);
@@ -156878,6 +157016,21 @@ function addTexture(builder, animated, isThematic, isPointCloud = false) {
             }
         });
     });
+    if (!isHilite && !isPointCloud && _System__WEBPACK_IMPORTED_MODULE_5__.System.instance.capabilities.isWebGL2) {
+        builder.frag.addUniform("s_normalMap", 8 /* Sampler2D */, (prog) => {
+            prog.addGraphicUniform("s_normalMap", (uniform, params) => {
+                const surfGeom = params.geometry.asSurface;
+                if (surfGeom.useNormalMap(params.programParams)) {
+                    const normalMap = surfGeom.normalMap;
+                    (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== normalMap);
+                    normalMap.texture.bindSampler(uniform, _RenderFlags__WEBPACK_IMPORTED_MODULE_3__.TextureUnit.NormalMap);
+                }
+                else {
+                    _System__WEBPACK_IMPORTED_MODULE_5__.System.instance.ensureSamplerBound(uniform, _RenderFlags__WEBPACK_IMPORTED_MODULE_3__.TextureUnit.NormalMap);
+                }
+            });
+        });
+    }
 }
 const discardClassifiedByAlpha = `
   if (u_no_classifier_discard)
@@ -156931,14 +157084,13 @@ function createSurfaceBuilder(flags) {
     (0,_FeatureSymbology__WEBPACK_IMPORTED_MODULE_11__.addSurfaceDiscard)(builder, flags);
     addNormal(builder, flags.isInstanced, flags.isAnimated);
     // In HiddenLine mode, we must compute the base color (plus feature overrides etc) in order to get the alpha, then replace with background color (preserving alpha for the transparency threshold test).
-    (0,_Common__WEBPACK_IMPORTED_MODULE_9__.addChooseWithBitFlagFunctions)(builder.frag);
     builder.frag.set(3 /* FinalizeBaseColor */, applyBackgroundColor);
     builder.frag.addUniform("u_bgColor", 4 /* Vec3 */, (prog) => {
         prog.addProgramUniform("u_bgColor", (uniform, params) => {
             params.target.uniforms.style.bindBackgroundRgb(uniform);
         });
     });
-    addTexture(builder, flags.isAnimated, flags.isThematic);
+    addTexture(builder, flags.isAnimated, flags.isThematic, false, false);
     builder.frag.addUniform("u_applyGlyphTex", 0 /* Boolean */, (prog) => {
         prog.addGraphicUniform("u_applyGlyphTex", (uniform, params) => {
             const surfGeom = params.geometry.asSurface;
@@ -157083,7 +157235,7 @@ vec3 getIsoLineColor(float ndx, float stepCount) {
 const fwidthWhenAvailable = `\nfloat _universal_fwidth(float coord) { return fwidth(coord); }\n`;
 const fwidthWhenNotAvailable = `\nfloat _universal_fwidth(float coord) { return coord; }\n`; // ###TODO: can we do something reasonable in this case?
 const slopeAndHillShadeShader = ` else if (kThematicDisplayMode_Slope == u_thematicDisplayMode) {
-    float d = dot(v_n, u_thematicAxis);
+    float d = dot(g_normal, u_thematicAxis);
     if (d < 0.0)
       d = -d;
 
@@ -157101,11 +157253,7 @@ const slopeAndHillShadeShader = ` else if (kThematicDisplayMode_Slope == u_thema
 
     ndx = d;
   } else if (kThematicDisplayMode_HillShade == u_thematicDisplayMode) {
-    float d = dot(v_n, u_thematicSunDirection);
-
-    // In the case of HillShade, v_thematicIndex contains the normal's z in world space.
-    if (!gl_FrontFacing && v_thematicIndex < 0.0)
-      d = -d;
+    float d = dot(g_normal, u_thematicSunDirection);
 
     ndx = max(0.0, d);
   }`;
@@ -160073,23 +160221,23 @@ class GltfReader {
         return undefined !== view ? view.toBufferData(type) : undefined;
     }
     readFeatureIndices(_json) { return undefined; }
+    extractId(value) {
+        switch (typeof value) {
+            case "string":
+                return value;
+            case "number":
+                return value.toString();
+            default:
+                return undefined;
+        }
+    }
     extractTextureId(material) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (typeof material !== "object")
             return undefined;
-        const extractId = (value) => {
-            switch (typeof value) {
-                case "string":
-                    return value;
-                case "number":
-                    return value.toString();
-                default:
-                    return undefined;
-            }
-        };
         // Bimium's shader value...almost certainly obsolete at this point.
         if (isGltf1Material(material))
-            return (_a = material.diffuse) !== null && _a !== void 0 ? _a : extractId((_b = material.values) === null || _b === void 0 ? void 0 : _b.tex);
+            return (_a = material.diffuse) !== null && _a !== void 0 ? _a : this.extractId((_b = material.values) === null || _b === void 0 ? void 0 : _b.tex);
         // KHR_techniques_webgl extension
         const techniques = (_d = (_c = this._glTF.extensions) === null || _c === void 0 ? void 0 : _c.KHR_techniques_webgl) === null || _d === void 0 ? void 0 : _d.techniques;
         const ext = Array.isArray(techniques) ? (_e = material.extensions) === null || _e === void 0 ? void 0 : _e.KHR_techniques_webgl : undefined;
@@ -160099,12 +160247,20 @@ class GltfReader {
                 for (const uniformName of Object.keys(uniforms)) {
                     const uniform = uniforms[uniformName];
                     if (typeof uniform === "object" && uniform.type === GltfDataType.Sampler2d)
-                        return extractId((_f = ext.values[uniformName]) === null || _f === void 0 ? void 0 : _f.index);
+                        return this.extractId((_f = ext.values[uniformName]) === null || _f === void 0 ? void 0 : _f.index);
                 }
             }
         }
-        const id = extractId((_h = (_g = material.pbrMetallicRoughness) === null || _g === void 0 ? void 0 : _g.baseColorTexture) === null || _h === void 0 ? void 0 : _h.index);
-        return id !== null && id !== void 0 ? id : extractId((_j = material.emissiveTexture) === null || _j === void 0 ? void 0 : _j.index);
+        const id = this.extractId((_h = (_g = material.pbrMetallicRoughness) === null || _g === void 0 ? void 0 : _g.baseColorTexture) === null || _h === void 0 ? void 0 : _h.index);
+        return id !== null && id !== void 0 ? id : this.extractId((_j = material.emissiveTexture) === null || _j === void 0 ? void 0 : _j.index);
+    }
+    extractNormalMapId(material) {
+        var _a;
+        if (typeof material !== "object")
+            return undefined;
+        if (isGltf1Material(material))
+            return undefined;
+        return this.extractId((_a = material.normalTexture) === null || _a === void 0 ? void 0 : _a.index);
     }
     isMaterialTransparent(material) {
         var _a, _b;
@@ -160125,9 +160281,15 @@ class GltfReader {
     createDisplayParams(material, hasBakedLighting) {
         const isTransparent = this.isMaterialTransparent(material);
         const textureId = this.extractTextureId(material);
-        const textureMapping = undefined !== textureId ? this.findTextureMapping(textureId, isTransparent) : undefined;
+        const normalMapId = this.extractNormalMapId(material);
+        const textureMapping = (undefined !== textureId || undefined !== normalMapId) ? this.findTextureMapping(textureId, isTransparent, normalMapId) : undefined;
         const color = colorFromMaterial(material, isTransparent);
-        return new _render_primitives_DisplayParams__WEBPACK_IMPORTED_MODULE_8__.DisplayParams(_render_primitives_DisplayParams__WEBPACK_IMPORTED_MODULE_8__.DisplayParams.Type.Mesh, color, color, 1, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.LinePixels.Solid, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.FillFlags.Always, undefined, undefined, hasBakedLighting, textureMapping);
+        let renderMaterial;
+        if (undefined !== textureMapping && undefined !== textureMapping.normalMapParams) {
+            const args = { diffuse: { color }, specular: { color: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.white }, textureMapping };
+            renderMaterial = _IModelApp__WEBPACK_IMPORTED_MODULE_5__.IModelApp.renderSystem.createRenderMaterial(args);
+        }
+        return new _render_primitives_DisplayParams__WEBPACK_IMPORTED_MODULE_8__.DisplayParams(_render_primitives_DisplayParams__WEBPACK_IMPORTED_MODULE_8__.DisplayParams.Type.Mesh, color, color, 1, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.LinePixels.Solid, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.FillFlags.Always, renderMaterial, undefined, hasBakedLighting, textureMapping);
     }
     readMeshPrimitives(node, featureTable, thisTransform, thisBias) {
         const meshes = [];
@@ -160704,11 +160866,38 @@ class GltfReader {
         });
         return renderTexture !== null && renderTexture !== void 0 ? renderTexture : false;
     }
-    findTextureMapping(id, isTransparent) {
-        let texture = this._resolvedTextures.get({ id, isTransparent });
-        if (undefined === texture)
-            this._resolvedTextures.set({ id, isTransparent }, texture = this.resolveTexture(id, isTransparent));
-        return texture ? new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextureMapping(texture, new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextureMapping.Params()) : undefined;
+    findTextureMapping(id, isTransparent, normalMapId) {
+        if (undefined === id && undefined === normalMapId)
+            return undefined;
+        let texture;
+        if (undefined !== id) {
+            texture = this._resolvedTextures.get({ id, isTransparent });
+            if (undefined === texture)
+                this._resolvedTextures.set({ id, isTransparent }, texture = this.resolveTexture(id, isTransparent));
+        }
+        let normalMap;
+        if (undefined !== normalMapId) {
+            normalMap = this._resolvedTextures.get({ id: normalMapId, isTransparent: false });
+            if (undefined === normalMap)
+                this._resolvedTextures.set({ id: normalMapId, isTransparent: false }, normalMap = this.resolveTexture(normalMapId, false));
+        }
+        let nMap;
+        if (normalMap) {
+            if (texture) {
+                nMap = {
+                    normalMap,
+                };
+            }
+            else {
+                texture = normalMap;
+                nMap = {};
+            }
+        }
+        if (!texture)
+            return undefined;
+        const textureMapping = new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextureMapping(texture, new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextureMapping.Params());
+        textureMapping.normalMapParams = nMap;
+        return textureMapping;
     }
 }
 /** Produce a [[RenderGraphic]] from a [glTF](https://www.khronos.org/gltf/) asset suitable for use in [view decorations]($docs/learning/frontend/ViewDecorations).
@@ -162080,6 +162269,7 @@ class ImdlReader {
             mapMode: _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.JsonUtils.asInt(paramsJson.mode),
             worldMapping: _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.JsonUtils.asBool(paramsJson.worldMapping),
         };
+        // TODO: Need to extract normal map properties from json once they're sent by the backend.
         return new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextureMapping(texture, new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextureMapping.Params(paramProps));
     }
     async loadNamedTextures() {
@@ -292498,7 +292688,7 @@ class TestContext {
         this.initializeRpcInterfaces({ title: this.settings.Backend.name, version: this.settings.Backend.version });
         const iModelClient = new imodels_client_management_1.IModelsClient({ api: { baseUrl: `https://${(_a = process.env.IMJS_URL_PREFIX) !== null && _a !== void 0 ? _a : ""}api.bentley.com/imodels` } });
         await core_frontend_1.NoRenderApp.startup({
-            applicationVersion: "3.5.0-dev.63",
+            applicationVersion: "3.5.0-dev.65",
             applicationId: this.settings.gprid,
             authorizationClient: new frontend_1.TestFrontendAuthorizationClient(this.adminUserAccessToken),
             hubAccess: new imodels_access_frontend_1.FrontendIModelsAccess(iModelClient),
@@ -311621,7 +311811,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"3.5.0-dev.63","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs","build:ci":"npm run -s build && npm run -s build:esm","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2020 --outDir lib/esm","clean":"rimraf lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","docs":"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/primitives,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-eslintrc -c \\"../../tools/eslint-plugin/dist/configs/extension-exports-config.js\\" \\"./src/**/*.ts\\" 1>&2","lint":"eslint -f visualstudio \\"./src/**/*.ts\\" 1>&2","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run -s webpackTests && certa -r chrome","cover":"npm -s test","test:debug":"certa -r chrome --debug","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core/tree/master/core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:^3.5.0-dev.63","@itwin/core-bentley":"workspace:^3.5.0-dev.63","@itwin/core-common":"workspace:^3.5.0-dev.63","@itwin/core-geometry":"workspace:^3.5.0-dev.63","@itwin/core-orbitgt":"workspace:^3.5.0-dev.63","@itwin/core-quantity":"workspace:^3.5.0-dev.63","@itwin/webgl-compatibility":"workspace:^3.5.0-dev.63"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/certa":"workspace:*","@itwin/eslint-plugin":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@types/chai":"4.3.1","@types/chai-as-promised":"^7","@types/deep-assign":"^0.1.0","@types/lodash":"^4.14.0","@types/mocha":"^8.2.2","@types/node":"18.11.5","@types/qs":"^6.5.0","@types/semver":"7.3.10","@types/superagent":"^4.1.14","@types/sinon":"^9.0.0","babel-loader":"~8.2.5","babel-plugin-istanbul":"~6.1.1","chai":"^4.1.2","chai-as-promised":"^7","cpx2":"^3.0.0","eslint":"^7.11.0","glob":"^7.1.2","mocha":"^10.0.0","nyc":"^15.1.0","rimraf":"^3.0.2","sinon":"^9.0.2","source-map-loader":"^4.0.0","typescript":"~4.4.0","webpack":"^5.64.4"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/object-storage-azure":"~1.4.0","@itwin/cloud-agnostic-core":"~1.4.0","@itwin/object-storage-core":"~1.4.0","@itwin/core-i18n":"workspace:*","@itwin/core-telemetry":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","deep-assign":"^2.0.0","fuse.js":"^3.3.0","lodash":"^4.17.10","qs":"^6.5.1","semver":"^7.3.5","superagent":"7.1.3","wms-capabilities":"0.4.0","xml-js":"~1.6.11","reflect-metadata":"0.1.13"},"nyc":{"extends":"./node_modules/@itwin/build-tools/.nycrc"},"eslintConfig":{"plugins":["@itwin"],"extends":"plugin:@itwin/itwinjs-recommended","rules":{"@itwin/no-internal-barrel-imports":["error",{"required-barrel-modules":["./src/tile/internal.ts"]}],"@itwin/public-extension-exports":["error",{"releaseTags":["public","preview"],"outputApiFile":false}]},"overrides":[{"files":["*.test.ts","*.test.tsx","**/test/**/*.ts"],"rules":{"@itwin/no-internal-barrel-imports":"off"}}]}}');
+module.exports = JSON.parse('{"name":"@itwin/core-frontend","version":"3.5.0-dev.65","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs","build:ci":"npm run -s build && npm run -s build:esm","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2020 --outDir lib/esm","clean":"rimraf lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","docs":"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/primitives,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-eslintrc -c \\"../../tools/eslint-plugin/dist/configs/extension-exports-config.js\\" \\"./src/**/*.ts\\" 1>&2","lint":"eslint -f visualstudio \\"./src/**/*.ts\\" 1>&2","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run -s webpackTests && certa -r chrome","cover":"npm -s test","test:debug":"certa -r chrome --debug","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core/tree/master/core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:^3.5.0-dev.65","@itwin/core-bentley":"workspace:^3.5.0-dev.65","@itwin/core-common":"workspace:^3.5.0-dev.65","@itwin/core-geometry":"workspace:^3.5.0-dev.65","@itwin/core-orbitgt":"workspace:^3.5.0-dev.65","@itwin/core-quantity":"workspace:^3.5.0-dev.65","@itwin/webgl-compatibility":"workspace:^3.5.0-dev.65"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/certa":"workspace:*","@itwin/eslint-plugin":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@types/chai":"4.3.1","@types/chai-as-promised":"^7","@types/deep-assign":"^0.1.0","@types/lodash":"^4.14.0","@types/mocha":"^8.2.2","@types/node":"18.11.5","@types/qs":"^6.5.0","@types/semver":"7.3.10","@types/superagent":"^4.1.14","@types/sinon":"^9.0.0","babel-loader":"~8.2.5","babel-plugin-istanbul":"~6.1.1","chai":"^4.1.2","chai-as-promised":"^7","cpx2":"^3.0.0","eslint":"^7.11.0","glob":"^7.1.2","mocha":"^10.0.0","nyc":"^15.1.0","rimraf":"^3.0.2","sinon":"^9.0.2","source-map-loader":"^4.0.0","typescript":"~4.4.0","webpack":"^5.64.4"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/object-storage-azure":"~1.4.0","@itwin/cloud-agnostic-core":"~1.4.0","@itwin/object-storage-core":"~1.4.0","@itwin/core-i18n":"workspace:*","@itwin/core-telemetry":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","deep-assign":"^2.0.0","fuse.js":"^3.3.0","lodash":"^4.17.10","qs":"^6.5.1","semver":"^7.3.5","superagent":"7.1.3","wms-capabilities":"0.4.0","xml-js":"~1.6.11","reflect-metadata":"0.1.13"},"nyc":{"extends":"./node_modules/@itwin/build-tools/.nycrc"},"eslintConfig":{"plugins":["@itwin"],"extends":"plugin:@itwin/itwinjs-recommended","rules":{"@itwin/no-internal-barrel-imports":["error",{"required-barrel-modules":["./src/tile/internal.ts"]}],"@itwin/public-extension-exports":["error",{"releaseTags":["public","preview"],"outputApiFile":false}]},"overrides":[{"files":["*.test.ts","*.test.tsx","**/test/**/*.ts"],"rules":{"@itwin/no-internal-barrel-imports":"off"}}]}}');
 
 /***/ }),