Fix background base color (#3318)

iTwin · Mar 8, 2022 · b2aa5c8 · b2aa5c8
1 parent 01a67ef
commit b2aa5c8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/common/changes/@itwin/core-frontend/fix-background-base-color_2022-03-08-15-02.json b/common/changes/@itwin/core-frontend/fix-background-base-color_2022-03-08-15-02.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-frontend",
+      "comment": "Fix regression that caused solid color background map base to fail to display.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-frontend"
+}
diff --git a/core/frontend/src/render/webgl/RealityMesh.ts b/core/frontend/src/render/webgl/RealityMesh.ts
@@ -218,6 +218,7 @@ export class RealityMeshGeometryParams extends IndexedGeometryParams {
 
 /** @internal */
 export class RealityMeshGeometry extends IndexedGeometry implements IDisposable, RenderMemory.Consumer {
+  public readonly hasTextures: boolean;
   public override get asRealityMesh(): RealityMeshGeometry | undefined { return this; }
   public override get isDisposed(): boolean { return this._realityMeshParams.isDisposed; }
   public get uvQParams() { return this._realityMeshParams.uvParams.params; }
@@ -228,6 +229,7 @@ export class RealityMeshGeometry extends IndexedGeometry implements IDisposable,
 
   private constructor(private _realityMeshParams: RealityMeshGeometryParams, public textureParams: RealityTextureParams | undefined, private readonly _transform: Transform | undefined, public readonly baseColor: ColorDef | undefined, private _baseIsTransparent: boolean, private _isTerrain: boolean) {
     super(_realityMeshParams);
+    this.hasTextures = undefined !== textureParams && textureParams.params.some((x) => undefined !== x.texture);
   }
 
   public override dispose() {

diff --git a/core/frontend/src/render/webgl/glsl/RealityMesh.ts b/core/frontend/src/render/webgl/glsl/RealityMesh.ts
@@ -130,8 +130,7 @@ function addTextures(builder: ProgramBuilder, maxTexturesPerMesh: number) {
 
   builder.frag.addUniform("u_texturesPresent", VariableType.Boolean, (program) => {
     program.addGraphicUniform("u_texturesPresent", (uniform, params) => {
-      const textureCount = params.geometry.asRealityMesh!.textureParams?.params.length;
-      uniform.setUniform1i(textureCount ? 1 : 0);
+      uniform.setUniform1i(params.geometry.asRealityMesh!.hasTextures ? 1 : 0);
     });
   });