@galacean/effects-core 2.10.0-alpha.5 → 2.10.0

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.10.0-alpha.5
+ * Version: v2.10.0
  */
 
 'use strict';
@@ -2232,10 +2232,10 @@ var Color = /*#__PURE__*/ function() {
     };
     _proto.toHexString = function toHexString(includeAlpha) {
         if (includeAlpha === void 0) includeAlpha = true;
-        var R = Color.ToHex(Math.round(this.r * 255));
-        var G = Color.ToHex(Math.round(this.g * 255));
-        var B = Color.ToHex(Math.round(this.b * 255));
-        var A = Color.ToHex(Math.round(this.a * 255));
+        var R = Color.ToHex(Math.round(Math.min(Math.max(this.r, 0), 1) * 255));
+        var G = Color.ToHex(Math.round(Math.min(Math.max(this.g, 0), 1) * 255));
+        var B = Color.ToHex(Math.round(Math.min(Math.max(this.b, 0), 1) * 255));
+        var A = Color.ToHex(Math.round(Math.min(Math.max(this.a, 0), 1) * 255));
         if (includeAlpha) {
             return "#" + R + G + B + A;
         } else {
@@ -2281,30 +2281,14 @@ var Color = /*#__PURE__*/ function() {
      * @param v - Gamma 空间颜色值
      * @returns 线性空间颜色值
      */ Color.gammaToLinear = function gammaToLinear(v) {
-        if (v <= 0.0) {
-            return 0.0;
-        } else if (v <= 0.04045) {
-            return v / 12.92;
-        } else if (v < 1.0) {
-            return Math.pow((v + 0.055) / 1.055, 2.4);
-        } else {
-            return Math.pow(v, 2.4);
-        }
+        return v < 0.04045 ? v * 0.0773993808 : Math.pow(v * 0.9478672986 + 0.0521327014, 2.4);
     };
     /**
      * 颜色值从线性空间转到 Gamma 空间
      * @param value - 线性空间颜色值
      * @returns Gamma 空间颜色值
      */ Color.linearToGamma = function linearToGamma(value) {
-        if (value <= 0.0) {
-            return 0.0;
-        } else if (value < 0.0031308) {
-            return 12.92 * value;
-        } else if (value < 1.0) {
-            return 1.055 * Math.pow(value, 0.41666) - 0.055;
-        } else {
-            return Math.pow(value, 0.41666);
-        }
+        return value < 0.0031308 ? value * 12.92 : 1.055 * Math.pow(value, 0.41666) - 0.055;
     };
     Color.ToHex = function ToHex(i) {
         var str = i.toString(16);
@@ -3102,7 +3086,8 @@ function _inherits(subClass, superClass) {
     JSONSceneVersion["3_5"] = "3.5";
     JSONSceneVersion["3_6"] = "3.6";
     JSONSceneVersion["3_7"] = "3.7";
-    JSONSceneVersion["LATEST"] = "3.7";
+    JSONSceneVersion["3_8"] = "3.8";
+    JSONSceneVersion["LATEST"] = "3.8";
 })(JSONSceneVersion || (JSONSceneVersion = {}));
 
 /*********************************************/ /*               元素属性参数类型               */ /*********************************************/ /**
@@ -3498,6 +3483,9 @@ var CameraClipMode;
     /**
      * Vector3 曲线
      */ ValueType[ValueType["VECTOR3_CURVE"] = 27] = "VECTOR3_CURVE";
+    /**
+     * 对象引用阶梯曲线（不插值）
+     */ ValueType[ValueType["REFERENCE_CURVE"] = 28] = "REFERENCE_CURVE";
 })(ValueType || (ValueType = {}));
 /**
  * 关键帧类型
@@ -3741,6 +3729,15 @@ var BuiltinObjectGUID = {
     UnlitShader: "unlit000000000000000000000000000"
 };
 
+/**
+ * Sprite UV 旋转方式。序列化为整数（兼容老 splits 的 flip 0/1）。
+ * None 不旋转、Rotate90 将 UV 顺时针旋转 90°（width/height 互换）。
+ */ var SpriteRotation;
+(function(SpriteRotation) {
+    /** 不旋转 */ SpriteRotation[SpriteRotation["None"] = 0] = "None";
+    /** UV 旋转 90°（对应老 splits flip=1） */ SpriteRotation[SpriteRotation["Rotate90"] = 1] = "Rotate90";
+})(SpriteRotation || (SpriteRotation = {}));
+
 var FillType;
 (function(FillType) {
     FillType[FillType["Solid"] = 0] = "Solid";
@@ -3852,6 +3849,7 @@ var DataType;
     DataType["Image"] = "Image";
     DataType["AnimationClip"] = "AnimationClip";
     DataType["BinaryAsset"] = "BinaryAsset";
+    DataType["Sprite"] = "Sprite";
     // Timeline
     DataType["TrackAsset"] = "TrackAsset";
     DataType["TimelineAsset"] = "TimelineAsset";
@@ -3865,6 +3863,7 @@ var DataType;
     DataType["Vector2PropertyTrack"] = "Vector2PropertyTrack";
     DataType["Vector3PropertyTrack"] = "Vector3PropertyTrack";
     DataType["Vector4PropertyTrack"] = "Vector4PropertyTrack";
+    DataType["SpritePropertyTrack"] = "SpritePropertyTrack";
     DataType["TransformPlayableAsset"] = "TransformPlayableAsset";
     DataType["SpriteColorPlayableAsset"] = "SpriteColorPlayableAsset";
     DataType["ActivationPlayableAsset"] = "ActivationPlayableAsset";
@@ -3874,6 +3873,7 @@ var DataType;
     DataType["Vector2PropertyPlayableAsset"] = "Vector2PropertyPlayableAsset";
     DataType["Vector3PropertyPlayableAsset"] = "Vector3PropertyPlayableAsset";
     DataType["Vector4PropertyPlayableAsset"] = "Vector4PropertyPlayableAsset";
+    DataType["SpritePropertyPlayableAsset"] = "SpritePropertyPlayableAsset";
     // Components
     DataType["MeshComponent"] = "MeshComponent";
     DataType["SkyboxComponent"] = "SkyboxComponent";
@@ -3900,6 +3900,42 @@ var DataType;
     DataType["FFDComponent"] = "FFDComponent";
     DataType["FrameComponent"] = "FrameComponent";
     DataType["Animator"] = "Animator";
+    DataType["DomContentComponent"] = "DomContentComponent";
+    DataType["UIControl"] = "UIControl";
+    // GUI Controls
+    DataType["Control"] = "Control";
+    DataType["Container"] = "Container";
+    DataType["HBoxContainer"] = "HBoxContainer";
+    DataType["VBoxContainer"] = "VBoxContainer";
+    DataType["GridContainer"] = "GridContainer";
+    DataType["PanelContainer"] = "PanelContainer";
+    DataType["MarginContainer"] = "MarginContainer";
+    DataType["CenterContainer"] = "CenterContainer";
+    DataType["AspectRatioContainer"] = "AspectRatioContainer";
+    DataType["ScrollContainer"] = "ScrollContainer";
+    DataType["HScrollBar"] = "HScrollBar";
+    DataType["VScrollBar"] = "VScrollBar";
+    DataType["HSeparator"] = "HSeparator";
+    DataType["VSeparator"] = "VSeparator";
+    DataType["Label"] = "Label";
+    DataType["LineEdit"] = "LineEdit";
+    DataType["TextEdit"] = "TextEdit";
+    DataType["PopupPanel"] = "PopupPanel";
+    DataType["PopupMenu"] = "PopupMenu";
+    DataType["MenuButton"] = "MenuButton";
+    DataType["OptionButton"] = "OptionButton";
+    DataType["ColorPicker"] = "ColorPicker";
+    DataType["ColorPickerButton"] = "ColorPickerButton";
+    DataType["TextureRect"] = "TextureRect";
+    DataType["NinePatchRect"] = "NinePatchRect";
+    DataType["ColorRect"] = "ColorRect";
+    DataType["Panel"] = "Panel";
+    DataType["ProgressBar"] = "ProgressBar";
+    DataType["Button"] = "Button";
+    DataType["Checkbox"] = "Checkbox";
+    DataType["CheckButton"] = "CheckButton";
+    DataType["HSlider"] = "HSlider";
+    DataType["VSlider"] = "VSlider";
     // Non-EffectObject
     DataType["TimelineClip"] = "TimelineClip";
 })(DataType || (DataType = {}));
@@ -4038,6 +4074,7 @@ var index$1 = /*#__PURE__*/Object.freeze({
     get TextWeight () { return TextWeight; },
     get FontStyle () { return FontStyle; },
     BuiltinObjectGUID: BuiltinObjectGUID,
+    get SpriteRotation () { return SpriteRotation; },
     get FillType () { return FillType; },
     get TexturePaintScaleMode () { return TexturePaintScaleMode; },
     get ShapePrimitiveType () { return ShapePrimitiveType; },
@@ -9214,7 +9251,7 @@ function isUniformStructArray(value) {
         return v.set(this.elements[i * 4], this.elements[i * 4 + 1], this.elements[i * 4 + 2], this.elements[i * 4 + 3]);
     };
     /**
-     * 设置相机矩阵
+     * 设置矩阵的朝向旋转部分
      * @param eye - 相机位置
      * @param target - 目标位置
      * @param up - 相机方向
@@ -9224,27 +9261,32 @@ function isUniformStructArray(value) {
         var vY = Matrix4.tempVec1;
         var vZ = Matrix4.tempVec2;
         vZ.subtractVectors(eye, target);
+        if (vZ.lengthSquared() === 0) {
+            vZ.z = 1;
+        }
         vZ.normalize();
         vX.crossVectors(up, vZ);
+        if (vX.lengthSquared() === 0) {
+            if (Math.abs(up.z) === 1) {
+                vZ.x += 0.0001;
+            } else {
+                vZ.z += 0.0001;
+            }
+            vZ.normalize();
+            vX.crossVectors(up, vZ);
+        }
         vX.normalize();
         vY.crossVectors(vZ, vX);
         var te = this.elements;
         te[0] = vX.x;
-        te[1] = vY.x;
-        te[2] = vZ.x;
-        te[3] = 0;
-        te[4] = vX.y;
+        te[4] = vY.x;
+        te[8] = vZ.x;
+        te[1] = vX.y;
         te[5] = vY.y;
-        te[6] = vZ.y;
-        te[7] = 0;
-        te[8] = vX.z;
-        te[9] = vY.z;
+        te[9] = vZ.y;
+        te[2] = vX.z;
+        te[6] = vY.z;
         te[10] = vZ.z;
-        te[11] = 0;
-        te[12] = -vX.dot(eye);
-        te[13] = -vY.dot(eye);
-        te[14] = -vZ.dot(eye);
-        te[15] = 1;
         return this;
     };
     /**
@@ -9470,6 +9512,7 @@ function isUniformStructArray(value) {
         te[12] = l * te[0] + m * te[4] + n * te[8] - l + translation.x;
         te[13] = l * te[1] + m * te[5] + n * te[9] - m + translation.y;
         te[14] = l * te[2] + m * te[6] + n * te[10] - n + translation.z;
+        te[15] = 1;
         return this;
     };
     /**
@@ -9761,7 +9804,7 @@ function isUniformStructArray(value) {
         return new Matrix4(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
     };
     /**
-     * 创建相机矩阵
+     * 创建朝向旋转矩阵
      * @param eye - 相机位置
      * @param target - 目标位置
      * @param up - 相机方向
@@ -10976,6 +11019,9 @@ Euler.tempMat0 = new Matrix4();
      * @param [out] - 交点
      * @returns
      */ _proto.intersectSphere = function intersectSphere(sphere, out) {
+        if (sphere.radius < 0) {
+            return;
+        }
         var center = sphere.center;
         var vector = Ray.tempVec0.subtractVectors(center, this.origin);
         var tca = vector.dot(this.direction);
@@ -11302,7 +11348,7 @@ Ray.tempVec3 = new Vector3();
      * @returns
      */ _proto.intersectsSphere = function intersectsSphere(sphere) {
         // Find the point on the AABB closest to the sphere center.
-        var vector = new Vector3();
+        var vector = Box3.tempVec0;
         this.clampPoint(sphere.center, vector);
         // If that point is inside the sphere, the AABB and sphere intersect.
         return vector.distanceSquared(sphere.center) <= sphere.radius * sphere.radius;
@@ -11388,9 +11434,11 @@ Ray.tempVec3 = new Vector3();
      * @param target
      * @returns
      */ _proto.getBoundingSphere = function getBoundingSphere(target) {
+        if (this.isEmpty()) {
+            return target.makeEmpty();
+        }
         this.getCenter(target.center);
-        var vector = new Vector3();
-        target.radius = this.getSize(vector).length() * 0.5;
+        target.radius = this.getSize(Box3.tempVec0).length() * 0.5;
         return target;
     };
     /**
@@ -11411,6 +11459,7 @@ Ray.tempVec3 = new Vector3();
     };
     return Box3;
 }();
+Box3.tempVec0 = new Vector3();
 
 /**
  * 球
@@ -11441,16 +11490,15 @@ Ray.tempVec3 = new Vector3();
         var center = this.center;
         if (optionalCenter !== undefined) {
             center.copyFrom(optionalCenter);
-            var maxRadiusSq = 0;
-            for(var i = 0; i < points.length; i++){
-                maxRadiusSq = Math.max(maxRadiusSq, center.distanceSquared(points[i]));
-            }
-            this.radius = Math.sqrt(maxRadiusSq);
         } else {
-            var box = new Box3().setFromPoints(points);
+            var box = Sphere.tempBox.setFromPoints(points);
             box.getCenter(center);
-            this.radius = box.getSize().length() / 2;
         }
+        var maxRadiusSq = 0;
+        for(var i = 0; i < points.length; i++){
+            maxRadiusSq = Math.max(maxRadiusSq, center.distanceSquared(points[i]));
+        }
+        this.radius = Math.sqrt(maxRadiusSq);
         return this;
     };
     /**
@@ -11567,7 +11615,10 @@ Ray.tempVec3 = new Vector3();
      * @param point - 扩展点
      * @returns 扩展结果
      */ _proto.expandByPoint = function expandByPoint(point) {
-        var vector = new Vector3().subtractVectors(point, this.center);
+        if (this.isEmpty()) {
+            return this.set(point, 0);
+        }
+        var vector = Sphere.tempVec0.subtractVectors(point, this.center);
         var lengthSquared = vector.lengthSquared();
         if (lengthSquared > this.radius * this.radius) {
             var length = Math.sqrt(lengthSquared);
@@ -11585,30 +11636,42 @@ Ray.tempVec3 = new Vector3();
      * @param sphere - 包围球
      * @returns 求并结果
      */ _proto.union = function union(sphere) {
-        // To enclose another sphere into this sphere, we only need to enclose two points:
-        // 1) Enclose the farthest point on the other sphere into this sphere.
-        // 2) Enclose the opposite point of the farthest point into this sphere.
-        var v1 = new Vector3();
-        var toFarthestPoint = new Vector3();
-        toFarthestPoint.subtractVectors(sphere.center, this.center).normalize().multiply(sphere.radius);
-        this.expandByPoint(v1.copyFrom(sphere.center).add(toFarthestPoint));
-        this.expandByPoint(v1.copyFrom(sphere.center).subtract(toFarthestPoint));
+        if (sphere.isEmpty()) {
+            return this;
+        }
+        if (this.isEmpty()) {
+            return this.copyFrom(sphere);
+        }
+        if (this.center.equals(sphere.center)) {
+            this.radius = Math.max(this.radius, sphere.radius);
+        } else {
+            var point = Sphere.tempVec0;
+            var offset = Sphere.tempVec1.subtractVectors(sphere.center, this.center).setLength(sphere.radius);
+            this.expandByPoint(point.copyFrom(sphere.center).add(offset));
+            this.expandByPoint(point.copyFrom(sphere.center).subtract(offset));
+        }
         return this;
     };
     /**
-     * 包围球求交集
+     * 获取两个包围球交集的保守包围球。部分重叠时，真实交集为透镜形，
+     * 因此结果取两个输入中较小的包围球，并不精确表示交集。
      * @param other - 其它包围球
      * @returns 求交结果
      */ _proto.intersect = function intersect(other) {
-        var vector = new Vector3().subtractVectors(this.center, other.center);
-        var distance = vector.length();
-        var radiusSum = this.radius + other.radius;
-        if (distance > radiusSum) {
+        if (this.isEmpty() || other.isEmpty()) {
             return this.makeEmpty();
         }
-        this.center = this.center.add(vector.normalize().multiply(distance / 2));
-        this.radius = this.radius + other.radius - distance;
-        return this;
+        var distance = this.center.distance(other.center);
+        if (distance > this.radius + other.radius) {
+            return this.makeEmpty();
+        }
+        if (this.radius >= distance + other.radius) {
+            return this.copyFrom(other);
+        }
+        if (other.radius >= distance + this.radius) {
+            return this;
+        }
+        return this.radius <= other.radius ? this : this.copyFrom(other);
     };
     /**
      * 包围球判等
@@ -11625,6 +11688,9 @@ Ray.tempVec3 = new Vector3();
     };
     return Sphere;
 }();
+Sphere$1.tempBox = new Box3();
+Sphere$1.tempVec0 = new Vector3();
+Sphere$1.tempVec1 = new Vector3();
 
 var index = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -22828,7 +22894,7 @@ var canvasPool = new CanvasPool();
         ctx.textBaseline = "alphabetic";
         ctx.fillStyle = "#ffffff";
         this.paddingPx = GLYPH_PADDING * resolution;
-        this.italicScale = fontStyle === "italic" ? 2 : 1;
+        this.italicScale = fontStyle === "italic" || fontStyle === "oblique" ? 2 : 1;
         // ascent/descent 由探针 '|ÉqÅM' 测得 actualBoundingBox（重音字已抬高 ink 顶），
         // 两者内部保持浮点，仅 cell 高做一次外层 ceil — 与 padding 共同保证 cell 内不裁切
         var fontHeightPx = ascentPx + descentPx;
@@ -37788,7 +37854,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$1 = "2.10.0-alpha.5";
+var version$1 = "2.10.0";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -43017,7 +43083,7 @@ registerPlugin("text", TextLoader);
 registerPlugin("sprite", SpriteLoader);
 registerPlugin("particle", ParticleLoader);
 registerPlugin("interact", InteractLoader);
-var version = "2.10.0-alpha.5";
+var version = "2.10.0";
 logger.info("Core version: " + version + ".");
 
 exports.ATLAS_SIZE = ATLAS_SIZE;