@itwin/core-frontend 3.2.0-dev.7 → 3.2.0-dev.72

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.GltfDataType = void 0;
+exports.GltfGraphicsReader = exports.readGltfGraphics = exports.GltfReader = exports.GltfMeshData = exports.GltfReaderProps = exports.GltfBufferData = exports.GltfWrapMode = 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");
@@ -89,13 +89,15 @@ var GltfMinFilter;
     GltfMinFilter[GltfMinFilter["NearestMipMapLinear"] = 9986] = "NearestMipMapLinear";
     GltfMinFilter[GltfMinFilter["LinearMipMapLinear"] = 9987] = "LinearMipMapLinear";
 })(GltfMinFilter || (GltfMinFilter = {}));
-/** Describes how texture coordinates outside of the range [0..1] are handled. */
+/** 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 || (GltfWrapMode = {}));
+})(GltfWrapMode = exports.GltfWrapMode || (exports.GltfWrapMode = {}));
 /** Describes the intended target of a [[GltfBufferViewProps]]. */
 var GltfBufferTarget;
 (function (GltfBufferTarget) {
@@ -407,6 +409,12 @@ class GltfReader {
         var _a, _b, _c, _d, _e, _f, _g;
         this._resolvedTextures = new core_bentley_1.Dictionary((lhs, rhs) => compareTextureKeys(lhs, rhs));
         this._dracoMeshes = new Map();
+        /** The glTF spec says that if GltfSampler.wrapS/T are omitted, they default to Repeat.
+         * However, the reality data service serves tiles that lack any wrapS/T property, and we want those clamped to edge, not repeated.
+         * (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._glTF = args.props.glTF;
         this._version = args.props.version;
         this._yAxisUp = args.props.yAxisUp;
@@ -832,7 +840,7 @@ class GltfReader {
         const isVolumeClassifier = this._isVolumeClassifier;
         const meshPrimitive = MeshPrimitives_1.Mesh.create({
             displayParams,
-            features: undefined !== featureTable ? new MeshPrimitives_1.Mesh.Features(featureTable) : undefined,
+            features: featureTable,
             type: primitiveType,
             range: core_geometry_1.Range3d.createNull(),
             is2d: !this._is3d,
@@ -1323,6 +1331,17 @@ class GltfReader {
         if (undefined !== url)
             image.resolvedImage = await (0, ImageUtil_1.tryImageElementFromUrl)(url);
     }
+    /** Exposed strictly for testing. */
+    getTextureType(sampler) {
+        // ###TODO: RenderTexture currently does not support different wrapping behavior for U vs V, nor does it support mirrored repeat.
+        let wrapS = sampler === null || sampler === void 0 ? void 0 : sampler.wrapS;
+        let wrapT = sampler === null || sampler === void 0 ? void 0 : sampler.wrapT;
+        if (undefined === wrapS && undefined === wrapT)
+            wrapS = wrapT = this.defaultWrapMode;
+        if (GltfWrapMode.ClampToEdge === wrapS || GltfWrapMode.ClampToEdge === wrapT)
+            return core_common_1.RenderTexture.Type.TileSection;
+        return core_common_1.RenderTexture.Type.Normal;
+    }
     resolveTexture(textureId, isTransparent) {
         var _a;
         const texture = this._textures[textureId];
@@ -1333,9 +1352,7 @@ class GltfReader {
             return false;
         const samplerId = texture.sampler;
         const sampler = undefined !== samplerId ? this._samplers[samplerId] : undefined;
-        // ###TODO: RenderTexture should support different wrapping behavior for U vs V, and support mirrored repeat.
-        // For now, repeat unless either explicitly clamps.
-        const textureType = GltfWrapMode.ClampToEdge === (sampler === null || sampler === void 0 ? void 0 : sampler.wrapS) || GltfWrapMode.ClampToEdge === (sampler === null || sampler === void 0 ? void 0 : sampler.wrapT) ? core_common_1.RenderTexture.Type.TileSection : core_common_1.RenderTexture.Type.Normal;
+        const textureType = this.getTextureType(sampler);
         const renderTexture = this._system.createTexture({
             type: textureType,
             image: {