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

package/lib/esm/tile/GltfReader.js

@@ -8,15 +8,16 @@
 import { assert, ByteStream, compareBooleans, compareNumbers, compareStrings, Dictionary, JsonUtils, Logger, utf8ToString, } from "@itwin/core-bentley";
 import { Angle, IndexedPolyface, Matrix3d, Point2d, Point3d, Point4d, Range2d, Range3d, Transform, Vector3d, } from "@itwin/core-geometry";
 import { BatchType, ColorDef, Feature, FeatureTable, FillFlags, GlbHeader, ImageSource, LinePixels, MeshEdge, MeshEdges, MeshPolyline, OctEncodedNormal, PackedFeatureTable, QParams2d, QParams3d, QPoint2dList, QPoint3dList, Quantization, RenderTexture, TextureMapping, TextureTransparency, TileFormat, TileReadStatus, } from "@itwin/core-common";
-import { FrontendLoggerCategory } from "../FrontendLoggerCategory";
-import { getImageSourceFormatForMimeType, imageBitmapFromImageSource, imageElementFromImageSource, tryImageElementFromUrl } from "../ImageUtil";
 import { IModelApp } from "../IModelApp";
 import { GraphicBranch } from "../render/GraphicBranch";
 import { RealityMeshParams } from "../render/RealityMeshParams";
-import { DisplayParams } from "../render/primitives/DisplayParams";
 import { Mesh } from "../render/primitives/mesh/MeshPrimitives";
 import { Triangle } from "../render/primitives/Primitives";
-import { getGltfNodeMeshIds, GltfDataType, gltfDictionaryIterator, GltfMeshMode, GltfTechniqueState, GltfWrapMode, isGltf1Material, traverseGltfNodes, } from "../gltf/GltfSchema";
+import { DisplayParams } from "../common/render/primitives/DisplayParams";
+import { FrontendLoggerCategory } from "../common/FrontendLoggerCategory";
+import { getImageSourceFormatForMimeType, imageBitmapFromImageSource, imageElementFromImageSource, tryImageElementFromUrl } from "../common/ImageUtil";
+import { MeshPrimitiveType } from "../common/render/primitives/MeshPrimitive";
+import { getGltfNodeMeshIds, GltfDataType, gltfDictionaryIterator, GltfMeshMode, GltfTechniqueState, GltfWrapMode, isGltf1Material, traverseGltfNodes, } from "../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
@@ -183,16 +184,6 @@ export class GltfMeshData {
         this.primitive = props;
     }
 }
-/* -----------------------------------
-   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 ColorDef.from(values[0] * 255, values[1] * 255, values[2] * 255, (1.0 - values[3]) * 255);
@@ -657,12 +648,14 @@ export 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: ColorDef.white }, textureMapping };
             renderMaterial = IModelApp.renderSystem.createRenderMaterial(args);
+            // DisplayParams doesn't want a separate texture mapping if the material already has one.
+            textureMapping = undefined;
         }
         return new DisplayParams(DisplayParams.Type.Mesh, color, color, 1, LinePixels.Solid, FillFlags.Always, renderMaterial, undefined, hasBakedLighting, textureMapping);
     }
@@ -699,13 +692,13 @@ export class GltfReader {
         const meshMode = JsonUtils.asInt(primitive.mode, GltfMeshMode.Triangles);
         switch (meshMode) {
             case GltfMeshMode.Lines:
-                primitiveType = Mesh.PrimitiveType.Polyline;
+                primitiveType = MeshPrimitiveType.Polyline;
                 break;
             case GltfMeshMode.Points:
-                primitiveType = Mesh.PrimitiveType.Point;
+                primitiveType = MeshPrimitiveType.Point;
                 break;
             case GltfMeshMode.Triangles:
-                primitiveType = Mesh.PrimitiveType.Mesh;
+                primitiveType = MeshPrimitiveType.Mesh;
                 break;
             default:
                 assert(false);
@@ -764,7 +757,7 @@ export class GltfReader {
         if (!this.readVertices(mesh, primitive, pseudoRtcBias))
             return undefined;
         switch (primitiveType) {
-            case Mesh.PrimitiveType.Mesh: {
+            case MeshPrimitiveType.Mesh: {
                 if (!this.readMeshIndices(mesh, primitive))
                     return undefined;
                 if (!displayParams.ignoreLighting && !this.readNormals(mesh, primitive.attributes, "NORMAL"))
@@ -779,9 +772,9 @@ export class GltfReader {
                     return undefined;
                 break;
             }
-            case Mesh.PrimitiveType.Polyline:
-            case Mesh.PrimitiveType.Point: {
-                if (undefined !== mesh.primitive.polylines && !this.readPolylines(mesh.primitive.polylines, primitive, "indices", Mesh.PrimitiveType.Point === primitiveType))
+            case MeshPrimitiveType.Polyline:
+            case MeshPrimitiveType.Point: {
+                if (undefined !== mesh.primitive.polylines && !this.readPolylines(mesh.primitive.polylines, primitive, "indices", MeshPrimitiveType.Point === primitiveType))
                     return undefined;
                 break;
             }