npm - @galacean/engine-loader - Versions diffs - 1.1.0-beta.14 → 1.1.0-beta.15 - Mend

@galacean/engine-loader 1.1.0-beta.14 → 1.1.0-beta.15

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 (6) hide show

package/dist/miniprogram.js CHANGED Viewed

@@ -2929,14 +2929,6 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
         });
     };
     _proto._isKhronosSupported = function _isKhronosSupported(priorityFormats, engine) {
-        if (priorityFormats === void 0) priorityFormats = [
-            exports.KTX2TargetFormat.ASTC,
-            exports.KTX2TargetFormat.ETC,
-            exports.KTX2TargetFormat.BC7,
-            exports.KTX2TargetFormat.BC1_BC3,
-            exports.KTX2TargetFormat.PVRTC,
-            exports.KTX2TargetFormat.R8G8B8A8
-        ];
         return !!KhronosTranscoder.transcoderMap[exports.KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats)];
     };
     /**
@@ -3020,10 +3012,21 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
     };
     KTX2Loader1._detectSupportedFormat = function _detectSupportedFormat(renderer, priorityFormats) {
         for(var i = 0; i < priorityFormats.length; i++){
-            var capabilities = this._supportedMap[priorityFormats[i]];
-            for(var j = 0; j < capabilities.length; j++){
-                if (renderer.canIUse(capabilities[j])) {
-                    return priorityFormats[i];
+            var format = priorityFormats[i];
+            var capabilities = this._supportedMap[format];
+            if (capabilities) {
+                for(var j = 0; j < capabilities.length; j++){
+                    if (renderer.canIUse(capabilities[j])) {
+                        return format;
+                    }
+                }
+            } else {
+                switch(priorityFormats[i]){
+                    case exports.KTX2TargetFormat.R8G8B8A8:
+                        return format;
+                    case exports.KTX2TargetFormat.R8:
+                    case exports.KTX2TargetFormat.R8G8:
+                        if (renderer.isWebGL2) return format;
                 }
             }
         }
@@ -3542,6 +3545,10 @@ exports.GLTFAnimationParser = /*#__PURE__*/ function(GLTFParser1) {
                     relativePath = relativePath === "" ? "" + entity.name : entity.name + "/" + relativePath;
                     entity = entity.parent;
                 }
+                // If the target node is in the default scene, relativePath will be empty
+                if (entity !== context.glTFResource.defaultSceneRoot) {
+                    continue;
+                }
                 var ComponentType = void 0;
                 var propertyName = void 0;
                 switch(target.path){

package/dist/module.js CHANGED Viewed

@@ -2924,14 +2924,6 @@ var KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
         });
     };
     _proto._isKhronosSupported = function _isKhronosSupported(priorityFormats, engine) {
-        if (priorityFormats === void 0) priorityFormats = [
-            KTX2TargetFormat.ASTC,
-            KTX2TargetFormat.ETC,
-            KTX2TargetFormat.BC7,
-            KTX2TargetFormat.BC1_BC3,
-            KTX2TargetFormat.PVRTC,
-            KTX2TargetFormat.R8G8B8A8
-        ];
         return !!KhronosTranscoder.transcoderMap[KTX2Loader._detectSupportedFormat(engine._hardwareRenderer, priorityFormats)];
     };
     /**
@@ -3015,10 +3007,21 @@ var KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
     };
     KTX2Loader1._detectSupportedFormat = function _detectSupportedFormat(renderer, priorityFormats) {
         for(var i = 0; i < priorityFormats.length; i++){
-            var capabilities = this._supportedMap[priorityFormats[i]];
-            for(var j = 0; j < capabilities.length; j++){
-                if (renderer.canIUse(capabilities[j])) {
-                    return priorityFormats[i];
+            var format = priorityFormats[i];
+            var capabilities = this._supportedMap[format];
+            if (capabilities) {
+                for(var j = 0; j < capabilities.length; j++){
+                    if (renderer.canIUse(capabilities[j])) {
+                        return format;
+                    }
+                }
+            } else {
+                switch(priorityFormats[i]){
+                    case KTX2TargetFormat.R8G8B8A8:
+                        return format;
+                    case KTX2TargetFormat.R8:
+                    case KTX2TargetFormat.R8G8:
+                        if (renderer.isWebGL2) return format;
                 }
             }
         }
@@ -3537,6 +3540,10 @@ var GLTFAnimationParser = /*#__PURE__*/ function(GLTFParser1) {
                     relativePath = relativePath === "" ? "" + entity.name : entity.name + "/" + relativePath;
                     entity = entity.parent;
                 }
+                // If the target node is in the default scene, relativePath will be empty
+                if (entity !== context.glTFResource.defaultSceneRoot) {
+                    continue;
+                }
                 var ComponentType = void 0;
                 var propertyName = void 0;
                 switch(target.path){