@itwin/core-frontend 4.10.0-dev.2 → 4.10.0-dev.22

package/lib/cjs/tile/GltfReader.js

@@ -30,12 +30,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GltfGraphicsReader = exports.readGltf = exports.readGltfGraphics = exports.GltfReader = exports.GltfMeshData = exports.GltfReaderProps = exports.GltfBufferData = void 0;
+exports.GltfGraphicsReader = exports.readGltf = exports.readGltfTemplate = 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");
 const IModelApp_1 = require("../IModelApp");
-const GraphicBranch_1 = require("../render/GraphicBranch");
 const RealityMeshParams_1 = require("../render/RealityMeshParams");
 const MeshPrimitives_1 = require("../common/internal/render/MeshPrimitives");
 const Primitives_1 = require("../common/internal/render/Primitives");
@@ -45,6 +44,7 @@ const FrontendLoggerCategory_1 = require("../common/FrontendLoggerCategory");
 const ImageUtil_1 = require("../common/ImageUtil");
 const MeshPrimitive_1 = require("../common/internal/render/MeshPrimitive");
 const GltfSchema_1 = require("../common/gltf/GltfSchema");
+const GraphicTemplate_1 = require("../render/GraphicTemplate");
 /**
  * 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
@@ -121,6 +121,14 @@ class GltfBufferView {
         return GltfBufferData.create(this.data, this.type, desiredType, this.count);
     }
 }
+function templateToGraphicResult(result, system) {
+    const template = result.template;
+    delete result.template;
+    return {
+        ...result,
+        graphic: template ? system.createGraphicFromTemplate({ template }) : undefined,
+    };
+}
 /** Data required for creating a [[GltfReader]] capable of deserializing [glTF](https://www.khronos.org/gltf/).
  * @internal
  */
@@ -342,6 +350,10 @@ class GltfReader {
         return transform;
     }
     readGltfAndCreateGraphics(isLeaf, featureTable, contentRange, transformToRoot, pseudoRtcBias, instances) {
+        const result = this.readGltfAndCreateTemplate(isLeaf, featureTable, contentRange, true, transformToRoot, pseudoRtcBias, instances);
+        return templateToGraphicResult(result, this._system);
+    }
+    readGltfAndCreateTemplate(isLeaf, featureTable, contentRange, noDispose, transformToRoot, pseudoRtcBias, instances) {
         if (this._isCanceled)
             return { readStatus: core_common_1.TileReadStatus.Canceled, isLeaf };
         // If contentRange was not supplied, we will compute it as we read the meshes.
@@ -359,12 +371,12 @@ class GltfReader {
         if (this._returnToCenter || this._nodes[0]?.matrix || (pseudoRtcBias && pseudoRtcBias.magnitude() < 1.0E5))
             pseudoRtcBias = undefined;
         const transformStack = new TransformStack();
-        const renderGraphicList = [];
+        const templateNodes = [];
         let readStatus = core_common_1.TileReadStatus.InvalidTileData;
         for (const nodeKey of this._sceneNodes) {
             (0, core_bentley_1.assert)(transformStack.isEmpty);
             const node = this._nodes[nodeKey];
-            if (node && core_common_1.TileReadStatus.Success !== (readStatus = this.readNodeAndCreateGraphics(renderGraphicList, node, featureTable, transformStack, instances, pseudoRtcBias)))
+            if (node && core_common_1.TileReadStatus.Success !== (readStatus = this.readTemplateNodes(templateNodes, node, featureTable, transformStack, instances, pseudoRtcBias)))
                 return { readStatus, isLeaf };
         }
         // Creates a feature table based on instance features
@@ -375,39 +387,35 @@ class GltfReader {
                 featureTable.insertWithIndex(this._instanceFeatures[instanceFeatureId], instanceFeatureId);
             }
         }
-        if (0 === renderGraphicList.length)
+        if (0 === templateNodes.length)
             return { readStatus: core_common_1.TileReadStatus.InvalidTileData, isLeaf };
-        let renderGraphic;
-        if (1 === renderGraphicList.length)
-            renderGraphic = renderGraphicList[0];
-        else
-            renderGraphic = this._system.createGraphicList(renderGraphicList);
-        const transform = this.getTileTransform(transformToRoot, pseudoRtcBias);
         // Compute range in tileset/world space.
         let range = contentRange;
+        const transform = this.getTileTransform(transformToRoot, pseudoRtcBias);
         const invTransform = transform?.inverse();
         if (invTransform)
             range = invTransform.multiplyRange(contentRange);
         // The batch range needs to be in tile coordinate space.
         // If we computed the content range ourselves, it's already in tile space.
         // If the content range was supplied by the caller, it's in tileset space and needs to be transformed to tile space.
-        if (featureTable)
-            renderGraphic = this._system.createBatch(renderGraphic, core_common_1.PackedFeatureTable.pack(featureTable), this._computedContentRange ? contentRange : range);
+        const batch = !featureTable ? undefined : {
+            featureTable: core_common_1.PackedFeatureTable.pack(featureTable),
+            range: this._computedContentRange ? contentRange : range,
+        };
         const viewFlagOverrides = this.viewFlagOverrides;
-        if (transform || viewFlagOverrides) {
-            const branch = new GraphicBranch_1.GraphicBranch(true);
-            if (viewFlagOverrides)
-                branch.setViewFlagOverrides(viewFlagOverrides);
-            branch.add(renderGraphic);
-            renderGraphic = this._system.createBranch(branch, transform ?? core_geometry_1.Transform.createIdentity());
-        }
+        const branch = transform || viewFlagOverrides ? { transform, viewFlagOverrides } : undefined;
         return {
             readStatus,
             isLeaf,
             contentRange,
             range,
-            graphic: renderGraphic,
             containsPointCloud: this._containsPointCloud,
+            template: (0, GraphicTemplate_1.createGraphicTemplate)({
+                nodes: templateNodes,
+                batch,
+                branch,
+                noDispose,
+            }),
         };
     }
     readGltfAndCreateGeometry(transformToRoot, needNormals = false, needParams = false) {
@@ -420,14 +428,14 @@ class GltfReader {
         }
         return { polyfaces };
     }
-    graphicFromMeshData(gltfMesh, instances) {
+    geometryFromMeshData(gltfMesh, isInstanced) {
         if ("pointcloud" === gltfMesh.type)
-            return this._system.createPointCloud(gltfMesh, this._iModel);
+            return this._system.createPointCloudGeometry(gltfMesh);
         if (!gltfMesh.points || !gltfMesh.pointRange)
-            return this._system.createMeshGraphics(gltfMesh.primitive, instances);
-        const realityMeshPrimitive = (this._vertexTableRequired || instances) ? undefined : RealityMeshParams_1.RealityMeshParams.fromGltfMesh(gltfMesh);
+            return this._system.createGeometryFromMesh(gltfMesh.primitive, undefined);
+        const realityMeshPrimitive = (this._vertexTableRequired || isInstanced) ? undefined : RealityMeshParams_1.RealityMeshParams.fromGltfMesh(gltfMesh);
         if (realityMeshPrimitive) {
-            const realityMesh = this._system.createRealityMesh(realityMeshPrimitive);
+            const realityMesh = this._system.createRealityMeshGeometry(realityMeshPrimitive);
             if (realityMesh)
                 return realityMesh;
         }
@@ -445,7 +453,7 @@ class GltfReader {
         if (gltfMesh.normals)
             for (const normal of gltfMesh.normals)
                 mesh.normals.push(new core_common_1.OctEncodedNormal(normal));
-        return this._system.createMeshGraphics(mesh, instances);
+        return this._system.createGeometryFromMesh(mesh, undefined);
     }
     readInstanceAttributes(node, featureTable) {
         const ext = node.extensions?.EXT_mesh_gpu_instancing;
@@ -568,7 +576,7 @@ class GltfReader {
         }
         return { count, transforms, transformCenter, featureIds };
     }
-    readNodeAndCreateGraphics(renderGraphicList, node, featureTable, transformStack, batchInstances, pseudoRtcBias) {
+    readTemplateNodes(templateNodes, node, featureTable, transformStack, batchInstances, pseudoRtcBias) {
         if (undefined === node)
             return core_common_1.TileReadStatus.InvalidTileData;
         // IMPORTANT: Do not return without popping this node from the stack.
@@ -590,28 +598,19 @@ class GltfReader {
             const nodeMesh = this._meshes[meshKey];
             if (nodeMesh?.primitives) {
                 const meshes = this.readMeshPrimitives(node, featureTable, thisTransform, thisBias, nodeInstances);
-                let renderGraphic;
                 if (0 !== meshes.length) {
-                    if (1 === meshes.length) {
-                        renderGraphic = this.graphicFromMeshData(meshes[0], batchInstances ?? nodeInstances);
-                    }
-                    else {
-                        const thisList = [];
-                        for (const mesh of meshes) {
-                            renderGraphic = this.graphicFromMeshData(mesh, batchInstances ?? nodeInstances);
-                            if (undefined !== renderGraphic)
-                                thisList.push(renderGraphic);
-                        }
-                        if (0 !== thisList.length)
-                            renderGraphic = this._system.createGraphicList(thisList);
+                    const thisList = [];
+                    for (const mesh of meshes) {
+                        const geometry = this.geometryFromMeshData(mesh, !!batchInstances || !!nodeInstances);
+                        if (undefined !== geometry)
+                            thisList.push(geometry);
                     }
-                    if (renderGraphic) {
-                        if (thisTransform && !thisTransform.isIdentity) {
-                            const branch = new GraphicBranch_1.GraphicBranch(true);
-                            branch.add(renderGraphic);
-                            renderGraphic = this._system.createBranch(branch, thisTransform);
-                        }
-                        renderGraphicList.push(renderGraphic);
+                    if (0 !== thisList.length) {
+                        templateNodes.push({
+                            geometry: thisList,
+                            transform: thisTransform && !thisTransform.isIdentity ? thisTransform : undefined,
+                            instances: batchInstances ?? nodeInstances,
+                        });
                     }
                 }
             }
@@ -620,7 +619,7 @@ class GltfReader {
             for (const childId of node.children) {
                 const child = this._nodes[childId];
                 if (child)
-                    this.readNodeAndCreateGraphics(renderGraphicList, child, featureTable, transformStack, batchInstances ?? nodeInstances);
+                    this.readTemplateNodes(templateNodes, child, featureTable, transformStack, batchInstances ?? nodeInstances);
             }
         }
         transformStack.pop();
@@ -1636,11 +1635,7 @@ class GltfReader {
 exports.GltfReader = GltfReader;
 /** Produce a [[RenderGraphic]] from a [glTF](https://www.khronos.org/gltf/) asset suitable for use in [view decorations]($docs/learning/frontend/ViewDecorations).
  * @returns a graphic produced from the glTF asset's default scene, or `undefined` if a graphic could not be produced from the asset.
- * @note Support for the full [glTF 2.0 specification](https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html) is currently a work in progress.
- * If a particular glTF asset fails to load and/or display properly, please
- * [submit an issue](https://github.com/iTwin/itwinjs-core/issues).
- * @see [Example decorator]($docs/learning/frontend/ViewDecorations#gltf-decorations) for an example of a decorator that reads and displays a glTF asset.
- * @see [[readGltf]] to obtain more information about the glTF model.
+ * @see [[readGltf]] for more details.
  * @public
  * @extensions
  */
@@ -1649,6 +1644,27 @@ async function readGltfGraphics(args) {
     return result?.graphic;
 }
 exports.readGltfGraphics = readGltfGraphics;
+/** Produce a [[GraphicTemplate]] from a [glTF](https://www.khronos.org/gltf/) asset suitable for use in [view decorations]($docs/learning/frontend/ViewDecorations).
+ * @returns a template produced from the glTF asset's default scene, or `undefined` if a template could not be produced from the asset.
+ * @see [[readGltf]] for more details.
+ * @beta
+ */
+async function readGltfTemplate(args) {
+    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;
+    const result = await reader.readTemplate();
+    if (!result.template)
+        return undefined;
+    return {
+        template: result.template,
+        localBoundingBox: result.contentRange ?? core_geometry_1.Range3d.createNull(),
+        boundingBox: result.range ?? core_geometry_1.Range3d.createNull(),
+    };
+}
+exports.readGltfTemplate = readGltfTemplate;
 /** Produce a [[RenderGraphic]] from a [glTF](https://www.khronos.org/gltf/) asset suitable for use in [view decorations]($docs/learning/frontend/ViewDecorations).
  * @returns a graphic produced from the glTF asset's default scene, or `undefined` if a graphic could not be produced from the asset.
  * The returned graphic also includes the bounding boxes of the glTF model in world and local coordiantes.
@@ -1656,23 +1672,19 @@ exports.readGltfGraphics = readGltfGraphics;
  * If a particular glTF asset fails to load and/or display properly, please
  * [submit an issue](https://github.com/iTwin/itwinjs-core/issues).
  * @see [Example decorator]($docs/learning/frontend/ViewDecorations#gltf-decorations) for an example of a decorator that reads and displays a glTF asset.
+ * @see [[readGltfTemplate]] to produce a [[GraphicTemplate]] instead of a [[RenderGraphic]].
  * @public
  */
 async function readGltf(args) {
-    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;
-    const result = await reader.read();
-    if (!result.graphic)
+    const result = await readGltfTemplate(args);
+    if (!result) {
         return undefined;
-    (0, core_bentley_1.assert)(result.contentRange !== undefined, "readGltf always computes content range");
-    (0, core_bentley_1.assert)(result.range !== undefined, "readGltf always computes world range");
+    }
+    const template = result.template;
+    delete result.template;
     return {
-        graphic: result.graphic,
-        localBoundingBox: result.contentRange ?? core_geometry_1.Range3d.createNull(),
-        boundingBox: result.range ?? core_geometry_1.Range3d.createNull(),
+        ...result,
+        graphic: IModelApp_1.IModelApp.renderSystem.createGraphicFromTemplate({ template }),
     };
 }
 exports.readGltf = readGltf;
@@ -1859,10 +1871,14 @@ class GltfGraphicsReader extends GltfReader {
             }
         }
     }
-    async read() {
+    async readTemplate() {
         await this.resolveResources();
         this.readGltfStructuralMetadata();
-        return this.readGltfAndCreateGraphics(this._isLeaf, this._featureTable, this._contentRange, this._transform);
+        return this.readGltfAndCreateTemplate(this._isLeaf, this._featureTable, this._contentRange, true, this._transform);
+    }
+    async read() {
+        const result = await this.readTemplate();
+        return templateToGraphicResult(result, this._system);
     }
     get structuralMetadata() { return this._structuralMetadata; }
     get nodes() { return this._nodes; }