npm - @galacean/engine-loader - Versions diffs - 1.3.1 → 1.3.3 - Mend

@galacean/engine-loader 1.3.1 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/dist/main.js +87 -49
package/dist/main.js.map +1 -1
package/dist/miniprogram.js +87 -49
package/dist/module.js +87 -49
package/dist/module.js.map +1 -1
package/package.json +4 -4
package/types/gltf/GLTFSchema.d.ts +1 -1
package/types/gltf/extensions/EXT_texture_webp.d.ts +1 -0
package/types/gltf/extensions/index.d.ts +1 -0
package/types/gltf/parser/GLTFTextureParser.d.ts +4 -2

package/dist/miniprogram.js CHANGED Viewed

@@ -4750,57 +4750,18 @@ exports.GLTFSkinParser = __decorate([
 var _GLTFTextureParser;
 exports.GLTFTextureParser = (_GLTFTextureParser = /*#__PURE__*/ function(GLTFParser1) {
-    _inherits(GLTFTextureParser, GLTFParser1);
-    function GLTFTextureParser() {
+    _inherits(GLTFTextureParser1, GLTFParser1);
+    function GLTFTextureParser1() {
         return GLTFParser1.apply(this, arguments);
     }
-    var _proto = GLTFTextureParser.prototype;
-    _proto.parse = function parse(context, index) {
-        var textureInfo = context.glTF.textures[index];
-        var glTFResource = context.glTFResource, glTF = context.glTF;
-        var engine = glTFResource.engine, url = glTFResource.url;
-        var sampler = textureInfo.sampler, _textureInfo_source = textureInfo.source, source = _textureInfo_source === void 0 ? 0 : _textureInfo_source, textureName = textureInfo.name, extensions = textureInfo.extensions;
-        var _glTF_images_source = glTF.images[source], uri = _glTF_images_source.uri, bufferViewIndex = _glTF_images_source.bufferView, mimeType = _glTF_images_source.mimeType, imageName = _glTF_images_source.name;
-        var texture = GLTFParser.executeExtensionsCreateAndParse(extensions, context, textureInfo);
+    var _proto = GLTFTextureParser1.prototype;
+    _proto.parse = function parse(context, textureIndex) {
+        var textureInfo = context.glTF.textures[textureIndex];
+        var glTFResource = context.glTFResource;
+        var sampler = textureInfo.sampler, tmp = textureInfo.source, imageIndex = tmp === void 0 ? 0 : tmp, textureName = textureInfo.name, extensions = textureInfo.extensions;
+        var texture = GLTFParser.executeExtensionsCreateAndParse(extensions, context, textureInfo, textureIndex);
         if (!texture) {
-            var useSampler = sampler !== undefined;
-            var samplerInfo = sampler !== undefined && GLTFUtils.getSamplerInfo(glTF.samplers[sampler]);
-            if (uri) {
-                var _samplerInfo;
-                // TODO: deleted in 2.0
-                var extIndex = uri.lastIndexOf(".");
-                var ext = uri.substring(extIndex + 1);
-                var type = ext.startsWith("ktx") ? miniprogram.AssetType.KTX : miniprogram.AssetType.Texture2D;
-                texture = engine.resourceManager.load({
-                    url: miniprogram.Utils.resolveAbsoluteUrl(url, uri),
-                    type: type,
-                    params: {
-                        mipmap: (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap
-                    }
-                }).onProgress(undefined, context._onTaskDetail).then(function(texture) {
-                    texture.name = textureName || imageName || texture.name || "texture_" + index;
-                    useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
-                    return texture;
-                });
-                context._addTaskCompletePromise(texture);
-            } else {
-                var bufferView = glTF.bufferViews[bufferViewIndex];
-                texture = context.get(exports.GLTFParserType.Buffer).then(function(buffers) {
-                    var buffer = buffers[bufferView.buffer];
-                    var imageBuffer = new Uint8Array(buffer, bufferView.byteOffset, bufferView.byteLength);
-                    return GLTFUtils.loadImageBuffer(imageBuffer, mimeType).then(function(image) {
-                        var _samplerInfo;
-                        var texture = new miniprogram.Texture2D(engine, image.width, image.height, undefined, (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap);
-                        texture.setImageSource(image);
-                        texture.generateMipmaps();
-                        texture.name = textureName || imageName || "texture_" + index;
-                        useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
-                        var bufferTextureRestoreInfo = new BufferTextureRestoreInfo(texture, bufferView, mimeType);
-                        context.contentRestorer.bufferTextures.push(bufferTextureRestoreInfo);
-                        return texture;
-                    });
-                });
-            }
+            texture = exports.GLTFTextureParser._parseTexture(context, imageIndex, textureIndex, sampler, textureName);
         }
         return Promise.resolve(texture).then(function(texture) {
             GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, texture, textureInfo);
@@ -4809,7 +4770,51 @@ exports.GLTFTextureParser = (_GLTFTextureParser = /*#__PURE__*/ function(GLTFPar
             return texture;
         });
     };
-    return GLTFTextureParser;
+    /** @internal */ GLTFTextureParser1._parseTexture = function _parseTexture(context, imageIndex, textureIndex, sampler, textureName) {
+        var glTFResource = context.glTFResource, glTF = context.glTF;
+        var engine = glTFResource.engine, url = glTFResource.url;
+        var _glTF_images_imageIndex = glTF.images[imageIndex], uri = _glTF_images_imageIndex.uri, bufferViewIndex = _glTF_images_imageIndex.bufferView, mimeType = _glTF_images_imageIndex.mimeType, imageName = _glTF_images_imageIndex.name;
+        var useSampler = sampler !== undefined;
+        var samplerInfo = useSampler && GLTFUtils.getSamplerInfo(glTF.samplers[sampler]);
+        var texture;
+        if (uri) {
+            var _samplerInfo;
+            var extIndex = uri.lastIndexOf(".");
+            var ext = uri.substring(extIndex + 1);
+            var type = ext.startsWith("ktx") ? miniprogram.AssetType.KTX : miniprogram.AssetType.Texture2D;
+            texture = engine.resourceManager.load({
+                url: miniprogram.Utils.resolveAbsoluteUrl(url, uri),
+                type: type,
+                params: {
+                    mipmap: (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap
+                }
+            }).onProgress(undefined, context._onTaskDetail).then(function(texture) {
+                texture.name = textureName || imageName || texture.name || "texture_" + textureIndex;
+                useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
+                return texture;
+            });
+            context._addTaskCompletePromise(texture);
+        } else {
+            var bufferView = glTF.bufferViews[bufferViewIndex];
+            texture = context.get(exports.GLTFParserType.Buffer).then(function(buffers) {
+                var buffer = buffers[bufferView.buffer];
+                var imageBuffer = new Uint8Array(buffer, bufferView.byteOffset, bufferView.byteLength);
+                return GLTFUtils.loadImageBuffer(imageBuffer, mimeType).then(function(image) {
+                    var _samplerInfo;
+                    var texture = new miniprogram.Texture2D(engine, image.width, image.height, undefined, (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap);
+                    texture.setImageSource(image);
+                    texture.generateMipmaps();
+                    texture.name = textureName || imageName || "texture_" + textureIndex;
+                    useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
+                    var bufferTextureRestoreInfo = new BufferTextureRestoreInfo(texture, bufferView, mimeType);
+                    context.contentRestorer.bufferTextures.push(bufferTextureRestoreInfo);
+                    return texture;
+                });
+            });
+        }
+        return texture;
+    };
+    return GLTFTextureParser1;
 }(GLTFParser), function() {
     var _obj;
     /** @internal */ _GLTFTextureParser._wrapMap = (_obj = {}, _obj[TextureWrapMode.CLAMP_TO_EDGE] = miniprogram.TextureWrapMode.Clamp, _obj[TextureWrapMode.MIRRORED_REPEAT] = miniprogram.TextureWrapMode.Mirror, _obj[TextureWrapMode.REPEAT] = miniprogram.TextureWrapMode.Repeat, _obj);
@@ -6874,6 +6879,39 @@ KHR_materials_anisotropy = __decorate([
     registerGLTFExtension("KHR_materials_anisotropy", exports.GLTFExtensionMode.AdditiveParse)
 ], KHR_materials_anisotropy);
+var EXT_texture_webp = /*#__PURE__*/ function(GLTFExtensionParser1) {
+    _inherits(EXT_texture_webp, GLTFExtensionParser1);
+    function EXT_texture_webp() {
+        var _this;
+        _this = GLTFExtensionParser1.call(this) || this;
+        _this._supportWebP = false;
+        var testCanvas = engineMiniprogramAdapter.document.createElement("canvas");
+        testCanvas.width = testCanvas.height = 1;
+        _this._supportWebP = testCanvas.toDataURL("image/webp").indexOf("data:image/webp") == 0;
+        return _this;
+    }
+    var _proto = EXT_texture_webp.prototype;
+    _proto.createAndParse = function createAndParse(context, schema, textureInfo, textureIndex) {
+        var _this = this;
+        return _async_to_generator(function() {
+            var webPIndex, sampler, tmp, fallbackIndex, textureName, texture;
+            return __generator(this, function(_state) {
+                webPIndex = schema.source;
+                sampler = textureInfo.sampler, tmp = textureInfo.source, fallbackIndex = tmp === void 0 ? 0 : tmp, textureName = textureInfo.name;
+                texture = exports.GLTFTextureParser._parseTexture(context, _this._supportWebP ? webPIndex : fallbackIndex, textureIndex, sampler, textureName);
+                return [
+                    2,
+                    texture
+                ];
+            });
+        })();
+    };
+    return EXT_texture_webp;
+}(GLTFExtensionParser);
+EXT_texture_webp = __decorate([
+    registerGLTFExtension("EXT_texture_webp", exports.GLTFExtensionMode.CreateAndParse)
+], EXT_texture_webp);
 exports.BufferInfo = BufferInfo;
 exports.BufferReader = BufferReader;
 exports.FileHeader = FileHeader;

package/dist/module.js CHANGED Viewed

@@ -4745,57 +4745,18 @@ GLTFSkinParser = __decorate([
 var _GLTFTextureParser;
 var GLTFTextureParser = (_GLTFTextureParser = /*#__PURE__*/ function(GLTFParser1) {
-    _inherits(GLTFTextureParser, GLTFParser1);
-    function GLTFTextureParser() {
+    _inherits(GLTFTextureParser1, GLTFParser1);
+    function GLTFTextureParser1() {
         return GLTFParser1.apply(this, arguments);
     }
-    var _proto = GLTFTextureParser.prototype;
-    _proto.parse = function parse(context, index) {
-        var textureInfo = context.glTF.textures[index];
-        var glTFResource = context.glTFResource, glTF = context.glTF;
-        var engine = glTFResource.engine, url = glTFResource.url;
-        var sampler = textureInfo.sampler, _textureInfo_source = textureInfo.source, source = _textureInfo_source === void 0 ? 0 : _textureInfo_source, textureName = textureInfo.name, extensions = textureInfo.extensions;
-        var _glTF_images_source = glTF.images[source], uri = _glTF_images_source.uri, bufferViewIndex = _glTF_images_source.bufferView, mimeType = _glTF_images_source.mimeType, imageName = _glTF_images_source.name;
-        var texture = GLTFParser.executeExtensionsCreateAndParse(extensions, context, textureInfo);
+    var _proto = GLTFTextureParser1.prototype;
+    _proto.parse = function parse(context, textureIndex) {
+        var textureInfo = context.glTF.textures[textureIndex];
+        var glTFResource = context.glTFResource;
+        var sampler = textureInfo.sampler, tmp = textureInfo.source, imageIndex = tmp === void 0 ? 0 : tmp, textureName = textureInfo.name, extensions = textureInfo.extensions;
+        var texture = GLTFParser.executeExtensionsCreateAndParse(extensions, context, textureInfo, textureIndex);
         if (!texture) {
-            var useSampler = sampler !== undefined;
-            var samplerInfo = sampler !== undefined && GLTFUtils.getSamplerInfo(glTF.samplers[sampler]);
-            if (uri) {
-                var _samplerInfo;
-                // TODO: deleted in 2.0
-                var extIndex = uri.lastIndexOf(".");
-                var ext = uri.substring(extIndex + 1);
-                var type = ext.startsWith("ktx") ? AssetType.KTX : AssetType.Texture2D;
-                texture = engine.resourceManager.load({
-                    url: Utils.resolveAbsoluteUrl(url, uri),
-                    type: type,
-                    params: {
-                        mipmap: (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap
-                    }
-                }).onProgress(undefined, context._onTaskDetail).then(function(texture) {
-                    texture.name = textureName || imageName || texture.name || "texture_" + index;
-                    useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
-                    return texture;
-                });
-                context._addTaskCompletePromise(texture);
-            } else {
-                var bufferView = glTF.bufferViews[bufferViewIndex];
-                texture = context.get(GLTFParserType.Buffer).then(function(buffers) {
-                    var buffer = buffers[bufferView.buffer];
-                    var imageBuffer = new Uint8Array(buffer, bufferView.byteOffset, bufferView.byteLength);
-                    return GLTFUtils.loadImageBuffer(imageBuffer, mimeType).then(function(image) {
-                        var _samplerInfo;
-                        var texture = new Texture2D(engine, image.width, image.height, undefined, (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap);
-                        texture.setImageSource(image);
-                        texture.generateMipmaps();
-                        texture.name = textureName || imageName || "texture_" + index;
-                        useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
-                        var bufferTextureRestoreInfo = new BufferTextureRestoreInfo(texture, bufferView, mimeType);
-                        context.contentRestorer.bufferTextures.push(bufferTextureRestoreInfo);
-                        return texture;
-                    });
-                });
-            }
+            texture = GLTFTextureParser._parseTexture(context, imageIndex, textureIndex, sampler, textureName);
         }
         return Promise.resolve(texture).then(function(texture) {
             GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, texture, textureInfo);
@@ -4804,7 +4765,51 @@ var GLTFTextureParser = (_GLTFTextureParser = /*#__PURE__*/ function(GLTFParser1
             return texture;
         });
     };
-    return GLTFTextureParser;
+    /** @internal */ GLTFTextureParser1._parseTexture = function _parseTexture(context, imageIndex, textureIndex, sampler, textureName) {
+        var glTFResource = context.glTFResource, glTF = context.glTF;
+        var engine = glTFResource.engine, url = glTFResource.url;
+        var _glTF_images_imageIndex = glTF.images[imageIndex], uri = _glTF_images_imageIndex.uri, bufferViewIndex = _glTF_images_imageIndex.bufferView, mimeType = _glTF_images_imageIndex.mimeType, imageName = _glTF_images_imageIndex.name;
+        var useSampler = sampler !== undefined;
+        var samplerInfo = useSampler && GLTFUtils.getSamplerInfo(glTF.samplers[sampler]);
+        var texture;
+        if (uri) {
+            var _samplerInfo;
+            var extIndex = uri.lastIndexOf(".");
+            var ext = uri.substring(extIndex + 1);
+            var type = ext.startsWith("ktx") ? AssetType.KTX : AssetType.Texture2D;
+            texture = engine.resourceManager.load({
+                url: Utils.resolveAbsoluteUrl(url, uri),
+                type: type,
+                params: {
+                    mipmap: (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap
+                }
+            }).onProgress(undefined, context._onTaskDetail).then(function(texture) {
+                texture.name = textureName || imageName || texture.name || "texture_" + textureIndex;
+                useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
+                return texture;
+            });
+            context._addTaskCompletePromise(texture);
+        } else {
+            var bufferView = glTF.bufferViews[bufferViewIndex];
+            texture = context.get(GLTFParserType.Buffer).then(function(buffers) {
+                var buffer = buffers[bufferView.buffer];
+                var imageBuffer = new Uint8Array(buffer, bufferView.byteOffset, bufferView.byteLength);
+                return GLTFUtils.loadImageBuffer(imageBuffer, mimeType).then(function(image) {
+                    var _samplerInfo;
+                    var texture = new Texture2D(engine, image.width, image.height, undefined, (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap);
+                    texture.setImageSource(image);
+                    texture.generateMipmaps();
+                    texture.name = textureName || imageName || "texture_" + textureIndex;
+                    useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
+                    var bufferTextureRestoreInfo = new BufferTextureRestoreInfo(texture, bufferView, mimeType);
+                    context.contentRestorer.bufferTextures.push(bufferTextureRestoreInfo);
+                    return texture;
+                });
+            });
+        }
+        return texture;
+    };
+    return GLTFTextureParser1;
 }(GLTFParser), function() {
     var _obj;
     /** @internal */ _GLTFTextureParser._wrapMap = (_obj = {}, _obj[TextureWrapMode.CLAMP_TO_EDGE] = TextureWrapMode$1.Clamp, _obj[TextureWrapMode.MIRRORED_REPEAT] = TextureWrapMode$1.Mirror, _obj[TextureWrapMode.REPEAT] = TextureWrapMode$1.Repeat, _obj);
@@ -6870,5 +6875,38 @@ KHR_materials_anisotropy = __decorate([
     registerGLTFExtension("KHR_materials_anisotropy", GLTFExtensionMode.AdditiveParse)
 ], KHR_materials_anisotropy);
+var EXT_texture_webp = /*#__PURE__*/ function(GLTFExtensionParser1) {
+    _inherits(EXT_texture_webp, GLTFExtensionParser1);
+    function EXT_texture_webp() {
+        var _this;
+        _this = GLTFExtensionParser1.call(this) || this;
+        _this._supportWebP = false;
+        var testCanvas = document.createElement("canvas");
+        testCanvas.width = testCanvas.height = 1;
+        _this._supportWebP = testCanvas.toDataURL("image/webp").indexOf("data:image/webp") == 0;
+        return _this;
+    }
+    var _proto = EXT_texture_webp.prototype;
+    _proto.createAndParse = function createAndParse(context, schema, textureInfo, textureIndex) {
+        var _this = this;
+        return _async_to_generator(function() {
+            var webPIndex, sampler, tmp, fallbackIndex, textureName, texture;
+            return __generator(this, function(_state) {
+                webPIndex = schema.source;
+                sampler = textureInfo.sampler, tmp = textureInfo.source, fallbackIndex = tmp === void 0 ? 0 : tmp, textureName = textureInfo.name;
+                texture = GLTFTextureParser._parseTexture(context, _this._supportWebP ? webPIndex : fallbackIndex, textureIndex, sampler, textureName);
+                return [
+                    2,
+                    texture
+                ];
+            });
+        })();
+    };
+    return EXT_texture_webp;
+}(GLTFExtensionParser);
+EXT_texture_webp = __decorate([
+    registerGLTFExtension("EXT_texture_webp", GLTFExtensionMode.CreateAndParse)
+], EXT_texture_webp);
 export { AccessorType, AnimationClipDecoder, BufferInfo, BufferReader, EditorTextureLoader, FileHeader, GLTFAnimationParser, GLTFAnimatorControllerParser, GLTFBufferParser, GLTFBufferViewParser, GLTFEntityParser, GLTFExtensionMode, GLTFExtensionParser, GLTFLoader, GLTFMaterialParser, GLTFMeshParser, GLTFParser, GLTFParserContext, GLTFParserType, GLTFResource, GLTFSceneParser, GLTFSchemaParser, GLTFSkinParser, GLTFTextureParser, GLTFUtils, GLTFValidator, InterpolableValueType, KTX2Loader, KTX2TargetFormat, KTX2Transcoder, MeshDecoder, MeshLoader$1 as MeshLoader, ParserContext, ParserType, PrefabResource, ReflectionParser, SceneParser, SpecularMode, Texture2DDecoder, decode, decoder, decoderMap, parseSingleKTX, registerGLTFExtension, registerGLTFParser };
 //# sourceMappingURL=module.js.map