@itwin/core-frontend 4.1.0-dev.6 → 4.1.0-dev.63

package/lib/cjs/tile/GltfReader.js

@@ -34,15 +34,16 @@ exports.GltfGraphicsReader = exports.readGltf = exports.readGltfGraphics = expor
 const core_bentley_1 = require("@itwin/core-bentley");
 const core_geometry_1 = require("@itwin/core-geometry");
 const core_common_1 = require("@itwin/core-common");
-const FrontendLoggerCategory_1 = require("../FrontendLoggerCategory");
-const ImageUtil_1 = require("../ImageUtil");
 const IModelApp_1 = require("../IModelApp");
 const GraphicBranch_1 = require("../render/GraphicBranch");
 const RealityMeshParams_1 = require("../render/RealityMeshParams");
-const DisplayParams_1 = require("../render/primitives/DisplayParams");
 const MeshPrimitives_1 = require("../render/primitives/mesh/MeshPrimitives");
 const Primitives_1 = require("../render/primitives/Primitives");
-const GltfSchema_1 = require("../gltf/GltfSchema");
+const DisplayParams_1 = require("../common/render/primitives/DisplayParams");
+const FrontendLoggerCategory_1 = require("../common/FrontendLoggerCategory");
+const ImageUtil_1 = require("../common/ImageUtil");
+const MeshPrimitive_1 = require("../common/render/primitives/MeshPrimitive");
+const GltfSchema_1 = require("../common/gltf/GltfSchema");
 /**
  * A chunk of binary data exposed as a typed array.
  * The count member indicates how many elements exist. This may be less than this.buffer.length due to padding added to the
@@ -212,16 +213,6 @@ class GltfMeshData {
     }
 }
 exports.GltfMeshData = GltfMeshData;
-/* -----------------------------------
-   This is part of the webworker option.
-
-  // input is Uint8Array, the result is an ImageBitMap.
-  class ImageDecodeWorkerOperation extends WorkerOperation {
-    constructor(imageBytes: ArrayBuffer, imageMimeType: string) {
-      super("imageBytesToImageBitmap", [imageBytes, imageMimeType], [imageBytes]);
-    }
-  }
--------------------------------------- */
 const emptyDict = {};
 function colorFromJson(values) {
     return core_common_1.ColorDef.from(values[0] * 255, values[1] * 255, values[2] * 255, (1.0 - values[3]) * 255);
@@ -686,12 +677,14 @@ class GltfReader {
         const isTransparent = this.isMaterialTransparent(material);
         const textureId = this.extractTextureId(material);
         const normalMapId = this.extractNormalMapId(material);
-        const textureMapping = (undefined !== textureId || undefined !== normalMapId) ? this.findTextureMapping(textureId, isTransparent, normalMapId) : undefined;
+        let textureMapping = (undefined !== textureId || undefined !== normalMapId) ? this.findTextureMapping(textureId, isTransparent, normalMapId) : undefined;
         const color = colorFromMaterial(material, isTransparent);
         let renderMaterial;
         if (undefined !== textureMapping && undefined !== textureMapping.normalMapParams) {
             const args = { diffuse: { color }, specular: { color: core_common_1.ColorDef.white }, textureMapping };
             renderMaterial = IModelApp_1.IModelApp.renderSystem.createRenderMaterial(args);
+            // DisplayParams doesn't want a separate texture mapping if the material already has one.
+            textureMapping = undefined;
         }
         return new DisplayParams_1.DisplayParams(DisplayParams_1.DisplayParams.Type.Mesh, color, color, 1, core_common_1.LinePixels.Solid, core_common_1.FillFlags.Always, renderMaterial, undefined, hasBakedLighting, textureMapping);
     }
@@ -728,13 +721,13 @@ class GltfReader {
         const meshMode = core_bentley_1.JsonUtils.asInt(primitive.mode, GltfSchema_1.GltfMeshMode.Triangles);
         switch (meshMode) {
             case GltfSchema_1.GltfMeshMode.Lines:
-                primitiveType = MeshPrimitives_1.Mesh.PrimitiveType.Polyline;
+                primitiveType = MeshPrimitive_1.MeshPrimitiveType.Polyline;
                 break;
             case GltfSchema_1.GltfMeshMode.Points:
-                primitiveType = MeshPrimitives_1.Mesh.PrimitiveType.Point;
+                primitiveType = MeshPrimitive_1.MeshPrimitiveType.Point;
                 break;
             case GltfSchema_1.GltfMeshMode.Triangles:
-                primitiveType = MeshPrimitives_1.Mesh.PrimitiveType.Mesh;
+                primitiveType = MeshPrimitive_1.MeshPrimitiveType.Mesh;
                 break;
             default:
                 (0, core_bentley_1.assert)(false);
@@ -793,7 +786,7 @@ class GltfReader {
         if (!this.readVertices(mesh, primitive, pseudoRtcBias))
             return undefined;
         switch (primitiveType) {
-            case MeshPrimitives_1.Mesh.PrimitiveType.Mesh: {
+            case MeshPrimitive_1.MeshPrimitiveType.Mesh: {
                 if (!this.readMeshIndices(mesh, primitive))
                     return undefined;
                 if (!displayParams.ignoreLighting && !this.readNormals(mesh, primitive.attributes, "NORMAL"))
@@ -808,9 +801,9 @@ class GltfReader {
                     return undefined;
                 break;
             }
-            case MeshPrimitives_1.Mesh.PrimitiveType.Polyline:
-            case MeshPrimitives_1.Mesh.PrimitiveType.Point: {
-                if (undefined !== mesh.primitive.polylines && !this.readPolylines(mesh.primitive.polylines, primitive, "indices", MeshPrimitives_1.Mesh.PrimitiveType.Point === primitiveType))
+            case MeshPrimitive_1.MeshPrimitiveType.Polyline:
+            case MeshPrimitive_1.MeshPrimitiveType.Point: {
+                if (undefined !== mesh.primitive.polylines && !this.readPolylines(mesh.primitive.polylines, primitive, "indices", MeshPrimitive_1.MeshPrimitiveType.Point === primitiveType))
                     return undefined;
                 break;
             }