@itwin/core-frontend 3.0.0-dev.167 → 3.0.0-dev.172

package/lib/cjs/tile/GltfReader.js

@@ -7,7 +7,7 @@
  * @module Tiles
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readGltfGraphics = exports.GltfReader = exports.GltfMeshData = exports.GltfReaderProps = exports.GltfBufferData = exports.GltfDataType = void 0;
+exports.GltfGraphicsReader = exports.readGltfGraphics = exports.GltfReader = exports.GltfMeshData = exports.GltfReaderProps = exports.GltfBufferData = exports.GltfDataType = 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");
@@ -82,6 +82,19 @@ var 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;
@@ -173,50 +186,80 @@ class GltfBufferView {
  * @internal
  */
 class GltfReaderProps {
-    constructor(binaryData, glTF, yAxisUp) {
-        this.binaryData = binaryData;
+    constructor(glTF, version, yAxisUp, binaryData, baseUrl) {
+        this.version = version;
         this.glTF = glTF;
+        this.binaryData = binaryData;
         this.yAxisUp = yAxisUp;
+        this.baseUrl = baseUrl;
     }
     /** Attempt to construct a new GltfReaderProps from the binary data beginning at the supplied stream's current read position. */
-    static create(buffer, yAxisUp = false) {
-        const header = new core_common_1.GltfHeader(buffer);
-        if (!header.isValid)
-            return undefined;
-        const binaryData = new Uint8Array(buffer.arrayBuffer, header.binaryPosition);
-        buffer.curPos = header.scenePosition;
-        const jsonStrData = buffer.nextBytes(header.sceneStrLength);
-        const jsonStr = (0, core_bentley_1.utf8ToString)(jsonStrData);
-        if (undefined === jsonStr)
-            return undefined;
-        try {
-            const json = JSON.parse(jsonStr);
-            const asset = core_bentley_1.JsonUtils.asObject(json.asset);
-            if (header.version === 2 && !asset)
-                return undefined; // asset is required in glTF 2.0
-            const glTF = {
-                asset,
-                scene: core_bentley_1.JsonUtils.asString(json.scene),
-                extensions: core_bentley_1.JsonUtils.asObject(json.extensions),
-                extensionsUsed: core_bentley_1.JsonUtils.asArray(json.extensionsUsed),
-                extensionsRequired: core_bentley_1.JsonUtils.asArray(json.extensionsRequired),
-                accessors: core_bentley_1.JsonUtils.asObject(json.accessors),
-                buffers: core_bentley_1.JsonUtils.asObject(json.buffers),
-                bufferViews: core_bentley_1.JsonUtils.asObject(json.bufferViews),
-                images: core_bentley_1.JsonUtils.asObject(json.images),
-                materials: core_bentley_1.JsonUtils.asObject(json.materials),
-                meshes: core_bentley_1.JsonUtils.asObject(json.meshes),
-                nodes: core_bentley_1.JsonUtils.asObject(json.nodes),
-                samplers: core_bentley_1.JsonUtils.asObject(json.samplers),
-                scenes: core_bentley_1.JsonUtils.asObject(json.scenes),
-                textures: core_bentley_1.JsonUtils.asObject(json.textures),
-                techniques: core_bentley_1.JsonUtils.asObject(json.techniques),
-            };
-            return glTF.meshes ? new GltfReaderProps(binaryData, glTF, yAxisUp) : undefined;
+    static create(source, yAxisUp = false, baseUrl) {
+        let version;
+        let json;
+        let binaryData;
+        if (source instanceof Uint8Array) {
+            // It may be JSON - check for magic indicating glb.
+            const buffer = core_bentley_1.ByteStream.fromUint8Array(source);
+            if (core_common_1.TileFormat.Gltf !== buffer.nextUint32) {
+                try {
+                    const utf8Json = (0, core_bentley_1.utf8ToString)(source);
+                    if (!utf8Json)
+                        return undefined;
+                    json = JSON.parse(utf8Json);
+                    version = 2;
+                }
+                catch (_) {
+                    return undefined;
+                }
+            }
+            else {
+                buffer.reset();
+                const header = new core_common_1.GlbHeader(buffer);
+                if (!header.isValid)
+                    return undefined;
+                version = header.version;
+                if (header.binaryChunk)
+                    binaryData = new Uint8Array(source.buffer, source.byteOffset + header.binaryChunk.offset, header.binaryChunk.length);
+                try {
+                    const jsonBytes = new Uint8Array(source.buffer, source.byteOffset + header.jsonChunk.offset, header.jsonChunk.length);
+                    const jsonStr = (0, core_bentley_1.utf8ToString)(jsonBytes);
+                    if (undefined === jsonStr)
+                        return undefined;
+                    json = JSON.parse(jsonStr);
+                }
+                catch (_) {
+                    return undefined;
+                }
+            }
         }
-        catch (e) {
-            return undefined;
+        else {
+            version = 2; // ###TODO verify against source.asset?.version
+            json = source;
         }
+        // asset is required in glTF 2, optional in glTF 1
+        const asset = core_bentley_1.JsonUtils.asObject(json.asset);
+        if (version === 2 && !asset)
+            return undefined;
+        const glTF = {
+            asset,
+            scene: core_bentley_1.JsonUtils.asString(json.scene),
+            extensions: core_bentley_1.JsonUtils.asObject(json.extensions),
+            extensionsUsed: core_bentley_1.JsonUtils.asArray(json.extensionsUsed),
+            extensionsRequired: core_bentley_1.JsonUtils.asArray(json.extensionsRequired),
+            accessors: core_bentley_1.JsonUtils.asObject(json.accessors),
+            buffers: core_bentley_1.JsonUtils.asObject(json.buffers),
+            bufferViews: core_bentley_1.JsonUtils.asObject(json.bufferViews),
+            images: core_bentley_1.JsonUtils.asObject(json.images),
+            materials: core_bentley_1.JsonUtils.asObject(json.materials),
+            meshes: core_bentley_1.JsonUtils.asObject(json.meshes),
+            nodes: core_bentley_1.JsonUtils.asObject(json.nodes),
+            samplers: core_bentley_1.JsonUtils.asObject(json.samplers),
+            scenes: core_bentley_1.JsonUtils.asObject(json.scenes),
+            textures: core_bentley_1.JsonUtils.asObject(json.textures),
+            techniques: core_bentley_1.JsonUtils.asObject(json.techniques),
+        };
+        return glTF.meshes ? new GltfReaderProps(glTF, version, yAxisUp, binaryData, baseUrl) : undefined;
     }
 }
 exports.GltfReaderProps = GltfReaderProps;
@@ -300,15 +343,30 @@ 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;
+    }
+}
 /** Deserializes [glTF](https://www.khronos.org/gltf/).
  * @internal
  */
 class GltfReader {
     constructor(args) {
         var _a, _b, _c, _d, _e, _f, _g;
-        this._binaryData = args.props.binaryData;
         this._glTF = args.props.glTF;
+        this._version = args.props.version;
         this._yAxisUp = args.props.yAxisUp;
+        this._baseUrl = args.props.baseUrl;
         const rtcCenter = (_b = (_a = args.props.glTF.extensions) === null || _a === void 0 ? void 0 : _a.CESIUM_RTC) === null || _b === void 0 ? void 0 : _b.center;
         if (rtcCenter && 3 === rtcCenter.length)
             if (0 !== rtcCenter[0] || 0 !== rtcCenter[1] || 0 !== rtcCenter[2])
@@ -320,6 +378,12 @@ class GltfReader {
         this._canceled = args.shouldAbort;
         this._deduplicateVertices = (_e = args.deduplicateVertices) !== null && _e !== void 0 ? _e : false;
         this._vertexTableRequired = (_f = args.vertexTableRequired) !== null && _f !== void 0 ? _f : false;
+        const binaryData = args.props.binaryData;
+        if (binaryData) {
+            const buffer = this._buffers[this._version === 2 ? 0 : "binary_glTF"];
+            if (buffer && undefined === buffer.uri)
+                buffer.resolvedBuffer = binaryData;
+        }
         // The original implementation of GltfReader would process and produce graphics for every node in glTF.nodes.
         // What it's *supposed* to do is process the nodes in glTF.scenes[glTF.scene].nodes
         // Some nodes may not be referenced by the configured scene, or only indirectly via GltfNode.children.
@@ -335,9 +399,26 @@ class GltfReader {
     get _meshes() { var _a; return (_a = this._glTF.meshes) !== null && _a !== void 0 ? _a : emptyDict; }
     get _accessors() { var _a; return (_a = this._glTF.accessors) !== null && _a !== void 0 ? _a : emptyDict; }
     get _bufferViews() { var _a; return (_a = this._glTF.bufferViews) !== null && _a !== void 0 ? _a : emptyDict; }
-    get _materialValues() { var _a; return (_a = this._glTF.materials) !== null && _a !== void 0 ? _a : emptyDict; }
+    get _materials() { var _a; return (_a = this._glTF.materials) !== null && _a !== void 0 ? _a : emptyDict; }
+    get _samplers() { var _a; return (_a = this._glTF.samplers) !== null && _a !== void 0 ? _a : emptyDict; }
+    get _textures() { var _a; return (_a = this._glTF.textures) !== null && _a !== void 0 ? _a : emptyDict; }
+    get _images() { var _a; return (_a = this._glTF.images) !== null && _a !== void 0 ? _a : emptyDict; }
+    get _buffers() { var _a; return (_a = this._glTF.buffers) !== null && _a !== void 0 ? _a : emptyDict; }
     get _isCanceled() { return undefined !== this._canceled && this._canceled(this); }
     get _isVolumeClassifier() { return core_common_1.BatchType.VolumeClassifier === this._type; }
+    /** Traverse the nodes specified by their Ids, recursing into their child nodes.
+     * @param nodeIds The Ids of the nodes to traverse.
+     * @throws Error if a node appears more than once during traversal
+     */
+    traverseNodes(nodeIds) {
+        return traverseNodes(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
+     */
+    traverseScene() {
+        return this.traverseNodes(this._sceneNodes);
+    }
     readGltfAndCreateGraphics(isLeaf, featureTable, contentRange, transformToRoot, pseudoRtcBias, instances) {
         var _a;
         if (this._isCanceled)
@@ -492,10 +573,16 @@ class GltfReader {
     getBufferView(json, accessorName) {
         try {
             const accessorValue = core_bentley_1.JsonUtils.asString(json[accessorName]);
-            const accessor = 0 < accessorValue.length ? core_bentley_1.JsonUtils.asObject(this._accessors[accessorValue]) : undefined;
-            const bufferViewAccessorValue = undefined !== accessor ? core_bentley_1.JsonUtils.asString(accessor.bufferView) : "";
-            const bufferView = 0 < bufferViewAccessorValue.length ? core_bentley_1.JsonUtils.asObject(this._bufferViews[bufferViewAccessorValue]) : undefined;
-            if (undefined === accessor)
+            const accessor = accessorValue ? this._accessors[accessorValue] : undefined;
+            if (!accessor)
+                return undefined;
+            const bufferViewAccessorValue = accessor.bufferView;
+            const bufferView = undefined !== bufferViewAccessorValue ? this._bufferViews[bufferViewAccessorValue] : undefined;
+            if (!bufferView || undefined === bufferView.buffer)
+                return undefined;
+            const buffer = this._buffers[bufferView.buffer];
+            const bufferData = buffer === null || buffer === void 0 ? void 0 : buffer.resolvedBuffer;
+            if (!bufferData)
                 return undefined;
             const type = accessor.componentType;
             let dataSize = 0;
@@ -526,8 +613,8 @@ class GltfReader {
             const offset = ((bufferView && bufferView.byteOffset) ? bufferView.byteOffset : 0) + (accessor.byteOffset ? accessor.byteOffset : 0);
             const length = byteStride * accessor.count;
             // If the data is misaligned (Scalable mesh tile publisher) use slice to copy -- else use subarray.
-            // assert(0 === offset % dataSize);
-            const bytes = (0 === (this._binaryData.byteOffset + offset) % dataSize) ? this._binaryData.subarray(offset, offset + length) : this._binaryData.slice(offset, offset + length);
+            const aligned = 0 === (bufferData.byteOffset + offset) % dataSize;
+            const bytes = aligned ? bufferData.subarray(offset, offset + length) : bufferData.slice(offset, offset + length);
             return new GltfBufferView(bytes, accessor.count, type, accessor, byteStride / dataSize);
         }
         catch (e) {
@@ -586,8 +673,8 @@ class GltfReader {
         var _a, _b, _c, _d, _e, _f;
         const materialName = core_bentley_1.JsonUtils.asString(primitive.material);
         const hasBakedLighting = undefined === primitive.attributes.NORMAL;
-        const material = 0 < materialName.length ? this._materialValues[materialName] : undefined;
-        const displayParams = this.createDisplayParams(material, hasBakedLighting);
+        const material = 0 < materialName.length ? this._materials[materialName] : undefined;
+        const displayParams = material ? this.createDisplayParams(material, hasBakedLighting) : undefined;
         if (undefined === displayParams)
             return undefined;
         let primitiveType = -1;
@@ -606,7 +693,6 @@ class GltfReader {
                 (0, core_bentley_1.assert)(false);
                 return undefined;
         }
-        const isPlanar = core_bentley_1.JsonUtils.asBool(primitive.isPlanar);
         const isVolumeClassifier = this._isVolumeClassifier;
         const meshPrimitive = MeshPrimitives_1.Mesh.create({
             displayParams,
@@ -614,7 +700,7 @@ class GltfReader {
             type: primitiveType,
             range: core_geometry_1.Range3d.createNull(),
             is2d: !this._is3d,
-            isPlanar,
+            isPlanar: false,
             hasBakedLighting,
             isVolumeClassifier,
         });
@@ -840,12 +926,13 @@ class GltfReader {
     }
     readUVParams(mesh, json, accessorName) {
         const view = this.getBufferView(json, accessorName);
-        let data;
         if (view === undefined)
             return false;
         switch (view.type) {
             case GltfDataType.Float: {
-                data = this.readBufferDataFloat(json, accessorName);
+                const data = this.readBufferDataFloat(json, accessorName);
+                if (!data)
+                    return false;
                 mesh.uvRange = core_geometry_1.Range2d.createNull();
                 for (let i = 0; i < data.count; i++) {
                     const index = view.stride * i; // 2 float per param...
@@ -920,14 +1007,91 @@ class GltfReader {
             polylines.push(new core_common_1.MeshPolyline(indices));
         return true;
     }
-    async loadTextures() {
+    async resolveResources() {
+        // ###TODO traverse the scene nodes to find resources referenced by them, instead of resolving everything - some resources may not
+        // be required for the scene.
+        const promises = [];
+        try {
+            for (const buffer of dictionaryIterator(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))
+                if (!image.resolvedImage)
+                    promises.push(this.resolveImage(image));
+            await Promise.all(promises);
+            if (this._isCanceled)
+                return;
+            this.resolveTextures();
+        }
+        catch (_) {
+        }
+    }
+    resolveUrl(uri) {
+        try {
+            return new URL(uri, this._baseUrl).toString();
+        }
+        catch (_) {
+            return undefined;
+        }
+    }
+    async resolveBuffer(buffer) {
+        if (buffer.resolvedBuffer || undefined === buffer.uri)
+            return;
+        try {
+            const url = this.resolveUrl(buffer.uri);
+            const response = url ? await fetch(url) : undefined;
+            if (this._isCanceled)
+                return;
+            const data = await (response === null || response === void 0 ? void 0 : response.arrayBuffer());
+            if (this._isCanceled)
+                return;
+            if (data)
+                buffer.resolvedBuffer = new Uint8Array(data);
+        }
+        catch (_) {
+            //
+        }
+    }
+    async resolveImage(image) {
+        var _a, _b, _c;
+        if (image.resolvedImage)
+            return;
+        const bvSrc = undefined !== image.bufferView ? image : (_a = image.extensions) === null || _a === void 0 ? void 0 : _a.KHR_binary_glTF;
+        if (undefined !== (bvSrc === null || bvSrc === void 0 ? void 0 : bvSrc.bufferView)) {
+            const format = undefined !== bvSrc.mimeType ? (0, ImageUtil_1.getImageSourceFormatForMimeType)(bvSrc.mimeType) : undefined;
+            const bufferView = this._bufferViews[bvSrc.bufferView];
+            if (undefined === format || !bufferView || !bufferView.byteLength || bufferView.byteLength < 0)
+                return;
+            const bufferData = (_b = this._buffers[bufferView.buffer]) === null || _b === void 0 ? void 0 : _b.resolvedBuffer;
+            if (!bufferData)
+                return;
+            const offset = (_c = bufferView.byteOffset) !== null && _c !== void 0 ? _c : 0;
+            const bytes = bufferData.subarray(offset, offset + bufferView.byteLength);
+            try {
+                image.resolvedImage = await (0, ImageUtil_1.imageElementFromImageSource)(new core_common_1.ImageSource(bytes, format));
+            }
+            catch (_) {
+                //
+            }
+            return;
+        }
+        const url = undefined !== image.uri ? this.resolveUrl(image.uri) : undefined;
+        if (undefined !== url)
+            image.resolvedImage = await (0, ImageUtil_1.tryImageElementFromUrl)(url);
+    }
+    resolveTextures() {
         var _a, _b;
         if (undefined === this._glTF.textures)
             return;
+        // ###TODO this seems pretty hacky, and won't work for glTF 2.0 even if the KHR_techniques_webgl extension is used...
         const transparentTextures = new Set();
         if (this._glTF.techniques) {
-            for (const name of Object.keys(this._materialValues)) {
-                const material = this._materialValues[name];
+            for (const name of Object.keys(this._materials)) {
+                const material = this._materials[name];
                 if (material && isGltf1Material(material) && undefined !== material.technique && undefined !== ((_a = material.values) === null || _a === void 0 ? void 0 : _a.tex)) {
                     const technique = this._glTF.techniques[material.technique];
                     if ((_b = technique === null || technique === void 0 ? void 0 : technique.states) === null || _b === void 0 ? void 0 : _b.enable) {
@@ -941,74 +1105,42 @@ class GltfReader {
                 }
             }
         }
-        const promises = new Array();
-        for (const name of Object.keys(this._glTF.textures))
-            promises.push(this.loadTexture(name, transparentTextures.has(name)));
-        if (promises.length > 0)
-            await Promise.all(promises);
-    }
-    async loadTextureImage(imageJson, samplerJson, isTransparent) {
-        var _a;
-        try {
-            const binaryImageJson = (imageJson.extensions && imageJson.extensions.KHR_binary_glTF) ? core_bentley_1.JsonUtils.asObject(imageJson.extensions.KHR_binary_glTF) : imageJson;
-            const bufferView = this._bufferViews[binaryImageJson.bufferView];
-            if (!bufferView || undefined === bufferView.byteLength || bufferView.byteLength <= 0)
-                return undefined;
-            const mimeType = core_bentley_1.JsonUtils.asString(binaryImageJson.mimeType);
-            const format = (0, ImageUtil_1.getImageSourceFormatForMimeType)(mimeType);
-            if (undefined === format)
-                return undefined;
-            let textureType = core_common_1.RenderTexture.Type.Normal;
-            if (undefined !== samplerJson &&
-                (undefined !== samplerJson.wrapS || undefined !== samplerJson.wrapT))
-                textureType = core_common_1.RenderTexture.Type.TileSection;
-            const offset = (_a = bufferView.byteOffset) !== null && _a !== void 0 ? _a : 0;
-            /* -----------------------------------
-                const jpegArray = this._binaryData.slice(offset, offset + bufferView.byteLength);
-                const jpegArrayBuffer = jpegArray.buffer;
-                const workerOp = new ImageDecodeWorkerOperation(jpegArrayBuffer, mimeType);
-                try {
-                  const imageBitmap = await GltfReader.webWorkerManager.queueOperation(workerOp)
-                  return this._isCanceled ? undefined : this._system.createTextureFromImage(imageBitmap, isTransparent && ImageSourceFormat.Png === format, this._iModel, textureParams))
-                } catch {
-                  return undefined;
+        for (const node of this.traverseScene()) {
+            for (const meshId of getNodeMeshIds(node)) {
+                const mesh = this._meshes[meshId];
+                if (!(mesh === null || mesh === void 0 ? void 0 : mesh.primitives))
+                    continue;
+                for (const primitive of mesh.primitives) {
+                    const material = undefined !== primitive.material ? this._materials[primitive.material] : undefined;
+                    const textureId = material ? this.extractTextureId(material) : undefined;
+                    if (undefined !== textureId)
+                        this.resolveTexture(textureId, transparentTextures.has(textureId));
                 }
-              ------------------------------------- */
-            const bytes = this._binaryData.subarray(offset, offset + bufferView.byteLength);
-            const imageSource = new core_common_1.ImageSource(bytes, format);
-            try {
-                const image = await (0, ImageUtil_1.imageElementFromImageSource)(imageSource);
-                if (this._isCanceled)
-                    return undefined;
-                return this._system.createTexture({
-                    type: textureType,
-                    image: {
-                        source: image,
-                        transparency: isTransparent && core_common_1.ImageSourceFormat.Png === format ? RenderTexture_1.TextureTransparency.Translucent : RenderTexture_1.TextureTransparency.Opaque,
-                    },
-                });
-            }
-            catch {
-                return undefined;
             }
         }
-        catch (e) {
-            return undefined;
-        }
     }
-    async loadTexture(textureId, isTransparent) {
-        if (!this._glTF.textures || !this._glTF.images)
+    resolveTexture(textureId, isTransparent) {
+        var _a;
+        const texture = this._textures[textureId];
+        if (!texture || texture.resolvedTexture || undefined === texture.source)
             return;
-        const textureJson = core_bentley_1.JsonUtils.asObject(this._glTF.textures[textureId]);
-        if (undefined === textureJson)
+        const image = (_a = this._images[texture.source]) === null || _a === void 0 ? void 0 : _a.resolvedImage;
+        if (!image)
             return;
-        const texture = await this.loadTextureImage(this._glTF.images[textureJson.source], this._glTF.samplers ? this._glTF.samplers[textureJson.sampler] : undefined, isTransparent);
-        textureJson.renderTexture = texture;
+        const samplerId = texture.sampler;
+        const sampler = undefined !== samplerId ? this._samplers[samplerId] : undefined;
+        const textureType = undefined !== (sampler === null || sampler === void 0 ? void 0 : sampler.wrapS) || undefined !== (sampler === null || sampler === void 0 ? void 0 : sampler.wrapT) ? core_common_1.RenderTexture.Type.TileSection : core_common_1.RenderTexture.Type.Normal;
+        texture.resolvedTexture = this._system.createTexture({
+            type: textureType,
+            image: {
+                source: image,
+                transparency: isTransparent ? RenderTexture_1.TextureTransparency.Translucent : RenderTexture_1.TextureTransparency.Opaque,
+            },
+        });
     }
     findTextureMapping(textureId) {
-        const textureJson = this._glTF.textures ? core_bentley_1.JsonUtils.asObject(this._glTF.textures[textureId]) : undefined;
-        const texture = undefined !== textureJson ? textureJson.renderTexture : undefined;
-        return undefined !== texture ? new core_common_1.TextureMapping(texture, new core_common_1.TextureMapping.Params()) : undefined;
+        const texture = this._textures[textureId];
+        return (texture === null || texture === void 0 ? void 0 : texture.resolvedTexture) ? new core_common_1.TextureMapping(texture.resolvedTexture, new core_common_1.TextureMapping.Params()) : undefined;
     }
 }
 exports.GltfReader = GltfReader;
@@ -1021,17 +1153,18 @@ exports.GltfReader = GltfReader;
  * @public
  */
 async function readGltfGraphics(args) {
-    const stream = new core_bentley_1.ByteStream(args.gltf.buffer);
-    const props = GltfReaderProps.create(stream, true); // glTF supports exactly one coordinate system with y axis up.
-    const reader = props ? new Reader(props, args) : undefined;
+    const props = GltfReaderProps.create(args.gltf, true, args.baseUrl); // glTF supports exactly one coordinate system with y axis up.
+    const reader = props ? new GltfGraphicsReader(props, args) : undefined;
     if (!reader)
         return undefined;
     const result = await reader.read();
     return result.graphic;
 }
 exports.readGltfGraphics = readGltfGraphics;
-/** Implements [[readGltfGraphics]]. */
-class Reader extends GltfReader {
+/** Implements [[readGltfGraphics]]. Exported strictly for tests.
+ * @internal
+ */
+class GltfGraphicsReader extends GltfReader {
     constructor(props, args) {
         var _a, _b, _c;
         super({
@@ -1039,6 +1172,7 @@ class Reader extends GltfReader {
             iModel: args.iModel,
             vertexTableRequired: true,
         });
+        this.binaryData = props.binaryData;
         const pickableId = (_a = args.pickableOptions) === null || _a === void 0 ? void 0 : _a.id;
         if (pickableId) {
             this._featureTable = new core_common_1.FeatureTable(1, (_c = (_b = args.pickableOptions) === null || _b === void 0 ? void 0 : _b.modelId) !== null && _c !== void 0 ? _c : pickableId, core_common_1.BatchType.Primary);
@@ -1046,8 +1180,13 @@ class Reader extends GltfReader {
         }
     }
     async read() {
-        await this.loadTextures();
+        await this.resolveResources();
         return this.readGltfAndCreateGraphics(true, this._featureTable, undefined);
     }
+    get nodes() { return this._nodes; }
+    get scenes() { var _a; return (_a = this._glTF.scenes) !== null && _a !== void 0 ? _a : emptyDict; }
+    get sceneNodes() { return this._sceneNodes; }
+    get textures() { return this._textures; }
 }
+exports.GltfGraphicsReader = GltfGraphicsReader;
 //# sourceMappingURL=GltfReader.js.map