@galacean/engine-core 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/main.js

@@ -4940,7 +4940,8 @@ __decorate([
             }
             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) {
@@ -4979,7 +4980,8 @@ __decorate([
             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);
@@ -22126,9 +22128,10 @@ __decorate([
    */ _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);
         }
@@ -27234,20 +27237,19 @@ exports.AnimatorLayerBlendingMode = void 0;
             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;