@itwin/core-frontend 5.0.0-dev.90 → 5.0.0-dev.92

package/lib/esm/internal/render/webgl/glsl/CombineTextures.js

@@ -30,7 +30,7 @@ export function createCombineTexturesProgram(context) {
             Texture2DHandle.bindSampler(uniform, params.geometry.texture1, TextureUnit.One);
         });
     }, 3 /* VariablePrecision.High */);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragData);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragData);
     builder.vert.headerComment = "//!V! CombineTextures";
     builder.frag.headerComment = "//!F! CombineTextures";
     return builder.buildProgram(context);

package/lib/esm/internal/render/webgl/glsl/Composite.js

@@ -113,7 +113,7 @@ export function createCompositeProgram(flags, context) {
     const frag = builder.frag;
     frag.addFunction(wantOcclusion ? computeAmbientOcclusion : computeDefaultAmbientOcclusion);
     frag.addFunction(computeOpaqueColor);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_opaque", 8 /* VariableType.Sampler2D */, (prog) => {
         prog.addGraphicUniform("u_opaque", (uniform, params) => {
             Texture2DHandle.bindSampler(uniform, params.geometry.opaque, TextureUnit.Zero);

package/lib/esm/internal/render/webgl/glsl/CopyColor.js

@@ -24,7 +24,7 @@ export function createCopyColorProgram(context, copyAlpha = true) {
     const builder = createViewportQuadBuilder(true);
     const frag = builder.frag;
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, copyAlpha ? computeColor : computeColorNoAlpha);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_color", 8 /* VariableType.Sampler2D */, (prog) => {
         prog.addGraphicUniform("u_color", (uniform, params) => {
             const geom = params.geometry;

package/lib/esm/internal/render/webgl/glsl/CopyPickBuffers.js

@@ -29,7 +29,7 @@ export function createCopyPickBuffersProgram(context) {
         });
     }, 3 /* VariablePrecision.High */);
     frag.addDrawBuffersExtension(2);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragData);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragData);
     builder.vert.headerComment = "//!V! CopyPickBuffers";
     builder.frag.headerComment = "//!F! CopyPickBuffers";
     return builder.buildProgram(context);

package/lib/esm/internal/render/webgl/glsl/CopyStencil.js

@@ -52,7 +52,7 @@ export function createVolClassColorUsingStencilProgram(context) {
     const builder = createViewportQuadBuilder(false);
     const frag = builder.frag;
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, computehiliteColor);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_hilite_color", 5 /* VariableType.Vec4 */, (prog) => {
         prog.addGraphicUniform("u_hilite_color", (uniform, params) => {
             const useLighting = params.geometry.getFlashMode(params);
@@ -75,7 +75,7 @@ export function createVolClassCopyZProgram(context) {
     builder.addInlineComputedVarying("v_texCoord", 3 /* VariableType.Vec2 */, computeTexCoord); // TODO: I think this is not necessary because it's already added from the create above
     const frag = builder.frag;
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, computeSetBlendColor);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_blend_color", 5 /* VariableType.Vec4 */, (prog) => {
         prog.addGraphicUniform("u_blend_color", (uniform, _params) => {
             scratchColor.set(0.0, 0.0, 0.0, 0.0);
@@ -88,7 +88,7 @@ export function createVolClassCopyZProgram(context) {
             Texture2DHandle.bindSampler(uniform, geom.texture, TextureUnit.Zero);
         });
     });
-    frag.set(19 /* FragmentShaderComponent.FinalizeDepth */, depthFromTexture);
+    frag.set(20 /* FragmentShaderComponent.FinalizeDepth */, depthFromTexture);
     builder.vert.headerComment = "//!V! VolClassCopyZ";
     builder.frag.headerComment = "//!F! VolClassCopyZ";
     return builder.buildProgram(context);
@@ -101,7 +101,7 @@ export function createVolClassSetBlendProgram(context) {
     addBoundaryTypeConstants(frag);
     frag.set(0 /* FragmentShaderComponent.CheckForEarlyDiscard */, checkDiscardBackgroundByZ);
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, computeSetBlendColor);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_boundaryType", 1 /* VariableType.Int */, (prog) => {
         prog.addGraphicUniform("u_boundaryType", (uniform, params) => {
             const geom = params.geometry;
@@ -144,7 +144,7 @@ export function createVolClassBlendProgram(context) {
     builder.addInlineComputedVarying("v_texCoord", 3 /* VariableType.Vec2 */, computeTexCoord);
     const frag = builder.frag;
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, computeBlendTextureColor);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_blendTexture", 8 /* VariableType.Sampler2D */, (prog) => {
         prog.addGraphicUniform("u_blendTexture", (uniform, params) => {
             const geom = params.geometry;

package/lib/esm/internal/render/webgl/glsl/EDL.js

@@ -45,7 +45,7 @@ export function createEDLCalcBasicProgram(context) {
     const builder = createViewportQuadBuilder(true);
     const frag = builder.frag;
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, calcBasicEDL);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_texInfo", 4 /* VariableType.Vec3 */, (prog) => {
         prog.addGraphicUniform("u_texInfo", (uniform, params) => {
             const geom = params.geometry;
@@ -111,7 +111,7 @@ export function createEDLCalcFullProgram(context) {
     const builder = createViewportQuadBuilder(true);
     const frag = builder.frag;
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, calcFullEDL);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_texInfo", 4 /* VariableType.Vec3 */, (prog) => {
         prog.addGraphicUniform("u_texInfo", (uniform, params) => {
             const geom = params.geometry;
@@ -182,7 +182,7 @@ export function createEDLFilterProgram(context) {
     const builder = createViewportQuadBuilder(true);
     const frag = builder.frag;
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, filterEDL);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_texInfo", 4 /* VariableType.Vec3 */, (prog) => {
         prog.addGraphicUniform("u_texInfo", (uniform, params) => {
             const geom = params.geometry;
@@ -221,7 +221,7 @@ export function createEDLMixProgram(context) {
     const builder = createViewportQuadBuilder(true);
     const frag = builder.frag;
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, mixEDL);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     frag.addUniform("u_colorTexture1", 8 /* VariableType.Sampler2D */, (prog) => {
         prog.addGraphicUniform("u_colorTexture1", (uniform, params) => {
             const geom = params.geometry;

package/lib/esm/internal/render/webgl/glsl/EVSMFromDepth.js

@@ -63,7 +63,7 @@ export function createEVSMProgram(context) {
     addEvsmExponent(frag);
     frag.addFunction(warpDepth);
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, computeEVSM);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     builder.vert.headerComment = "//!V! EVSMFromDepth";
     builder.frag.headerComment = "//!F! EVSMFromDepth";
     return builder.buildProgram(context);

package/lib/esm/internal/render/webgl/glsl/Edge.js

@@ -237,7 +237,7 @@ function createBase(type, instanced, isAnimated, positionType) {
         addRenderOrder(vert);
         addRenderOrderConstants(vert);
         builder.addInlineComputedVarying("v_renderOrder", 2 /* VariableType.Float */, computeIndexedRenderOrder);
-        builder.frag.set(21 /* FragmentShaderComponent.OverrideRenderOrder */, "return v_renderOrder;");
+        builder.frag.set(22 /* FragmentShaderComponent.OverrideRenderOrder */, "return v_renderOrder;");
     }
     else {
         vert.addInitializer(decodeEndPointAndQuadIndices);

package/lib/esm/internal/render/webgl/glsl/FeatureSymbology.js

@@ -297,7 +297,7 @@ export function addHiliter(builder, wantWeight = false) {
     addEmphasisFlags(builder.frag);
     addExtractNthBit(builder.frag);
     builder.frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, computeHiliteColor);
-    builder.frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    builder.frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
 }
 function addSamplers(frag, testFeatureId) {
     if (testFeatureId) {
@@ -663,7 +663,7 @@ export function addUniformHiliter(builder) {
     addEmphasisFlags(builder.frag);
     addExtractNthBit(builder.frag);
     builder.frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, computeHiliteColor);
-    builder.frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    builder.frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
 }
 /** For a uniform feature table, the feature ID output to pick buffers is equal to the batch ID.
  * The following symbology overrides are supported:

package/lib/esm/internal/render/webgl/glsl/Fragment.js

@@ -68,7 +68,7 @@ export function addPickBufferOutputs(frag) {
     frag.addFunction(encodeDepthRgb);
     frag.addFunction(computeLinearDepth);
     const prelude = new SourceBuilder();
-    const overrideOrder = frag.get(21 /* FragmentShaderComponent.OverrideRenderOrder */);
+    const overrideOrder = frag.get(22 /* FragmentShaderComponent.OverrideRenderOrder */);
     if (overrideOrder) {
         frag.addFunction("float overrideRenderOrder(float currentOrder)", overrideOrder);
         prelude.addline("  float renderOrder = overrideRenderOrder(u_renderOrder);");
@@ -77,43 +77,43 @@ export function addPickBufferOutputs(frag) {
         prelude.addline("  float renderOrder = u_renderOrder;");
     }
     prelude.add(computePickBufferOutputs);
-    const overrideColor = frag.get(20 /* FragmentShaderComponent.OverrideColor */);
+    const overrideColor = frag.get(21 /* FragmentShaderComponent.OverrideColor */);
     if (undefined !== overrideColor) {
         frag.addFunction("vec4 overrideColor(vec4 currentColor)", overrideColor);
         prelude.addline("  output0 = overrideColor(output0);");
     }
-    const overrideFeatureId = frag.get(18 /* FragmentShaderComponent.OverrideFeatureId */);
+    const overrideFeatureId = frag.get(19 /* FragmentShaderComponent.OverrideFeatureId */);
     if (undefined !== overrideFeatureId) {
         frag.addFunction("vec4 overrideFeatureId(vec4 currentId)", overrideFeatureId);
         prelude.addline(reassignFeatureId);
     }
     addRenderPass(frag);
     frag.addDrawBuffersExtension(3);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, prelude.source + assignPickBufferOutputsMRT);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, prelude.source + assignPickBufferOutputsMRT);
 }
 /** @internal */
 export function addAltPickBufferOutputs(frag) {
     const prelude = new SourceBuilder();
     prelude.add(computeAltPickBufferOutputs);
-    const overrideColor = frag.get(20 /* FragmentShaderComponent.OverrideColor */);
+    const overrideColor = frag.get(21 /* FragmentShaderComponent.OverrideColor */);
     if (undefined !== overrideColor) {
         frag.addFunction("vec4 overrideColor(vec4 currentColor)", overrideColor);
         prelude.addline("  output0 = overrideColor(output0);");
     }
     addRenderPass(frag);
     frag.addDrawBuffersExtension(3);
-    frag.set(17 /* FragmentShaderComponent.AssignFragData */, prelude.source + assignPickBufferOutputsMRT);
+    frag.set(18 /* FragmentShaderComponent.AssignFragData */, prelude.source + assignPickBufferOutputsMRT);
 }
 /** @internal */
 export function addFragColorWithPreMultipliedAlpha(frag) {
     addRenderPass(frag);
-    const overrideColor = frag.get(20 /* FragmentShaderComponent.OverrideColor */);
+    const overrideColor = frag.get(21 /* FragmentShaderComponent.OverrideColor */);
     if (undefined === overrideColor) {
-        frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColorWithPreMultipliedAlpha);
+        frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColorWithPreMultipliedAlpha);
     }
     else {
         frag.addFunction("vec4 overrideColor(vec4 currentColor)", overrideColor);
-        frag.set(17 /* FragmentShaderComponent.AssignFragData */, overrideAndAssignFragColorWithPreMultipliedAlpha);
+        frag.set(18 /* FragmentShaderComponent.AssignFragData */, overrideAndAssignFragColorWithPreMultipliedAlpha);
     }
 }
 /** @internal */

package/lib/esm/internal/render/webgl/glsl/LogarithmicDepthBuffer.js

@@ -22,6 +22,6 @@ export function addLogDepth(builder) {
             uniform.setUniform2fv(params.target.uniforms.frustum.logZ);
         });
     });
-    frag.set(19 /* FragmentShaderComponent.FinalizeDepth */, finalizeDepth);
+    frag.set(20 /* FragmentShaderComponent.FinalizeDepth */, finalizeDepth);
 }
 //# sourceMappingURL=LogarithmicDepthBuffer.js.map

package/lib/esm/internal/render/webgl/glsl/MaplayerDraping.d.ts

@@ -0,0 +1,12 @@
+/** @packageDocumentation
+ * @module WebGL
+ */
+import { FragmentShaderBuilder } from "../ShaderBuilder";
+export declare const testInside = "\nbool testInside(float x0, float y0, float x1, float y1, float x, float y) {\n  vec2 perp = vec2(y0 - y1, x1 - x0), test = vec2(x - x0, y - y0);\n  float dot = (test.x * perp.x + test.y * perp.y) / sqrt(perp.x * perp.x + perp.y * perp.y);\n  return dot >= -0.001;\n}\n";
+export declare const applyTexture: (isRealityTile: boolean) => string;
+export declare const overrideFeatureId = "return (classifierId == vec4(0)) ? (addUInt32s(feature_id * 255.0, vec4(featureIncrement, 0.0, 0.0, 0.0)) / 255.0) : classifierId;";
+/**
+ * @internal
+ */
+export declare function addApplySurfaceDraping(frag: FragmentShaderBuilder): void;
+//# sourceMappingURL=MaplayerDraping.d.ts.map

package/lib/esm/internal/render/webgl/glsl/MaplayerDraping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MaplayerDraping.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/render/webgl/glsl/MaplayerDraping.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,OAAO,EAAE,qBAAqB,EAAyC,MAAM,kBAAkB,CAAC;AAIhG,eAAO,MAAM,UAAU,kRAMtB,CAAC;AAEF,eAAO,MAAM,YAAY,kBAAmB,OAAO,WAoElD,CAAC;AAEF,eAAO,MAAM,iBAAiB,uIAAuI,CAAC;AAwBtK;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,qBAAqB,QAQjE"}

package/lib/esm/internal/render/webgl/glsl/MaplayerDraping.js

@@ -0,0 +1,111 @@
+import { System } from "../System";
+import { addUInt32s } from "./Common";
+export 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);
+  float dot = (test.x * perp.x + test.y * perp.y) / sqrt(perp.x * perp.x + perp.y * perp.y);
+  return dot >= -0.001;
+}
+`;
+export const applyTexture = (isRealityTile) => `
+bool applyTexture(inout vec4 col, sampler2D sampler, mat4 params, mat4 matrix) {
+  vec2 uv;
+  float layerAlpha;
+  bool isProjected = params[0][0] != 0.0;
+  float imageCount = params[0][1];
+  vec2 classPos;
+
+  if (isProjected) {
+    vec4 eye4 = vec4(v_eyeSpace, 1.0);
+    vec4 classPos4 = matrix * eye4;
+    classPos = classPos4.xy / classPos4.w;
+
+    if (!testInside(params[2].x, params[2].y, params[2].z, params[2].w, classPos.x, classPos.y)
+        ${isRealityTile ? "||" : "&&"}
+        !testInside(params[2].z, params[2].w, params[3].x, params[3].y, classPos.x, classPos.y)
+        ${isRealityTile ? "||" : "&&"}
+        !testInside(params[3].x, params[3].y, params[3].z, params[3].w, classPos.x, classPos.y)
+        ${isRealityTile ? "||" : "&&"}
+        !testInside(params[3].z, params[3].w, params[2].x, params[2].y, classPos.x, classPos.y))
+        return false;
+
+    uv.x = classPos.x;
+    uv.y = classPos.y / imageCount;
+    layerAlpha = params[0][2];
+
+    if (uv.x < 0.0 || uv.x > 1.0 || uv.y < 0.0 || uv.y > 1.0)
+      return false;
+
+  } else {
+    vec4 texTransform = matrix[0].xyzw;
+    vec4 texClip = matrix[1].xyzw;
+    layerAlpha = matrix[2].x;
+    uv = vec2(texTransform[0] + texTransform[2] * v_texCoord.x, texTransform[1] + texTransform[3] * v_texCoord.y);
+
+    if (uv.x < texClip[0] || uv.x > texClip[2] || uv.y < texClip[1] || uv.y > texClip[3])
+      return false;
+
+    uv.y = 1.0 - uv.y;
+  }
+
+  vec4 texCol = TEXTURE(sampler, uv);
+  float alpha = layerAlpha * texCol.a;
+
+  if (alpha > 0.05) {
+    vec3 texRgb = isProjected ? (texCol.rgb / texCol.a) : texCol.rgb; // If projected, undo premultiplication
+    // Texture color is premultiplied earlier by alpha only if projected (from classification).
+
+    col.rgb = (1.0 - alpha) * col.rgb + alpha * texRgb;
+
+    if (isProjected) {
+      vec4 featureTexel = TEXTURE(sampler, vec2(uv.x, (1.0 + classPos.y) / imageCount));
+      classifierId = addUInt32s(params[1], featureTexel * 255.0) / 255.0;
+    } else {
+      featureIncrement = matrix[2].y;
+      classifierId = vec4(0);
+    }
+
+    if (alpha > col.a)
+      col.a = alpha;
+
+    return true;
+  }
+
+  // If texture color is transparent but base color is not, return true (don't discard)
+  // Else return false (discard) if both the texture and base color are transparent
+  return (col.a > 0.05);
+}
+`;
+export const overrideFeatureId = `return (classifierId == vec4(0)) ? (addUInt32s(feature_id * 255.0, vec4(featureIncrement, 0.0, 0.0, 0.0)) / 255.0) : classifierId;`;
+function applyDraping() {
+    const applyTextureStrings = [];
+    for (let i = 0; i < System.instance.maxRealityImageryLayers; i++)
+        applyTextureStrings.push(`if (applyTexture(col, s_texture${i}, u_texParams${i}, u_texMatrix${i})) doDiscard = false; `);
+    return `
+  if (!u_texturesPresent) {
+    vec4 col = baseColor;
+    return col;
+  }
+
+  bool doDiscard = baseColor.a < 0.05;
+  vec4 col = baseColor;
+  ${applyTextureStrings.join("\n  ")}
+  if (doDiscard)
+    discard;
+
+  return col;
+  `;
+}
+/**
+ * @internal
+ */
+export function addApplySurfaceDraping(frag) {
+    frag.addGlobal("featureIncrement", 2 /* VariableType.Float */, "0.0");
+    frag.addGlobal("classifierId", 5 /* VariableType.Vec4 */);
+    frag.addFunction(addUInt32s);
+    frag.addFunction(testInside);
+    frag.addFunction(applyTexture(false));
+    frag.set(14 /* FragmentShaderComponent.ApplyDraping */, applyDraping());
+    frag.set(19 /* FragmentShaderComponent.OverrideFeatureId */, overrideFeatureId);
+}
+//# sourceMappingURL=MaplayerDraping.js.map

package/lib/esm/internal/render/webgl/glsl/MaplayerDraping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MaplayerDraping.js","sourceRoot":"","sources":["../../../../../../src/internal/render/webgl/glsl/MaplayerDraping.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,MAAM,CAAC,MAAM,UAAU,GAAG;;;;;;CAMzB,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,aAAsB,EAAE,EAAE,CAAC;;;;;;;;;;;;;;UAc9C,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;;UAE3B,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;;UAE3B,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkDpC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,oIAAoI,CAAC;AAEtK,SAAS,YAAY;IACnB,MAAM,mBAAmB,GAAG,EAAE,CAAC;IAE/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,uBAAuB,EAAE,CAAC,EAAE;QAC9D,mBAAmB,CAAC,IAAI,CAAC,kCAAkC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IAE1H,OAAO;;;;;;;;IAQL,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC;;;;;GAKjC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAA2B;IAChE,IAAI,CAAC,SAAS,CAAC,kBAAkB,8BAAsB,KAAK,CAAC,CAAC;IAC9D,IAAI,CAAC,SAAS,CAAC,cAAc,4BAAoB,CAAC;IAClD,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC7B,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC7B,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,IAAI,CAAC,GAAG,gDAAuC,YAAY,EAAE,CAAC,CAAC;IAC/D,IAAI,CAAC,GAAG,qDAA4C,iBAAiB,CAAC,CAAC;AACzE,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module WebGL\n */\nimport { FragmentShaderBuilder, FragmentShaderComponent, VariableType } from \"../ShaderBuilder\";\nimport { System } from \"../System\";\nimport { addUInt32s } from \"./Common\";\n\nexport const testInside = `\nbool testInside(float x0, float y0, float x1, float y1, float x, float y) {\n  vec2 perp = vec2(y0 - y1, x1 - x0), test = vec2(x - x0, y - y0);\n  float dot = (test.x * perp.x + test.y * perp.y) / sqrt(perp.x * perp.x + perp.y * perp.y);\n  return dot >= -0.001;\n}\n`;\n\nexport const applyTexture = (isRealityTile: boolean) => `\nbool applyTexture(inout vec4 col, sampler2D sampler, mat4 params, mat4 matrix) {\n  vec2 uv;\n  float layerAlpha;\n  bool isProjected = params[0][0] != 0.0;\n  float imageCount = params[0][1];\n  vec2 classPos;\n\n  if (isProjected) {\n    vec4 eye4 = vec4(v_eyeSpace, 1.0);\n    vec4 classPos4 = matrix * eye4;\n    classPos = classPos4.xy / classPos4.w;\n\n    if (!testInside(params[2].x, params[2].y, params[2].z, params[2].w, classPos.x, classPos.y)\n        ${isRealityTile ? \"||\" : \"&&\"}\n        !testInside(params[2].z, params[2].w, params[3].x, params[3].y, classPos.x, classPos.y)\n        ${isRealityTile ? \"||\" : \"&&\"}\n        !testInside(params[3].x, params[3].y, params[3].z, params[3].w, classPos.x, classPos.y)\n        ${isRealityTile ? \"||\" : \"&&\"}\n        !testInside(params[3].z, params[3].w, params[2].x, params[2].y, classPos.x, classPos.y))\n        return false;\n\n    uv.x = classPos.x;\n    uv.y = classPos.y / imageCount;\n    layerAlpha = params[0][2];\n\n    if (uv.x < 0.0 || uv.x > 1.0 || uv.y < 0.0 || uv.y > 1.0)\n      return false;\n\n  } else {\n    vec4 texTransform = matrix[0].xyzw;\n    vec4 texClip = matrix[1].xyzw;\n    layerAlpha = matrix[2].x;\n    uv = vec2(texTransform[0] + texTransform[2] * v_texCoord.x, texTransform[1] + texTransform[3] * v_texCoord.y);\n\n    if (uv.x < texClip[0] || uv.x > texClip[2] || uv.y < texClip[1] || uv.y > texClip[3])\n      return false;\n\n    uv.y = 1.0 - uv.y;\n  }\n\n  vec4 texCol = TEXTURE(sampler, uv);\n  float alpha = layerAlpha * texCol.a;\n\n  if (alpha > 0.05) {\n    vec3 texRgb = isProjected ? (texCol.rgb / texCol.a) : texCol.rgb; // If projected, undo premultiplication\n    // Texture color is premultiplied earlier by alpha only if projected (from classification).\n\n    col.rgb = (1.0 - alpha) * col.rgb + alpha * texRgb;\n\n    if (isProjected) {\n      vec4 featureTexel = TEXTURE(sampler, vec2(uv.x, (1.0 + classPos.y) / imageCount));\n      classifierId = addUInt32s(params[1], featureTexel * 255.0) / 255.0;\n    } else {\n      featureIncrement = matrix[2].y;\n      classifierId = vec4(0);\n    }\n\n    if (alpha > col.a)\n      col.a = alpha;\n\n    return true;\n  }\n\n  // If texture color is transparent but base color is not, return true (don't discard)\n  // Else return false (discard) if both the texture and base color are transparent\n  return (col.a > 0.05);\n}\n`;\n\nexport const overrideFeatureId = `return (classifierId == vec4(0)) ? (addUInt32s(feature_id * 255.0, vec4(featureIncrement, 0.0, 0.0, 0.0)) / 255.0) : classifierId;`;\n\nfunction applyDraping(){\n  const applyTextureStrings = [];\n\n  for (let i = 0; i < System.instance.maxRealityImageryLayers; i++)\n    applyTextureStrings.push(`if (applyTexture(col, s_texture${i}, u_texParams${i}, u_texMatrix${i})) doDiscard = false; `);\n\n  return `\n  if (!u_texturesPresent) {\n    vec4 col = baseColor;\n    return col;\n  }\n\n  bool doDiscard = baseColor.a < 0.05;\n  vec4 col = baseColor;\n  ${applyTextureStrings.join(\"\\n  \")}\n  if (doDiscard)\n    discard;\n\n  return col;\n  `;\n}\n\n/**\n * @internal\n */\nexport function addApplySurfaceDraping(frag: FragmentShaderBuilder) {\n  frag.addGlobal(\"featureIncrement\", VariableType.Float, \"0.0\");\n  frag.addGlobal(\"classifierId\", VariableType.Vec4);\n  frag.addFunction(addUInt32s);\n  frag.addFunction(testInside);\n  frag.addFunction(applyTexture(false));\n  frag.set(FragmentShaderComponent.ApplyDraping, applyDraping());\n  frag.set(FragmentShaderComponent.OverrideFeatureId, overrideFeatureId);\n}"]}

package/lib/esm/internal/render/webgl/glsl/PlanarClassification.js

@@ -290,7 +290,7 @@ export function addFeaturePlanarClassifier(builder) {
             uniform.setUniform4fv(scratchBatchBaseComponents);
         });
     });
-    frag.set(18 /* FragmentShaderComponent.OverrideFeatureId */, overrideFeatureId);
+    frag.set(19 /* FragmentShaderComponent.OverrideFeatureId */, overrideFeatureId);
     frag.addFunction(addUInt32s);
 }
 /** @internal */
@@ -379,8 +379,8 @@ export function addOverrideClassifierColor(builder, isThematic) {
     const haveOverrides = undefined !== builder.frag.find("v_feature_emphasis");
     builder.frag.addFunction(haveOverrides ? encodeNonLocatableWithFeatures : encodeNonLocatable);
     if (isThematic === 0 /* IsThematic.No */)
-        builder.frag.set(20 /* FragmentShaderComponent.OverrideColor */, haveOverrides ? overrideClassifierWithFeatures : overrideClassifierForClip);
+        builder.frag.set(21 /* FragmentShaderComponent.OverrideColor */, haveOverrides ? overrideClassifierWithFeatures : overrideClassifierForClip);
     else
-        builder.frag.set(20 /* FragmentShaderComponent.OverrideColor */, haveOverrides ? overrideClassifierWithFeaturesForThematic : overrideClassifierForClipForThematic);
+        builder.frag.set(21 /* FragmentShaderComponent.OverrideColor */, haveOverrides ? overrideClassifierWithFeaturesForThematic : overrideClassifierForClipForThematic);
 }
 //# sourceMappingURL=PlanarClassification.js.map

package/lib/esm/internal/render/webgl/glsl/PointCloud.js

@@ -89,7 +89,7 @@ export function createPointCloudBuilder(classified, featureMode, thematic) {
     }
     if (1 /* IsThematic.Yes */ === thematic) {
         addThematicDisplay(builder, true);
-        addTexture(builder, 0 /* IsAnimated.No */, 1 /* IsThematic.Yes */, true, false);
+        addTexture(builder, 0 /* IsAnimated.No */, 1 /* IsThematic.Yes */, true, false, false);
     }
     return builder;
 }
@@ -98,7 +98,7 @@ export function createPointCloudHiliter(classified) {
     const builder = createBuilder();
     if (classified) {
         addHilitePlanarClassifier(builder, false);
-        builder.frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+        builder.frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     }
     else {
         addUniformHiliter(builder);

package/lib/esm/internal/render/webgl/glsl/PointCloud.js.map

@@ -1 +1 @@
-{"version":3,"file":"PointCloud.js","sourceRoot":"","sources":["../../../../../../src/internal/render/webgl/glsl/PointCloud.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module WebGL\n */\n\nimport { assert } from \"@itwin/core-bentley\";\nimport { AttributeMap } from \"../AttributeMap\";\nimport { FragmentShaderComponent, ProgramBuilder, VariableType, VertexShaderComponent } from \"../ShaderBuilder\";\nimport { FeatureMode, IsAnimated, IsClassified, IsThematic } from \"../TechniqueFlags\";\nimport { TechniqueId } from \"../TechniqueId\";\nimport { addUniformHiliter } from \"./FeatureSymbology\";\nimport { addColorPlanarClassifier, addFeaturePlanarClassifier, addHilitePlanarClassifier } from \"./PlanarClassification\";\nimport { addModelViewProjectionMatrix } from \"./Vertex\";\nimport { addViewportTransformation } from \"./Viewport\";\nimport { addThematicDisplay } from \"./Thematic\";\nimport { addTexture } from \"./Surface\";\nimport { assignFragColor } from \"./Fragment\";\n\n// Revert components if color format is BGR instead of RGB.\nconst computeColor = `\n  return u_pointCloud.y == 1.0 ? vec4(a_color.b, a_color.g, a_color.r, 1.0) : vec4(a_color, 1.0);\n`;\n\nconst computeBaseColor = \"return v_color;\";\n\n// Round the point unless drawing square points.\nconst roundPointDiscard = `\n  if (u_pointCloudSettings.w == 1.0)\n    return false;\n\n  vec2 pointXY = (2.0 * gl_PointCoord - 1.0);\n  return dot(pointXY, pointXY) > 1.0;\n`;\n\nconst checkForClassifiedDiscard = \"return baseColor.a == 0.0;\";\n\nconst computePosition = `\n  gl_PointSize = 1.0;\n  vec4 pos = MAT_MVP * rawPos;\n  if (u_pointCloudSettings.x > 0.0) {\n    // Size is specified in pixels.\n    gl_PointSize = u_pointCloudSettings.x;\n    return pos;\n  }\n\n  // Point size is in meters (voxel size).\n  if (pos.w <= 0.0) {\n    // Cannot perform perspective divide below.\n    return pos;\n  }\n\n  // Convert voxel size in meters into pixel size, then compute pixel size, taking perspective into account.\n  mat4 toView = u_viewportTransformation * MAT_MVP;\n  float scale = length(toView[0].xyz);\n  gl_PointSize = -u_pointCloudSettings.x * clamp(u_pointCloud.x * scale / pos.w, u_pointCloudSettings.y, u_pointCloudSettings.z);\n  return pos;\n`;\n\nfunction createBuilder(): ProgramBuilder {\n  const builder = new ProgramBuilder(AttributeMap.findAttributeMap(TechniqueId.PointCloud, false));\n  const vert = builder.vert;\n  addViewportTransformation(vert);\n  vert.set(VertexShaderComponent.ComputePosition, computePosition);\n  addModelViewProjectionMatrix(vert);\n\n  builder.frag.set(FragmentShaderComponent.CheckForEarlyDiscard, roundPointDiscard);\n\n  // Uniforms based on the PointCloudDisplaySettings.\n  builder.addUniform(\"u_pointCloudSettings\", VariableType.Vec4, (prog) => {\n    prog.addGraphicUniform(\"u_pointCloudSettings\", (uniform, params) => {\n      params.target.uniforms.realityModel.pointCloud.bind(uniform);\n    });\n  });\n\n  // Uniforms based on the PointCloudGeometry.\n  builder.vert.addUniform(\"u_pointCloud\", VariableType.Vec2, (prog) => {\n    prog.addGraphicUniform(\"u_pointCloud\", (uniform, params) => {\n      assert(params.geometry.asPointCloud !== undefined);\n      scratchPointCloud[0] = params.geometry.asPointCloud.voxelSize;\n      scratchPointCloud[1] = params.geometry.asPointCloud.colorIsBgr ? 1 : 0;\n      uniform.setUniform2fv(scratchPointCloud);\n    });\n  });\n\n  return builder;\n}\n\nconst scratchPointCloud = new Float32Array([0, 0]);\n\n/** @internal */\nexport function createPointCloudBuilder(classified: IsClassified, featureMode: FeatureMode, thematic: IsThematic): ProgramBuilder {\n  const builder = createBuilder();\n\n  builder.addVarying(\"v_color\", VariableType.Vec4);\n  builder.vert.set(VertexShaderComponent.ComputeBaseColor, computeColor);\n\n  builder.frag.set(FragmentShaderComponent.ComputeBaseColor, computeBaseColor);\n  if (classified) {\n    addColorPlanarClassifier(builder, false, thematic);\n    builder.frag.set(FragmentShaderComponent.CheckForDiscard, checkForClassifiedDiscard);\n\n    if (FeatureMode.None !== featureMode)\n      addFeaturePlanarClassifier(builder);\n  }\n\n  if (IsThematic.Yes === thematic) {\n    addThematicDisplay(builder, true);\n    addTexture(builder, IsAnimated.No, IsThematic.Yes, true, false);\n  }\n\n  return builder;\n}\n\n/** @internal */\nexport function createPointCloudHiliter(classified: IsClassified): ProgramBuilder {\n  const builder = createBuilder();\n  if (classified) {\n    addHilitePlanarClassifier(builder, false);\n    builder.frag.set(FragmentShaderComponent.AssignFragData, assignFragColor);\n  } else {\n    addUniformHiliter(builder);\n  }\n\n  return builder;\n}\n"]}
+{"version":3,"file":"PointCloud.js","sourceRoot":"","sources":["../../../../../../src/internal/render/webgl/glsl/PointCloud.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module WebGL\n */\n\nimport { assert } from \"@itwin/core-bentley\";\nimport { AttributeMap } from \"../AttributeMap\";\nimport { FragmentShaderComponent, ProgramBuilder, VariableType, VertexShaderComponent } from \"../ShaderBuilder\";\nimport { FeatureMode, IsAnimated, IsClassified, IsThematic } from \"../TechniqueFlags\";\nimport { TechniqueId } from \"../TechniqueId\";\nimport { addUniformHiliter } from \"./FeatureSymbology\";\nimport { addColorPlanarClassifier, addFeaturePlanarClassifier, addHilitePlanarClassifier } from \"./PlanarClassification\";\nimport { addModelViewProjectionMatrix } from \"./Vertex\";\nimport { addViewportTransformation } from \"./Viewport\";\nimport { addThematicDisplay } from \"./Thematic\";\nimport { addTexture } from \"./Surface\";\nimport { assignFragColor } from \"./Fragment\";\n\n// Revert components if color format is BGR instead of RGB.\nconst computeColor = `\n  return u_pointCloud.y == 1.0 ? vec4(a_color.b, a_color.g, a_color.r, 1.0) : vec4(a_color, 1.0);\n`;\n\nconst computeBaseColor = \"return v_color;\";\n\n// Round the point unless drawing square points.\nconst roundPointDiscard = `\n  if (u_pointCloudSettings.w == 1.0)\n    return false;\n\n  vec2 pointXY = (2.0 * gl_PointCoord - 1.0);\n  return dot(pointXY, pointXY) > 1.0;\n`;\n\nconst checkForClassifiedDiscard = \"return baseColor.a == 0.0;\";\n\nconst computePosition = `\n  gl_PointSize = 1.0;\n  vec4 pos = MAT_MVP * rawPos;\n  if (u_pointCloudSettings.x > 0.0) {\n    // Size is specified in pixels.\n    gl_PointSize = u_pointCloudSettings.x;\n    return pos;\n  }\n\n  // Point size is in meters (voxel size).\n  if (pos.w <= 0.0) {\n    // Cannot perform perspective divide below.\n    return pos;\n  }\n\n  // Convert voxel size in meters into pixel size, then compute pixel size, taking perspective into account.\n  mat4 toView = u_viewportTransformation * MAT_MVP;\n  float scale = length(toView[0].xyz);\n  gl_PointSize = -u_pointCloudSettings.x * clamp(u_pointCloud.x * scale / pos.w, u_pointCloudSettings.y, u_pointCloudSettings.z);\n  return pos;\n`;\n\nfunction createBuilder(): ProgramBuilder {\n  const builder = new ProgramBuilder(AttributeMap.findAttributeMap(TechniqueId.PointCloud, false));\n  const vert = builder.vert;\n  addViewportTransformation(vert);\n  vert.set(VertexShaderComponent.ComputePosition, computePosition);\n  addModelViewProjectionMatrix(vert);\n\n  builder.frag.set(FragmentShaderComponent.CheckForEarlyDiscard, roundPointDiscard);\n\n  // Uniforms based on the PointCloudDisplaySettings.\n  builder.addUniform(\"u_pointCloudSettings\", VariableType.Vec4, (prog) => {\n    prog.addGraphicUniform(\"u_pointCloudSettings\", (uniform, params) => {\n      params.target.uniforms.realityModel.pointCloud.bind(uniform);\n    });\n  });\n\n  // Uniforms based on the PointCloudGeometry.\n  builder.vert.addUniform(\"u_pointCloud\", VariableType.Vec2, (prog) => {\n    prog.addGraphicUniform(\"u_pointCloud\", (uniform, params) => {\n      assert(params.geometry.asPointCloud !== undefined);\n      scratchPointCloud[0] = params.geometry.asPointCloud.voxelSize;\n      scratchPointCloud[1] = params.geometry.asPointCloud.colorIsBgr ? 1 : 0;\n      uniform.setUniform2fv(scratchPointCloud);\n    });\n  });\n\n  return builder;\n}\n\nconst scratchPointCloud = new Float32Array([0, 0]);\n\n/** @internal */\nexport function createPointCloudBuilder(classified: IsClassified, featureMode: FeatureMode, thematic: IsThematic): ProgramBuilder {\n  const builder = createBuilder();\n\n  builder.addVarying(\"v_color\", VariableType.Vec4);\n  builder.vert.set(VertexShaderComponent.ComputeBaseColor, computeColor);\n\n  builder.frag.set(FragmentShaderComponent.ComputeBaseColor, computeBaseColor);\n  if (classified) {\n    addColorPlanarClassifier(builder, false, thematic);\n    builder.frag.set(FragmentShaderComponent.CheckForDiscard, checkForClassifiedDiscard);\n\n    if (FeatureMode.None !== featureMode)\n      addFeaturePlanarClassifier(builder);\n  }\n\n  if (IsThematic.Yes === thematic) {\n    addThematicDisplay(builder, true);\n    addTexture(builder, IsAnimated.No, IsThematic.Yes, true, false, false);\n  }\n\n  return builder;\n}\n\n/** @internal */\nexport function createPointCloudHiliter(classified: IsClassified): ProgramBuilder {\n  const builder = createBuilder();\n  if (classified) {\n    addHilitePlanarClassifier(builder, false);\n    builder.frag.set(FragmentShaderComponent.AssignFragData, assignFragColor);\n  } else {\n    addUniformHiliter(builder);\n  }\n\n  return builder;\n}\n"]}

package/lib/esm/internal/render/webgl/glsl/RealityMesh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RealityMesh.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/render/webgl/glsl/RealityMesh.ts"],"names":[],"mappings":"AAIA;;GAEG;AAQH,OAAO,EAA2B,cAAc,EAAE,aAAa,EAAuC,MAAM,kBAAkB,CAAC;AAE/H,OAAO,EAAyC,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAuB1F,eAAO,MAAM,cAAc,uEAE1B,CAAC;AAmNF,gBAAgB;AAChB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,QAMtD;AAYD,gBAAgB;AAChB,wBAAgB,kCAAkC,IAAI,cAAc,CAInE;AAED,gBAAgB;AAChB,wBAAgB,wBAAwB,IAAI,cAAc,CAIzD;AAED,gBAAgB;AAChB,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,CAyE9E"}
+{"version":3,"file":"RealityMesh.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/render/webgl/glsl/RealityMesh.ts"],"names":[],"mappings":"AAIA;;GAEG;AAQH,OAAO,EAA2B,cAAc,EAAE,aAAa,EAAuC,MAAM,kBAAkB,CAAC;AAE/H,OAAO,EAAyC,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAwB1F,eAAO,MAAM,cAAc,uEAE1B,CAAC;AA0HF,gBAAgB;AAChB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,QAMtD;AAYD,gBAAgB;AAChB,wBAAgB,kCAAkC,IAAI,cAAc,CAInE;AAED,gBAAgB;AAChB,wBAAgB,wBAAwB,IAAI,cAAc,CAIzD;AAED,gBAAgB;AAChB,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,CAyE9E"}

package/lib/esm/internal/render/webgl/glsl/RealityMesh.js

@@ -25,6 +25,7 @@ import { addClassificationTranslucencyDiscard, octDecodeNormal } from "./Surface
 import { addThematicDisplay, getComputeThematicIndex } from "./Thematic";
 import { addModelViewProjectionMatrix, addNormalMatrix } from "./Vertex";
 import { addWiremesh } from "./Wiremesh";
+import { applyTexture, overrideFeatureId, testInside } from "./MaplayerDraping";
 const computePosition = "gl_PointSize = 1.0; return MAT_MVP * rawPos;";
 const computeNormal = `
   vec3 normal = octDecodeNormal(a_norm); // normal coming in for is already in world space
@@ -34,95 +35,10 @@ const computeNormal = `
 export 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);
-  float dot = (test.x * perp.x + test.y * perp.y) / sqrt(perp.x * perp.x + perp.y * perp.y);
-  return dot >= -0.001;
-}
-`;
-/* There are two methods of applying a texture to a reality mesh.  the first member of "params" denotes which
-  method is to be used.  A value of zero indicates a standard texture and one represents a projected texture.
-
-  A standard (nonprojected) texture is generated by multiplying v_textCoord by the scaling and translation packed into the first row
-  of "matrix". A clip rectangle is packed into second row of "matrix".
-
-  A "projected" reality mesh texture is used for map layers.  It does not uses v_texCoord, the texture coordinates
-  are instead generated by a projection of the model position onto the X-Y plane. We only have eye position, not model position
-  so the matrix in this case is a real transform matrix that contains a mapping from eye to model position
-  followed by the model to texture projection.
-*/
-const applyTexture = `
-bool applyTexture(inout vec4 col, sampler2D sampler, mat4 params, mat4 matrix) {
-  vec2 uv;
-  float layerAlpha;
-  bool isProjected = params[0][0] != 0.0;
-  float imageCount = params[0][1];
-  vec2 classPos;
-
-  if (isProjected) {
-    vec4 eye4 = vec4(v_eyeSpace, 1.0);
-    vec4 classPos4 = matrix * eye4;
-    classPos = classPos4.xy / classPos4.w;
-
-    if (!testInside(params[2].x, params[2].y, params[2].z, params[2].w, classPos.x, classPos.y) ||
-        !testInside(params[2].z, params[2].w, params[3].x, params[3].y, classPos.x, classPos.y) ||
-        !testInside(params[3].x, params[3].y, params[3].z, params[3].w, classPos.x, classPos.y) ||
-        !testInside(params[3].z, params[3].w, params[2].x, params[2].y, classPos.x, classPos.y))
-        return false;
-
-    uv.x = classPos.x;
-    uv.y = classPos.y / imageCount;
-    layerAlpha = params[0][2];
-
-    if (uv.x < 0.0 || uv.x > 1.0 || uv.y < 0.0 || uv.y > 1.0)
-      return false;
-
-  } else {
-    vec4 texTransform = matrix[0].xyzw;
-    vec4 texClip = matrix[1].xyzw;
-    layerAlpha = matrix[2].x;
-    uv = vec2(texTransform[0] + texTransform[2] * v_texCoord.x, texTransform[1] + texTransform[3] * v_texCoord.y);
-
-    if (uv.x < texClip[0] || uv.x > texClip[2] || uv.y < texClip[1] || uv.y > texClip[3])
-      return false;
-
-    uv.y = 1.0 - uv.y;
-  }
-
-  vec4 texCol = TEXTURE(sampler, uv);
-  float alpha = layerAlpha * texCol.a;
-
-  if (alpha > 0.05) {
-    vec3 texRgb = isProjected ? (texCol.rgb / texCol.a) : texCol.rgb; // If projected, undo premultiplication
-    // Texture color is premultiplied earlier by alpha only if projected (from classification).
-
-    col.rgb = (1.0 - alpha) * col.rgb + alpha * texRgb;
-
-    if (isProjected) {
-      vec4 featureTexel = TEXTURE(sampler, vec2(uv.x, (1.0 + classPos.y) / imageCount));
-      classifierId = addUInt32s(params[1], featureTexel * 255.0) / 255.0;
-    } else {
-      featureIncrement = matrix[2].y;
-      classifierId = vec4(0);
-    }
-
-    if (alpha > col.a)
-      col.a = alpha;
-
-    return true;
-  }
-
-  // If texture color is transparent but base color is not, return true (don't discard)
-  // Else return false (discard) if both the texture and base color are transparent
-  return (col.a > 0.05);
-}
-`;
 const computeTexCoord = "return unquantize2d(a_uvParam, u_qTexCoordParams);";
 const scratchMatrix4d1 = Matrix4d.createIdentity();
 const scratchMatrix4d2 = Matrix4d.createIdentity();
 const scratchMatrix = new Matrix4();
-const overrideFeatureId = `return (classifierId == vec4(0)) ? (addUInt32s(feature_id * 255.0, vec4(featureIncrement, 0.0, 0.0, 0.0)) / 255.0) : classifierId;`;
 function addTextures(builder, maxTexturesPerMesh) {
     builder.vert.addFunction(unquantize2d);
     builder.addFunctionComputedVarying("v_texCoord", 3 /* VariableType.Vec2 */, "computeTexCoord", computeTexCoord);
@@ -151,7 +67,6 @@ function addTextures(builder, maxTexturesPerMesh) {
                     texture.texture.bindSampler(uniform, textureUnits[i]);
                 }
                 else {
-                    // assert(false, "Terrain Mesh texture not defined when beginning texture.");
                     System.instance.ensureSamplerBound(uniform, textureUnits[i]);
                 }
             });
@@ -220,7 +135,7 @@ function addThematicToRealityMesh(builder, gradientTextureUnit) {
     builder.vert.addGlobal("g_hillshadeIndex", 2 /* VariableType.Float */);
     builder.addFunctionComputedVarying("v_n", 4 /* VariableType.Vec3 */, "computeLightingNormal", computeNormal);
     builder.frag.addGlobal("g_normal", 4 /* VariableType.Vec3 */);
-    builder.frag.set(23 /* FragmentShaderComponent.FinalizeNormal */, finalizeNormal);
+    builder.frag.set(24 /* FragmentShaderComponent.FinalizeNormal */, finalizeNormal);
     addThematicDisplay(builder, false, true);
     builder.addInlineComputedVarying("v_thematicIndex", 2 /* VariableType.Float */, getComputeThematicIndex(builder.vert.usesInstancedGeometry, false, false));
     builder.vert.addUniform("u_worldToViewN", 6 /* VariableType.Mat3 */, (prog) => {
@@ -247,7 +162,7 @@ function createRealityMeshHiliterBuilder() {
     const vert = builder.vert;
     vert.set(10 /* VertexShaderComponent.ComputePosition */, computePosition);
     addModelViewProjectionMatrix(vert);
-    builder.frag.set(17 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
+    builder.frag.set(18 /* FragmentShaderComponent.AssignFragData */, assignFragColor);
     return builder;
 }
 /** @internal */
@@ -273,7 +188,7 @@ export function createRealityMeshBuilder(flags) {
     const frag = builder.frag;
     frag.addGlobal("featureIncrement", 2 /* VariableType.Float */, "0.0");
     frag.addGlobal("classifierId", 5 /* VariableType.Vec4 */);
-    frag.set(18 /* FragmentShaderComponent.OverrideFeatureId */, overrideFeatureId);
+    frag.set(19 /* FragmentShaderComponent.OverrideFeatureId */, overrideFeatureId);
     const textureCount = System.instance.maxRealityImageryLayers;
     const gradientTextureUnit = TextureUnit.RealityMeshThematicGradient;
     const feat = flags.featureMode;
@@ -295,7 +210,7 @@ export function createRealityMeshBuilder(flags) {
     frag.addFunction(addUInt32s);
     frag.addFunction(testInside);
     addEyeSpace(builder);
-    frag.addFunction(applyTexture);
+    frag.addFunction(applyTexture(true));
     frag.set(1 /* FragmentShaderComponent.ComputeBaseColor */, computeFragmentBaseColor);
     builder.frag.addUniform("u_baseColor", 5 /* VariableType.Vec4 */, (prog) => {
         prog.addGraphicUniform("u_baseColor", (uniform, params) => {