Fix background map base color transparency mix problem (#3668)

* Reality mesh shader needs to mix base color with any overrides even if textures are not specified (map base color, for example, can be specified). * rush change (cherry picked from commit 596e122)
iTwin · May 24, 2022 · 2dc5a1e · 2dc5a1e
1 parent d2b1ff5
commit 2dc5a1e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...nges/@itwin/core-frontend/markschlosser-fix-basecolor-mix-map-tiles_2022-05-24-13-40.json b/...nges/@itwin/core-frontend/markschlosser-fix-basecolor-mix-map-tiles_2022-05-24-13-40.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-frontend",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-frontend"
+}
diff --git a/core/frontend/src/render/webgl/glsl/RealityMesh.ts b/core/frontend/src/render/webgl/glsl/RealityMesh.ts
@@ -186,8 +186,11 @@ function baseColorFromTextures(textureCount: number, applyFeatureColor: string)
     applyTextureStrings.push(`if (applyTexture(col, s_texture${i}, u_texParams${i}, u_texMatrix${i})) doDiscard = false; `);
 
   return `
-  if (!u_texturesPresent)
-    return u_baseColor;
+  if (!u_texturesPresent) {
+    vec4 col = u_baseColor;
+    ${applyFeatureColor}
+    return col;
+  }
 
   bool doDiscard = true;
   vec4 col = u_baseColor;