@itwin/core-frontend 4.0.0-dev.44 → 4.0.0-dev.46

package/lib/cjs/tile/GltfReader.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GltfGraphicsReader = exports.readGltfGraphics = exports.GltfReader = exports.GltfMeshData = exports.GltfReaderProps = exports.GltfBufferData = exports.GltfWrapMode = exports.GltfDataType = void 0;
+exports.GltfGraphicsReader = exports.readGltfGraphics = exports.GltfReader = exports.GltfMeshData = exports.GltfReaderProps = exports.GltfBufferData = void 0;
 const core_bentley_1 = require("@itwin/core-bentley");
 const core_geometry_1 = require("@itwin/core-geometry");
 const core_common_1 = require("@itwin/core-common");
@@ -38,102 +38,7 @@ 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");
-/* eslint-disable no-restricted-syntax */
-/** Enumerates the types of [[GltfMeshPrimitive]] topologies. */
-var GltfMeshMode;
-(function (GltfMeshMode) {
-    GltfMeshMode[GltfMeshMode["Points"] = 0] = "Points";
-    GltfMeshMode[GltfMeshMode["Lines"] = 1] = "Lines";
-    GltfMeshMode[GltfMeshMode["LineStrip"] = 3] = "LineStrip";
-    GltfMeshMode[GltfMeshMode["Triangles"] = 4] = "Triangles";
-    /** Not currently supported. */
-    GltfMeshMode[GltfMeshMode["TriangleStrip"] = 5] = "TriangleStrip";
-    /** Not currently supported. */
-    GltfMeshMode[GltfMeshMode["TriangleFan"] = 6] = "TriangleFan";
-})(GltfMeshMode || (GltfMeshMode = {}));
-/** Enumerates the basic data types supported by accessors, material values, technique uniforms, etc.
- * @internal
- */
-var GltfDataType;
-(function (GltfDataType) {
-    GltfDataType[GltfDataType["SignedByte"] = 5120] = "SignedByte";
-    GltfDataType[GltfDataType["UnsignedByte"] = 5121] = "UnsignedByte";
-    GltfDataType[GltfDataType["SignedShort"] = 5122] = "SignedShort";
-    GltfDataType[GltfDataType["UnsignedShort"] = 5123] = "UnsignedShort";
-    GltfDataType[GltfDataType["UInt32"] = 5125] = "UInt32";
-    GltfDataType[GltfDataType["Float"] = 5126] = "Float";
-    GltfDataType[GltfDataType["Rgb"] = 6407] = "Rgb";
-    GltfDataType[GltfDataType["Rgba"] = 6408] = "Rgba";
-    GltfDataType[GltfDataType["IntVec2"] = 35667] = "IntVec2";
-    GltfDataType[GltfDataType["IntVec3"] = 35668] = "IntVec3";
-    GltfDataType[GltfDataType["FloatVec2"] = 35664] = "FloatVec2";
-    GltfDataType[GltfDataType["FloatVec3"] = 35665] = "FloatVec3";
-    GltfDataType[GltfDataType["FloatVec4"] = 35666] = "FloatVec4";
-    GltfDataType[GltfDataType["FloatMat3"] = 35675] = "FloatMat3";
-    GltfDataType[GltfDataType["FloatMat4"] = 35676] = "FloatMat4";
-    GltfDataType[GltfDataType["Sampler2d"] = 35678] = "Sampler2d";
-})(GltfDataType = exports.GltfDataType || (exports.GltfDataType = {}));
-/** @internal */
-var GltfMagFilter;
-(function (GltfMagFilter) {
-    GltfMagFilter[GltfMagFilter["Nearest"] = 9728] = "Nearest";
-    GltfMagFilter[GltfMagFilter["Linear"] = 9729] = "Linear";
-})(GltfMagFilter || (GltfMagFilter = {}));
-/** @internal */
-var GltfMinFilter;
-(function (GltfMinFilter) {
-    GltfMinFilter[GltfMinFilter["Nearest"] = 9728] = "Nearest";
-    GltfMinFilter[GltfMinFilter["Linear"] = 9729] = "Linear";
-    GltfMinFilter[GltfMinFilter["NearestMipMapNearest"] = 9984] = "NearestMipMapNearest";
-    GltfMinFilter[GltfMinFilter["LinearMipMapNearest"] = 9985] = "LinearMipMapNearest";
-    GltfMinFilter[GltfMinFilter["NearestMipMapLinear"] = 9986] = "NearestMipMapLinear";
-    GltfMinFilter[GltfMinFilter["LinearMipMapLinear"] = 9987] = "LinearMipMapLinear";
-})(GltfMinFilter || (GltfMinFilter = {}));
-/** Describes how texture coordinates outside of the range [0..1] are handled.
- * @internal
- */
-var GltfWrapMode;
-(function (GltfWrapMode) {
-    GltfWrapMode[GltfWrapMode["ClampToEdge"] = 33071] = "ClampToEdge";
-    GltfWrapMode[GltfWrapMode["MirroredRepeat"] = 33648] = "MirroredRepeat";
-    GltfWrapMode[GltfWrapMode["Repeat"] = 10497] = "Repeat";
-})(GltfWrapMode = exports.GltfWrapMode || (exports.GltfWrapMode = {}));
-/** Describes the intended target of a [[GltfBufferViewProps]]. */
-var GltfBufferTarget;
-(function (GltfBufferTarget) {
-    GltfBufferTarget[GltfBufferTarget["ArrayBuffer"] = 34962] = "ArrayBuffer";
-    GltfBufferTarget[GltfBufferTarget["ElementArrayBuffer"] = 24963] = "ElementArrayBuffer";
-})(GltfBufferTarget || (GltfBufferTarget = {}));
-function* dictionaryIterator(dict) {
-    if (Array.isArray(dict)) {
-        for (const elem of dict)
-            yield elem;
-    }
-    else {
-        for (const key of Object.keys(dict)) {
-            const value = dict[key];
-            if (undefined !== value)
-                yield value;
-        }
-    }
-}
-function getNodeMeshIds(node) {
-    if (undefined !== node.meshes)
-        return typeof node.meshes === "string" ? [node.meshes] : node.meshes;
-    else if (undefined !== node.mesh)
-        return [node.mesh];
-    return [];
-}
-/** GL states that can be enabled by a [[GltfTechnique]]. Only those queried by this implementation are enumerated. */
-var GltfTechniqueState;
-(function (GltfTechniqueState) {
-    /** Enables alpha blending. */
-    GltfTechniqueState[GltfTechniqueState["Blend"] = 3042] = "Blend";
-})(GltfTechniqueState || (GltfTechniqueState = {}));
-function isGltf1Material(material) {
-    const mat1 = material;
-    return undefined !== mat1.technique || undefined !== mat1.values;
-}
+const GltfSchema_1 = require("../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
@@ -154,15 +59,15 @@ class GltfBufferData {
         if (expectedType !== actualType) {
             // Some data is stored in smaller data types to save space if no values exceed the maximum of the smaller type.
             switch (expectedType) {
-                case GltfDataType.Float:
-                case GltfDataType.UnsignedByte:
+                case GltfSchema_1.GltfDataType.Float:
+                case GltfSchema_1.GltfDataType.UnsignedByte:
                     return undefined;
-                case GltfDataType.UnsignedShort:
-                    if (GltfDataType.UnsignedByte !== actualType)
+                case GltfSchema_1.GltfDataType.UnsignedShort:
+                    if (GltfSchema_1.GltfDataType.UnsignedByte !== actualType)
                         return undefined;
                     break;
-                case GltfDataType.UInt32:
-                    if (GltfDataType.UnsignedByte !== actualType && GltfDataType.UnsignedShort !== actualType)
+                case GltfSchema_1.GltfDataType.UInt32:
+                    if (GltfSchema_1.GltfDataType.UnsignedByte !== actualType && GltfSchema_1.GltfDataType.UnsignedShort !== actualType)
                         return undefined;
                     break;
             }
@@ -174,13 +79,13 @@ class GltfBufferData {
         // NB: Endianness of typed array data is determined by the 'platform byte order'. Actual data is always little-endian.
         // We are assuming little-endian platform. If we find a big-endian platform, we'll need to use a DataView instead.
         switch (actualType) {
-            case GltfDataType.UnsignedByte:
+            case GltfSchema_1.GltfDataType.UnsignedByte:
                 return bytes;
-            case GltfDataType.UnsignedShort:
+            case GltfSchema_1.GltfDataType.UnsignedShort:
                 return new Uint16Array(bytes.buffer, bytes.byteOffset, bytes.byteLength / 2);
-            case GltfDataType.UInt32:
+            case GltfSchema_1.GltfDataType.UInt32:
                 return new Uint32Array(bytes.buffer, bytes.byteOffset, bytes.byteLength / 4);
-            case GltfDataType.Float:
+            case GltfSchema_1.GltfDataType.Float:
                 return new Float32Array(bytes.buffer, bytes.byteOffset, bytes.byteLength / 4);
             default:
                 return undefined;
@@ -319,7 +224,7 @@ function colorFromJson(values) {
 }
 function colorFromMaterial(material, isTransparent) {
     let color = core_common_1.ColorDef.white;
-    if (isGltf1Material(material)) {
+    if ((0, GltfSchema_1.isGltf1Material)(material)) {
         if (material.values?.color && Array.isArray(material.values.color))
             color = colorFromJson(material.values.color);
     }
@@ -374,20 +279,6 @@ class TransformStack {
         this._stack.pop();
     }
 }
-function* traverseNodes(ids, nodes, traversed) {
-    for (const id of ids) {
-        if (traversed.has(id))
-            throw new Error("Cycle detected while traversing glTF nodes");
-        const node = nodes[id];
-        if (!node)
-            continue;
-        traversed.add(id);
-        yield node;
-        if (node.children)
-            for (const child of traverseNodes(node.children, nodes, traversed))
-                yield child;
-    }
-}
 function compareTextureKeys(lhs, rhs) {
     const cmp = (0, core_bentley_1.compareBooleans)(lhs.isTransparent, rhs.isTransparent);
     if (0 !== cmp)
@@ -412,7 +303,7 @@ class GltfReader {
          * (We also don't want to produce mip-maps for them, which is determined indirectly from the wrap mode).
          * Allow the default to be optionally overridden.
          */
-        this.defaultWrapMode = GltfWrapMode.Repeat;
+        this.defaultWrapMode = GltfSchema_1.GltfWrapMode.Repeat;
         this._glTF = args.props.glTF;
         this._version = args.props.version;
         this._yAxisUp = args.props.yAxisUp;
@@ -461,7 +352,7 @@ class GltfReader {
      * @throws Error if a node appears more than once during traversal
      */
     traverseNodes(nodeIds) {
-        return traverseNodes(nodeIds, this._nodes, new Set());
+        return (0, GltfSchema_1.traverseGltfNodes)(nodeIds, this._nodes, new Set());
     }
     /** Traverse the nodes specified by their scene, recursing into their child nodes.
      * @throws Error if a node appears more than once during traversal
@@ -583,7 +474,7 @@ class GltfReader {
         let thisBias;
         if (undefined !== pseudoRtcBias)
             thisBias = (undefined === thisTransform) ? pseudoRtcBias : thisTransform.matrix.multiplyInverse(pseudoRtcBias);
-        for (const meshKey of getNodeMeshIds(node)) {
+        for (const meshKey of (0, GltfSchema_1.getGltfNodeMeshIds)(node)) {
             const nodeMesh = this._meshes[meshKey];
             if (nodeMesh?.primitives) {
                 const meshes = this.readMeshPrimitives(node, featureTable, thisTransform, thisBias);
@@ -689,14 +580,14 @@ class GltfReader {
             const type = accessor.componentType;
             let dataSize = 0;
             switch (type) {
-                case GltfDataType.UnsignedByte:
+                case GltfSchema_1.GltfDataType.UnsignedByte:
                     dataSize = 1;
                     break;
-                case GltfDataType.UnsignedShort:
+                case GltfSchema_1.GltfDataType.UnsignedShort:
                     dataSize = 2;
                     break;
-                case GltfDataType.UInt32:
-                case GltfDataType.Float:
+                case GltfSchema_1.GltfDataType.UInt32:
+                case GltfSchema_1.GltfDataType.Float:
                     dataSize = 4;
                     break;
                 default:
@@ -723,10 +614,10 @@ class GltfReader {
             return undefined;
         }
     }
-    readBufferData32(json, accessorName) { return this.readBufferData(json, accessorName, GltfDataType.UInt32); }
-    readBufferData16(json, accessorName) { return this.readBufferData(json, accessorName, GltfDataType.UnsignedShort); }
-    readBufferData8(json, accessorName) { return this.readBufferData(json, accessorName, GltfDataType.UnsignedByte); }
-    readBufferDataFloat(json, accessorName) { return this.readBufferData(json, accessorName, GltfDataType.Float); }
+    readBufferData32(json, accessorName) { return this.readBufferData(json, accessorName, GltfSchema_1.GltfDataType.UInt32); }
+    readBufferData16(json, accessorName) { return this.readBufferData(json, accessorName, GltfSchema_1.GltfDataType.UnsignedShort); }
+    readBufferData8(json, accessorName) { return this.readBufferData(json, accessorName, GltfSchema_1.GltfDataType.UnsignedByte); }
+    readBufferDataFloat(json, accessorName) { return this.readBufferData(json, accessorName, GltfSchema_1.GltfDataType.Float); }
     readBufferData(json, accessorName, type) {
         const view = this.getBufferView(json, accessorName);
         return undefined !== view ? view.toBufferData(type) : undefined;
@@ -746,7 +637,7 @@ class GltfReader {
         if (typeof material !== "object")
             return undefined;
         // Bimium's shader value...almost certainly obsolete at this point.
-        if (isGltf1Material(material))
+        if ((0, GltfSchema_1.isGltf1Material)(material))
             return material.diffuse ?? this.extractId(material.values?.tex);
         // KHR_techniques_webgl extension
         const techniques = this._glTF.extensions?.KHR_techniques_webgl?.techniques;
@@ -756,7 +647,7 @@ class GltfReader {
             if (typeof uniforms === "object") {
                 for (const uniformName of Object.keys(uniforms)) {
                     const uniform = uniforms[uniformName];
-                    if (typeof uniform === "object" && uniform.type === GltfDataType.Sampler2d)
+                    if (typeof uniform === "object" && uniform.type === GltfSchema_1.GltfDataType.Sampler2d)
                         return this.extractId(ext.values[uniformName]?.index);
                 }
             }
@@ -767,15 +658,15 @@ class GltfReader {
     extractNormalMapId(material) {
         if (typeof material !== "object")
             return undefined;
-        if (isGltf1Material(material))
+        if ((0, GltfSchema_1.isGltf1Material)(material))
             return undefined;
         return this.extractId(material.normalTexture?.index);
     }
     isMaterialTransparent(material) {
-        if (isGltf1Material(material)) {
+        if ((0, GltfSchema_1.isGltf1Material)(material)) {
             if (this._glTF.techniques && undefined !== material.technique) {
                 const technique = this._glTF.techniques[material.technique];
-                if (technique?.states?.enable?.some((state) => state === GltfTechniqueState.Blend))
+                if (technique?.states?.enable?.some((state) => state === GltfSchema_1.GltfTechniqueState.Blend))
                     return true;
             }
             return false;
@@ -801,7 +692,7 @@ class GltfReader {
     }
     readMeshPrimitives(node, featureTable, thisTransform, thisBias) {
         const meshes = [];
-        for (const meshKey of getNodeMeshIds(node)) {
+        for (const meshKey of (0, GltfSchema_1.getGltfNodeMeshIds)(node)) {
             const nodeMesh = this._meshes[meshKey];
             if (nodeMesh?.primitives) {
                 for (const primitive of nodeMesh.primitives) {
@@ -829,15 +720,15 @@ class GltfReader {
         if (!displayParams)
             return undefined;
         let primitiveType = -1;
-        const meshMode = core_bentley_1.JsonUtils.asInt(primitive.mode, GltfMeshMode.Triangles);
+        const meshMode = core_bentley_1.JsonUtils.asInt(primitive.mode, GltfSchema_1.GltfMeshMode.Triangles);
         switch (meshMode) {
-            case GltfMeshMode.Lines:
+            case GltfSchema_1.GltfMeshMode.Lines:
                 primitiveType = MeshPrimitives_1.Mesh.PrimitiveType.Polyline;
                 break;
-            case GltfMeshMode.Points:
+            case GltfSchema_1.GltfMeshMode.Points:
                 primitiveType = MeshPrimitives_1.Mesh.PrimitiveType.Point;
                 break;
-            case GltfMeshMode.Triangles:
+            case GltfSchema_1.GltfMeshMode.Triangles:
                 primitiveType = MeshPrimitives_1.Mesh.PrimitiveType.Mesh;
                 break;
             default:
@@ -857,30 +748,43 @@ class GltfReader {
             quantizePositions: true,
         });
         const mesh = new GltfMeshData(meshPrimitive);
-        // We don't have real colormap - just load material color.  This will be used if non-Bentley
-        // tile or fit the color table is uniform. For a non-Bentley, non-Uniform, we'll set the
-        // uv parameters to pick the colors out of the color map texture.
-        meshPrimitive.colorMap.insert(displayParams.fillColor.tbgr); // White...
-        const colorIndices = this.readBufferData16(primitive.attributes, "_COLORINDEX");
-        if (undefined !== colorIndices && material) {
-            let texStep;
-            if (isGltf1Material(material))
-                texStep = material.values?.texStep;
-            else
-                texStep = material.extensions?.KHR_techniques_webgl?.values?.u_texStep;
-            if (texStep) {
-                const uvParams = [];
-                for (let i = 0; i < colorIndices.count; i++)
-                    uvParams.push(new core_geometry_1.Point2d(texStep[1] + texStep[0] * colorIndices.buffer[i], .5));
-                const paramList = core_common_1.QPoint2dList.fromPoints(uvParams);
-                mesh.uvs = paramList.toTypedArray();
-                mesh.uvQParams = paramList.params;
+        // ###TODO_GLTF: There can be more than one color attribute; COLOR_0 might not be the one we want.
+        if (!this.readColors(mesh, primitive.attributes, "COLOR_0")) {
+            // We don't have real colormap - just load material color.  This will be used if non-Bentley
+            // tile or fit the color table is uniform. For a non-Bentley, non-Uniform, we'll set the
+            // uv parameters to pick the colors out of the color map texture.
+            meshPrimitive.colorMap.insert(displayParams.fillColor.tbgr); // White...
+            // _COLORINDEX is an ancient holdover from glTF 1.0 and Bimium...unlikely to actually encounter it in the wild.
+            const colorIndices = this.readBufferData16(primitive.attributes, "_COLORINDEX");
+            if (undefined !== colorIndices && material) {
+                let texStep;
+                if ((0, GltfSchema_1.isGltf1Material)(material))
+                    texStep = material.values?.texStep;
+                else
+                    texStep = material.extensions?.KHR_techniques_webgl?.values?.u_texStep;
+                if (texStep) {
+                    const uvParams = [];
+                    for (let i = 0; i < colorIndices.count; i++)
+                        uvParams.push(new core_geometry_1.Point2d(texStep[1] + texStep[0] * colorIndices.buffer[i], .5));
+                    const paramList = core_common_1.QPoint2dList.fromPoints(uvParams);
+                    mesh.uvs = paramList.toTypedArray();
+                    mesh.uvQParams = paramList.params;
+                }
             }
         }
         const draco = primitive.extensions?.KHR_draco_mesh_compression;
         if (draco)
             return this.readDracoMeshPrimitive(mesh.primitive, draco) ? mesh : undefined;
         this.readBatchTable(mesh.primitive, primitive);
+        if (mesh.primitive.features) {
+            const features = this.readPrimitiveFeatures(primitive);
+            if (features) {
+                if (features instanceof core_common_1.Feature)
+                    mesh.primitive.features.add(features, 1);
+                else
+                    mesh.primitive.features.setIndices(features);
+            }
+        }
         if (!this.readVertices(mesh, primitive, pseudoRtcBias))
             return undefined;
         switch (primitiveType) {
@@ -891,7 +795,7 @@ class GltfReader {
                     return undefined;
                 if (!mesh.uvs) {
                     let texCoordIndex = 0;
-                    if (!isGltf1Material(material) && undefined !== material.pbrMetallicRoughness?.baseColorTexture?.texCoord)
+                    if (!(0, GltfSchema_1.isGltf1Material)(material) && undefined !== material.pbrMetallicRoughness?.baseColorTexture?.texCoord)
                         texCoordIndex = core_bentley_1.JsonUtils.asInt(material.pbrMetallicRoughness.baseColorTexture.texCoord);
                     this.readUVParams(mesh, primitive.attributes, `TEXCOORD_${texCoordIndex}`);
                 }
@@ -1020,8 +924,8 @@ class GltfReader {
         const view = this.getBufferView(primitive.attributes, "POSITION");
         if (undefined === view)
             return false;
-        if (GltfDataType.Float === view.type) {
-            const buffer = view.toBufferData(GltfDataType.Float);
+        if (GltfSchema_1.GltfDataType.Float === view.type) {
+            const buffer = view.toBufferData(GltfSchema_1.GltfDataType.Float);
             if (undefined === buffer)
                 return false;
             const strideSkip = view.stride - 3;
@@ -1040,17 +944,15 @@ class GltfReader {
             mesh.points = positions.toTypedArray();
         }
         else {
-            if (GltfDataType.UnsignedShort !== view.type)
+            if (GltfSchema_1.GltfDataType.UnsignedShort !== view.type)
                 return false;
-            const extensions = core_bentley_1.JsonUtils.asObject(view.accessor.extensions);
-            const quantized = undefined !== extensions ? core_bentley_1.JsonUtils.asObject(extensions.WEB3D_quantized_attributes) : undefined;
-            if (undefined === quantized)
+            const quantized = view.accessor.extensions?.WEB3D_quantized_attributes;
+            const rangeMin = quantized?.decodedMin;
+            const rangeMax = quantized?.decodedMax;
+            if (!rangeMin || !rangeMax) // required by spec...
                 return false;
-            const rangeMin = core_bentley_1.JsonUtils.asArray(quantized.decodedMin);
-            const rangeMax = core_bentley_1.JsonUtils.asArray(quantized.decodedMax);
-            if (undefined === rangeMin || undefined === rangeMax)
-                return false;
-            const buffer = view.toBufferData(GltfDataType.UnsignedShort);
+            // ###TODO apply WEB3D_quantized_attributes.decodeMatrix? Have not encountered in the wild; glTF 1.0 only.
+            const buffer = view.toBufferData(GltfSchema_1.GltfDataType.UnsignedShort);
             if (undefined === buffer || !(buffer.buffer instanceof Uint16Array))
                 return false;
             (0, core_bentley_1.assert)(buffer.buffer instanceof Uint16Array);
@@ -1086,6 +988,9 @@ class GltfReader {
     }
     readBatchTable(_mesh, _json) {
     }
+    readPrimitiveFeatures(_primitive) {
+        return undefined;
+    }
     readMeshIndices(mesh, json) {
         if (undefined !== json.indices) {
             const data = this.readBufferData16(json, "indices") || this.readBufferData32(json, "indices");
@@ -1109,8 +1014,8 @@ class GltfReader {
         if (undefined === view)
             return false;
         switch (view.type) {
-            case GltfDataType.Float: {
-                const data = view.toBufferData(GltfDataType.Float);
+            case GltfSchema_1.GltfDataType.Float: {
+                const data = view.toBufferData(GltfSchema_1.GltfDataType.Float);
                 if (undefined === data)
                     return false;
                 mesh.normals = new Uint16Array(data.count);
@@ -1122,8 +1027,8 @@ class GltfReader {
                 }
                 return true;
             }
-            case GltfDataType.UnsignedByte: {
-                const data = view.toBufferData(GltfDataType.UnsignedByte);
+            case GltfSchema_1.GltfDataType.UnsignedByte: {
+                const data = view.toBufferData(GltfSchema_1.GltfDataType.UnsignedByte);
                 if (undefined === data)
                     return false;
                 // ###TODO: we shouldn't have to allocate OctEncodedNormal objects...just use uint16s / numbers...
@@ -1140,12 +1045,33 @@ class GltfReader {
                 return false;
         }
     }
+    readColors(mesh, attribute, accessorName) {
+        const view = this.getBufferView(attribute, accessorName);
+        if (!view || (GltfSchema_1.GltfDataType.Float !== view.type && GltfSchema_1.GltfDataType.UnsignedByte !== view.type && GltfSchema_1.GltfDataType.SignedByte !== view.type))
+            return false;
+        const data = view.toBufferData(view.type);
+        if (!data)
+            return false;
+        const hasAlpha = "VEC4" === view.accessor.type;
+        const factor = view.type === GltfSchema_1.GltfDataType.Float ? 255 : 1;
+        const rgbt = new Uint8Array(4);
+        const color = new Uint32Array(rgbt.buffer);
+        for (let i = 0; i < data.count; i++) {
+            const index = view.stride * i;
+            rgbt[0] = data.buffer[index] * factor;
+            rgbt[1] = data.buffer[index + 1] * factor;
+            rgbt[2] = data.buffer[index + 2] * factor;
+            rgbt[3] = hasAlpha ? (255 - data.buffer[index + 3] * factor) : 0;
+            mesh.primitive.colors.push(mesh.primitive.colorMap.insert(color[0]));
+        }
+        return true;
+    }
     readUVParams(mesh, json, accessorName) {
         const view = this.getBufferView(json, accessorName);
         if (view === undefined)
             return false;
         switch (view.type) {
-            case GltfDataType.Float: {
+            case GltfSchema_1.GltfDataType.Float: {
                 const data = this.readBufferDataFloat(json, accessorName);
                 if (!data)
                     return false;
@@ -1163,16 +1089,13 @@ class GltfReader {
                 }
                 return true;
             }
-            case GltfDataType.UnsignedShort: {
-                const extensions = core_bentley_1.JsonUtils.asObject(view.accessor.extensions);
-                const quantized = undefined !== extensions ? core_bentley_1.JsonUtils.asObject(extensions.WEB3D_quantized_attributes) : undefined;
-                if (undefined === quantized)
-                    return false;
-                const rangeMin = core_bentley_1.JsonUtils.asArray(quantized.decodedMin);
-                const rangeMax = core_bentley_1.JsonUtils.asArray(quantized.decodedMax);
+            case GltfSchema_1.GltfDataType.UnsignedShort: {
+                const quantized = view.accessor.extensions?.WEB3D_quantized_attributes;
+                const rangeMin = quantized?.decodedMin;
+                const rangeMax = quantized?.decodedMax;
                 if (undefined === rangeMin || undefined === rangeMax)
                     return false;
-                const qData = view.toBufferData(GltfDataType.UnsignedShort);
+                const qData = view.toBufferData(GltfSchema_1.GltfDataType.UnsignedShort);
                 if (undefined === qData || !(qData.buffer instanceof Uint16Array))
                     return false;
                 mesh.uvRange = core_geometry_1.Range2d.createXYXY(rangeMin[0], rangeMin[1], rangeMax[0], rangeMax[1]);
@@ -1229,7 +1152,7 @@ class GltfReader {
         // If any meshes are draco-compressed, dynamically load the decoder module and then decode the meshes.
         const dracoMeshes = [];
         for (const node of this.traverseScene()) {
-            for (const meshId of getNodeMeshIds(node)) {
+            for (const meshId of (0, GltfSchema_1.getGltfNodeMeshIds)(node)) {
                 const mesh = this._meshes[meshId];
                 if (mesh?.primitives)
                     for (const primitive of mesh.primitives)
@@ -1253,14 +1176,14 @@ class GltfReader {
         // be required for the scene.
         const promises = [];
         try {
-            for (const buffer of dictionaryIterator(this._buffers))
+            for (const buffer of (0, GltfSchema_1.gltfDictionaryIterator)(this._buffers))
                 if (!buffer.resolvedBuffer)
                     promises.push(this.resolveBuffer(buffer));
             await Promise.all(promises);
             if (this._isCanceled)
                 return;
             promises.length = 0;
-            for (const image of dictionaryIterator(this._images))
+            for (const image of (0, GltfSchema_1.gltfDictionaryIterator)(this._images))
                 if (!image.resolvedImage)
                     promises.push(this.resolveImage(image));
             await Promise.all(promises);
@@ -1283,7 +1206,9 @@ class GltfReader {
     }
     resolveUrl(uri) {
         try {
-            return new URL(uri, this._baseUrl).toString();
+            const resolved = new URL(uri, this._baseUrl);
+            resolved.search = this._baseUrl?.search ?? "";
+            return resolved.toString();
         }
         catch (_) {
             return undefined;
@@ -1344,7 +1269,7 @@ class GltfReader {
         let wrapT = sampler?.wrapT;
         if (undefined === wrapS && undefined === wrapT)
             wrapS = wrapT = this.defaultWrapMode;
-        if (GltfWrapMode.ClampToEdge === wrapS || GltfWrapMode.ClampToEdge === wrapT)
+        if (GltfSchema_1.GltfWrapMode.ClampToEdge === wrapS || GltfSchema_1.GltfWrapMode.ClampToEdge === wrapT)
             return core_common_1.RenderTexture.Type.TileSection;
         return core_common_1.RenderTexture.Type.Normal;
     }
@@ -1413,7 +1338,8 @@ exports.GltfReader = GltfReader;
  * @public
  */
 async function readGltfGraphics(args) {
-    const props = GltfReaderProps.create(args.gltf, true, args.baseUrl); // glTF supports exactly one coordinate system with y axis up.
+    const baseUrl = typeof args.baseUrl === "string" ? new URL(args.baseUrl) : args.baseUrl;
+    const props = GltfReaderProps.create(args.gltf, true, baseUrl); // glTF supports exactly one coordinate system with y axis up.
     const reader = props ? new GltfGraphicsReader(props, args) : undefined;
     if (!reader)
         return undefined;