@galacean/engine 1.2.0-beta.3 → 1.2.0-beta.4

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright © 2020-2023 Galacean authors
+Copyright (c) 2020 - present Ant Group
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

package/dist/browser.js

@@ -9794,7 +9794,8 @@
                 }
                 var shaderInfo = Shader._shaderLab.parseShader(nameOrShaderSource);
                 if (shaderMap[shaderInfo.name]) {
-                    throw 'Shader named "' + shaderInfo.name + '" already exists.';
+                    console.error('Shader named "' + shaderInfo.name + '" already exists.');
+                    return;
                 }
                 var subShaderList = shaderInfo.subShaders.map(function(subShaderInfo) {
                     var passList = subShaderInfo.passes.map(function(passInfo) {
@@ -9833,7 +9834,8 @@
                 return shader;
             } else {
                 if (shaderMap[nameOrShaderSource]) {
-                    throw 'Shader named "' + nameOrShaderSource + '" already exists.';
+                    console.error('Shader named "' + nameOrShaderSource + '" already exists.');
+                    return;
                 }
                 if (typeof vertexSourceOrShaderPassesOrSubShaders === "string") {
                     var shaderPass = new ShaderPass(vertexSourceOrShaderPassesOrSubShaders, fragmentSource);
@@ -26802,9 +26804,10 @@
        */ _proto._updateShaderData = function _updateShaderData(shaderData) {
             var _this = this, spotLight = _this._spotLights, pointLight = _this._pointLights, directLight = _this._directLights;
             var _this1 = this, spotData = _this1._spotData, pointData = _this1._pointData, directData = _this1._directData;
-            var spotLightCount = spotLight.length;
-            var pointLightCount = pointLight.length;
-            var directLightCount = directLight.length;
+            var maxLight = LightManager._maxLight;
+            var spotLightCount = Math.min(spotLight.length, maxLight);
+            var pointLightCount = Math.min(pointLight.length, maxLight);
+            var directLightCount = Math.min(directLight.length, maxLight);
             for(var i = 0; i < spotLightCount; i++){
                 spotLight.get(i)._appendData(i, spotData);
             }
@@ -31852,20 +31855,19 @@
                 var relativePath = curve.relativePath;
                 var targetEntity = curve.relativePath === "" ? entity : entity.findByPath(curve.relativePath);
                 if (targetEntity) {
-                    var _curveOwnerPool, _instanceId, _propertyOwners, _property, _layerCurveOwnerPool, _instanceId1, _layerPropertyOwners, _propertyPath;
-                    var propertyPath = "" + curve.typeIndex + "." + curve.property;
+                    var _curveOwnerPool, _instanceId, _propertyOwners, _property, _layerCurveOwnerPool, _instanceId1, _layerPropertyOwners, _property1;
                     var component = curve.typeIndex > 0 ? targetEntity.getComponents(curve.type, AnimationCurveOwner._components)[curve.typeIndex] : targetEntity.getComponent(curve.type);
                     if (!component) {
                         continue;
                     }
                     var property = curve.property;
-                    var instanceId = targetEntity.instanceId;
+                    var instanceId = component.instanceId;
                     // Get owner
                     var propertyOwners = (_curveOwnerPool = curveOwnerPool)[_instanceId = instanceId] || (_curveOwnerPool[_instanceId] = Object.create(null));
                     var owner = (_propertyOwners = propertyOwners)[_property = property] || (_propertyOwners[_property] = curve._createCurveOwner(targetEntity, component));
                     // Get layer owner
                     var layerPropertyOwners = (_layerCurveOwnerPool = layerCurveOwnerPool)[_instanceId1 = instanceId] || (_layerCurveOwnerPool[_instanceId1] = Object.create(null));
-                    var layerOwner = (_layerPropertyOwners = layerPropertyOwners)[_propertyPath = propertyPath] || (_layerPropertyOwners[_propertyPath] = curve._createCurveLayerOwner(owner));
+                    var layerOwner = (_layerPropertyOwners = layerPropertyOwners)[_property1 = property] || (_layerPropertyOwners[_property1] = curve._createCurveLayerOwner(owner));
                     if (mask && mask.pathMasks.length) {
                         var _mask_getPathMask;
                         var _mask_getPathMask_active;
@@ -40212,6 +40214,7 @@
             this.resourceManager = resourceManager;
             this.params = params;
             this.accessorBufferCache = {};
+            this.needAnimatorController = false;
             this._resourceCache = new Map();
             this._progress = {
                 taskDetail: {},
@@ -40239,16 +40242,15 @@
                 return Promise.resolve(null);
             }
             var cache = this._resourceCache;
-            var isOnlyOne = type === 0 || type === 1;
-            var cacheKey = isOnlyOne || index === undefined ? "" + type : type + ":" + index;
+            var cacheKey = index === undefined ? "" + type : type + ":" + index;
             var resource = cache.get(cacheKey);
             if (resource) {
                 return resource;
             }
-            if (isOnlyOne) {
-                resource = parser.parse(this);
-            } else {
-                var glTFItems = this.glTF[glTFSchemaMap[type]];
+            var glTFSchemaKey = glTFSchemaMap[type];
+            var isSubAsset = !!glTFResourceMap[type];
+            if (glTFSchemaKey) {
+                var glTFItems = this.glTF[glTFSchemaKey];
                 if (glTFItems && (index === undefined || glTFItems[index])) {
                     if (index === undefined) {
                         resource = type === 8 ? glTFItems.map(function(_, index) {
@@ -40258,11 +40260,14 @@
                         }));
                     } else {
                         resource = parser.parse(this, index);
-                        this._handleSubAsset(resource, type, index);
+                        isSubAsset && this._handleSubAsset(resource, type, index);
                     }
                 } else {
                     resource = Promise.resolve(null);
                 }
+            } else {
+                resource = parser.parse(this, index);
+                isSubAsset && this._handleSubAsset(resource, type, index);
             }
             cache.set(cacheKey, resource);
             return resource;
@@ -40271,6 +40276,7 @@
             var _this = this;
             var promise = this.get(0).then(function(json) {
                 _this.glTF = json;
+                _this.needAnimatorController = !!(json.skins || json.animations);
                 return Promise.all([
                     _this.get(1),
                     _this.get(5),
@@ -40278,11 +40284,14 @@
                     _this.get(7),
                     _this.get(9),
                     _this.get(10),
+                    _this.get(11),
                     _this.get(2)
                 ]).then(function() {
                     var glTFResource = _this.glTFResource;
-                    if (glTFResource.skins || glTFResource.animations) {
-                        _this._createAnimator(_this, glTFResource.animations);
+                    var animatorController = glTFResource.animatorController;
+                    if (animatorController) {
+                        var animator = glTFResource._defaultSceneRoot.addComponent(Animator);
+                        animator.animatorController = animatorController;
                     }
                     _this.resourceManager.addContentRestorer(_this.contentRestorer);
                     return glTFResource;
@@ -40301,40 +40310,21 @@
                 _this._setTaskCompleteProgress(++task.loaded, task.total);
             });
         };
-        _proto._createAnimator = function _createAnimator(context, animations) {
-            var defaultSceneRoot = context.glTFResource.defaultSceneRoot;
-            var animator = defaultSceneRoot.addComponent(Animator);
-            var animatorController = new AnimatorController();
-            var layer = new AnimatorControllerLayer("layer");
-            var animatorStateMachine = new AnimatorStateMachine();
-            animatorController.addLayer(layer);
-            animator.animatorController = animatorController;
-            layer.stateMachine = animatorStateMachine;
-            if (animations) {
-                for(var i = 0; i < animations.length; i++){
-                    var animationClip = animations[i];
-                    var name = animationClip.name;
-                    var uniqueName = animatorStateMachine.makeUniqueStateName(name);
-                    if (uniqueName !== name) {
-                        console.warn("AnimatorState name is existed, name: " + name + " reset to " + uniqueName);
-                    }
-                    var animatorState = animatorStateMachine.addState(uniqueName);
-                    animatorState.clip = animationClip;
-                }
-            }
-        };
         _proto._handleSubAsset = function _handleSubAsset(resource, type, index) {
             var _this = this;
             var glTFResourceKey = glTFResourceMap[type];
-            if (!glTFResourceKey) return;
             if (type === 8) {
                 var _this_glTFResource, _glTFResourceKey;
                 ((_this_glTFResource = this.glTFResource)[_glTFResourceKey = glTFResourceKey] || (_this_glTFResource[_glTFResourceKey] = []))[index] = resource;
             } else {
                 var url = this.glTFResource.url;
                 resource.then(function(item) {
-                    var _this_glTFResource, _glTFResourceKey;
-                    ((_this_glTFResource = _this.glTFResource)[_glTFResourceKey = glTFResourceKey] || (_this_glTFResource[_glTFResourceKey] = []))[index] = item;
+                    if (index == undefined) {
+                        _this.glTFResource[glTFResourceKey] = item;
+                    } else {
+                        var _this_glTFResource, _glTFResourceKey;
+                        ((_this_glTFResource = _this.glTFResource)[_glTFResourceKey = glTFResourceKey] || (_this_glTFResource[_glTFResourceKey] = []))[index] = item;
+                    }
                     if (type === 7) {
                         for(var i = 0, length = item.length; i < length; i++){
                             var mesh = item[i];
@@ -40382,11 +40372,12 @@
         GLTFParserType[GLTFParserType["Entity"] = 8] = "Entity";
         GLTFParserType[GLTFParserType["Skin"] = 9] = "Skin";
         GLTFParserType[GLTFParserType["Animation"] = 10] = "Animation";
+        GLTFParserType[GLTFParserType["AnimatorController"] = 11] = "AnimatorController";
     })(exports.GLTFParserType || (exports.GLTFParserType = {}));
     var _obj;
     var glTFSchemaMap = (_obj = {}, _obj[2] = "scenes", _obj[3] = "buffers", _obj[5] = "textures", _obj[6] = "materials", _obj[7] = "meshes", _obj[8] = "nodes", _obj[9] = "skins", _obj[10] = "animations", _obj[4] = "bufferViews", _obj);
     var _obj1;
-    var glTFResourceMap = (_obj1 = {}, _obj1[2] = "_sceneRoots", _obj1[5] = "textures", _obj1[6] = "materials", _obj1[7] = "meshes", _obj1[8] = "entities", _obj1[9] = "skins", _obj1[10] = "animations", _obj1);
+    var glTFResourceMap = (_obj1 = {}, _obj1[2] = "_sceneRoots", _obj1[5] = "textures", _obj1[6] = "materials", _obj1[7] = "meshes", _obj1[8] = "entities", _obj1[9] = "skins", _obj1[10] = "animations", _obj1[11] = "animatorController", _obj1);
     function registerGLTFParser(pipeline) {
         return function(Parser) {
             var parser = new Parser();
@@ -43139,6 +43130,47 @@
     exports.GLTFBufferViewParser = __decorate([
         registerGLTFParser(exports.GLTFParserType.BufferView)
     ], exports.GLTFBufferViewParser);
+    exports.GLTFAnimatorControllerParser = /*#__PURE__*/ function(GLTFParser1) {
+        var GLTFAnimatorControllerParser = function GLTFAnimatorControllerParser() {
+            return GLTFParser1.apply(this, arguments);
+        };
+        _inherits(GLTFAnimatorControllerParser, GLTFParser1);
+        var _proto = GLTFAnimatorControllerParser.prototype;
+        _proto.parse = function parse(context) {
+            var _this = this;
+            if (!context.needAnimatorController) {
+                return Promise.resolve(null);
+            }
+            return context.get(exports.GLTFParserType.Animation).then(function(animations) {
+                var animatorController = _this._createAnimatorController(animations);
+                return Promise.resolve(animatorController);
+            });
+        };
+        _proto._createAnimatorController = function _createAnimatorController(animations) {
+            var animatorController = new AnimatorController();
+            var layer = new AnimatorControllerLayer("layer");
+            var animatorStateMachine = new AnimatorStateMachine();
+            animatorController.addLayer(layer);
+            layer.stateMachine = animatorStateMachine;
+            if (animations) {
+                for(var i = 0; i < animations.length; i++){
+                    var animationClip = animations[i];
+                    var name = animationClip.name;
+                    var uniqueName = animatorStateMachine.makeUniqueStateName(name);
+                    if (uniqueName !== name) {
+                        console.warn("AnimatorState name is existed, name: " + name + " reset to " + uniqueName);
+                    }
+                    var animatorState = animatorStateMachine.addState(uniqueName);
+                    animatorState.clip = animationClip;
+                }
+            }
+            return animatorController;
+        };
+        return GLTFAnimatorControllerParser;
+    }(GLTFParser);
+    exports.GLTFAnimatorControllerParser = __decorate([
+        registerGLTFParser(exports.GLTFParserType.AnimatorController)
+    ], exports.GLTFAnimatorControllerParser);
     // Source: https://github.com/zeux/meshoptimizer/blob/master/js/meshopt_decoder.js
     var MeshoptDecoder = function() {
         var unpack = function unpack(data) {
@@ -43544,15 +43576,20 @@
             var dataRGBA = new Uint8Array(4 * width * height);
             var offset = 0, pos = 0;
             var ptrEnd = 4 * scanLineWidth;
-            var rgbeStart = new Uint8Array(4);
             var scanLineBuffer = new Uint8Array(ptrEnd);
             var numScanLines = height; // read in each successive scanLine
             while(numScanLines > 0 && pos < byteLength){
-                rgbeStart[0] = buffer[pos++];
-                rgbeStart[1] = buffer[pos++];
-                rgbeStart[2] = buffer[pos++];
-                rgbeStart[3] = buffer[pos++];
-                if (2 != rgbeStart[0] || 2 != rgbeStart[1] || (rgbeStart[2] << 8 | rgbeStart[3]) != scanLineWidth) {
+                var a = buffer[pos++];
+                var b = buffer[pos++];
+                var c = buffer[pos++];
+                var d = buffer[pos++];
+                if (a != 2 || b != 2 || c & 0x80 || width < 8 || width > 32767) {
+                    // this file is not run length encoded
+                    // read values sequentially
+                    return buffer;
+                }
+                if ((c << 8 | d) != scanLineWidth) {
+                    // eslint-disable-next-line no-throw-literal
                     throw "HDR Bad header format, wrong scan line width";
                 }
                 // read each of the four channels for the scanline into the buffer
@@ -44958,7 +44995,7 @@
     ], KHR_materials_anisotropy);
 
     //@ts-ignore
-    var version = "1.2.0-beta.3";
+    var version = "1.2.0-beta.4";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);