@galacean/effects-threejs 2.8.10 → 2.8.11

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.8.10
+ * Version: v2.8.11
  */
 
 'use strict';
@@ -2376,8 +2376,21 @@ function colorToArr$1(hex, normalized) {
     return ret;
 }
 function getColorFromGradientStops(stops, key, normalize) {
-    if (stops.length) {
-        var color;
+    if (stops.length === 0) {
+        return [
+            0,
+            0,
+            0,
+            0
+        ];
+    }
+    var color;
+    if (key <= stops[0].time) {
+        color = stops[0].color.toArray();
+    } else if (key >= stops[stops.length - 1].time) {
+        color = stops[stops.length - 1].color.toArray();
+    } else {
+        color = stops[stops.length - 1].color.toArray();
         for(var j = 1; j <= stops.length - 1; j++){
             var s0 = stops[j - 1];
             var s1 = stops[j];
@@ -2386,19 +2399,10 @@ function getColorFromGradientStops(stops, key, normalize) {
                 break;
             }
         }
-        if (!color) {
-            color = stops[stops.length - 1].color.toArray();
-        }
-        return normalize ? color.map(function(n) {
-            return n / 255;
-        }) : color;
     }
-    return [
-        0,
-        0,
-        0,
-        0
-    ];
+    return normalize ? color.map(function(n) {
+        return n / 255;
+    }) : color;
 }
 function colorStopsFromGradient(gradient) {
     var stops = [];
@@ -2425,21 +2429,6 @@ function colorStopsFromGradient(gradient) {
     stops = stops.sort(function(a, b) {
         return a.time - b.time;
     });
-    if (stops.length) {
-        if (stops[0].time !== 0) {
-            stops.unshift({
-                time: 0,
-                color: stops[0].color.clone()
-            });
-        }
-        var lastStop = stops[stops.length - 1];
-        if (lastStop.time !== 1) {
-            stops.push({
-                time: 1,
-                color: lastStop.color.clone()
-            });
-        }
-    }
     return stops;
 }
 function interpolateColor(a, b, s, origin) {
@@ -2528,22 +2517,24 @@ function imageDataFromGradient(gradient) {
     var data = image.data;
     var stops = colorStopsFromGradient(gradient);
     if (stops.length) {
-        data.set(stops[0].color.toArray(), 0);
-        for(var i = 1, cursor = 0; i < width - 1; i++){
-            var index = i / width;
-            var s0 = void 0;
-            var s1 = void 0;
-            for(var j = cursor; j < stops.length; j++){
-                s0 = stops[j];
-                s1 = stops[j + 1];
-                if (s0.time <= index && s1.time > index) {
-                    break;
+        for(var i = 0; i < width; i++){
+            var index = i / (width - 1);
+            if (index <= stops[0].time) {
+                data.set(stops[0].color.toArray(), i * 4);
+            } else if (index >= stops[stops.length - 1].time) {
+                data.set(stops[stops.length - 1].color.toArray(), i * 4);
+            } else {
+                for(var j = 0; j < stops.length - 1; j++){
+                    var s0 = stops[j];
+                    var s1 = stops[j + 1];
+                    if (s0.time <= index && s1.time > index) {
+                        var color = interpolateColor(s0.color.toArray(), s1.color.toArray(), (index - s0.time) / (s1.time - s0.time));
+                        data.set(color, i * 4);
+                        break;
+                    }
                 }
             }
-            var color = interpolateColor(s0.color.toArray(), s1.color.toArray(), (index - s0.time) / (s1.time - s0.time));
-            data.set(color, i * 4);
         }
-        data.set(stops[stops.length - 1].color.toArray(), (width - 1) * 4);
     }
     return image;
 }
@@ -11867,7 +11858,21 @@ var GradientValue = /*#__PURE__*/ function(ValueGetter) {
     };
     _proto.getValue = function getValue(time) {
         var stops = this.stops;
+        if (stops.length === 0) {
+            return [
+                0,
+                0,
+                0,
+                0
+            ];
+        }
+        if (time <= stops[0].time) {
+            return stops[0].color.toArray();
+        }
         var last = stops.length - 1;
+        if (time >= stops[last].time) {
+            return stops[last].color.toArray();
+        }
         for(var i = 0; i < last; i++){
             var a = stops[i];
             var b = stops[i + 1];
@@ -18509,7 +18514,7 @@ exports.PostProcessVolume = __decorate([
 
 var vert = "precision highp float;attribute vec3 aPos;attribute vec2 aUV;varying vec2 uv0;uniform mat4 effects_MatrixVP;uniform mat4 effects_MatrixInvV;uniform mat4 effects_ObjectToWorld;void main(){vec4 pos=vec4(aPos.xyz,1.0);uv0=aUV;gl_Position=effects_MatrixVP*effects_ObjectToWorld*pos;}";
 
-var frag = "precision highp float;\n#define _MAX_STOPS 8\n#define PI 3.14159265359\nuniform vec4 _Color;uniform vec4 _Colors[_MAX_STOPS];uniform float _Stops[_MAX_STOPS];uniform int _StopsCount;uniform float _FillType;uniform vec2 _StartPoint;uniform vec2 _EndPoint;uniform sampler2D _ImageTex;uniform vec2 _ImageSize;uniform vec2 _DestSize;uniform int _ImageScaleMode;uniform mat3 _TextureTransform;uniform float _ImageScalingFactor;uniform float _ImageOpacity;varying vec2 uv0;vec4 smoothMix(vec4 a,vec4 b,float t){return mix(a,b,smoothstep(0.0,1.0,t));}float calculateAngleRatio(vec2 v1,vec2 v2){float angle=atan(v2.y,v2.x)-atan(v1.y,v1.x);if(angle<0.0)angle+=2.0*PI;return angle/(2.0*PI);}vec2 applyTransform(mat3 m,vec2 uv){uv=uv-vec2(0.5,0.5);vec3 p=m*vec3(uv,1.0);p.xy=p.xy+vec2(0.5,0.5);return p.xy;}void main(){vec4 finalColor=vec4(1.0);if(_FillType==0.0){finalColor=_Color;}else if(_FillType==1.0||_FillType==2.0||_FillType==3.0){float t=0.0;if(_FillType==1.0){vec2 gradientVector=_EndPoint-_StartPoint;vec2 pixelVector=uv0-_StartPoint;float denom=max(dot(gradientVector,gradientVector),1e-6);t=clamp(dot(pixelVector,gradientVector)/denom,0.0,1.0);}else if(_FillType==2.0){float maxRadius=max(distance(_EndPoint,_StartPoint),0.001);t=clamp(distance(uv0,_StartPoint)/maxRadius,0.0,1.0);}else{vec2 center=_StartPoint;vec2 referenceVector=_EndPoint-center;vec2 targetVector=uv0-center;if(length(targetVector)>0.001){t=calculateAngleRatio(referenceVector,targetVector);}}finalColor=_Colors[0];for(int i=1;i<_MAX_STOPS;i++){if(i>=_StopsCount)break;float prevStop=_Stops[i-1];float currStop=_Stops[i];if(t>=prevStop&&t<=currStop){float localT=(t-prevStop)/max(currStop-prevStop,1e-6);finalColor=smoothMix(_Colors[i-1],_Colors[i],localT);break;}}}else if(_FillType==4.0){vec2 uv=uv0;float rSrc=_ImageSize.x/max(_ImageSize.y,1.0);float rDst=_DestSize.x/max(_DestSize.y,1.0);bool maskOutside=false;if(_ImageScaleMode==0){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(1.0,rSrc/rDst);}else{scale=vec2(rDst/rSrc,1.0);}uv=(uv-0.5)*scale+0.5;uv=clamp(uv,0.0,1.0);}else if(_ImageScaleMode==1){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(rSrc/rDst,1.0);}else{scale=vec2(1.0,rSrc/rDst);}uv=(uv-0.5)*scale+0.5;maskOutside=true;}else if(_ImageScaleMode==2){uv=applyTransform(_TextureTransform,uv0);maskOutside=true;}else if(_ImageScaleMode==3){float aspectFix=rDst/max(rSrc,1e-6);vec2 uvTile=(uv0-0.5)*vec2(aspectFix,1.0)+0.5;float s=max(abs(_ImageScalingFactor),1e-6);uv=fract(uvTile*s);}vec4 img=texture2D(_ImageTex,uv);if(maskOutside){if(uv.x<0.0||uv.x>1.0||uv.y<0.0||uv.y>1.0){img.a=0.0;}}img.a*=_ImageOpacity;finalColor=img;}finalColor.rgb*=finalColor.a;gl_FragColor=finalColor;}";
+var frag = "precision highp float;\n#define _MAX_STOPS 8\n#define PI 3.14159265359\nuniform vec4 _Color;uniform vec4 _Colors[_MAX_STOPS];uniform float _Stops[_MAX_STOPS];uniform int _StopsCount;uniform float _FillType;uniform vec2 _StartPoint;uniform vec2 _EndPoint;uniform sampler2D _ImageTex;uniform vec2 _ImageSize;uniform vec2 _DestSize;uniform int _ImageScaleMode;uniform mat3 _TextureTransform;uniform float _ImageScalingFactor;uniform float _ImageOpacity;varying vec2 uv0;vec4 smoothMix(vec4 a,vec4 b,float t){return mix(a,b,smoothstep(0.0,1.0,t));}float calculateAngleRatio(vec2 v1,vec2 v2){float angle=atan(v2.y,v2.x)-atan(v1.y,v1.x);if(angle<0.0)angle+=2.0*PI;return angle/(2.0*PI);}vec2 applyTransform(mat3 m,vec2 uv){uv=uv-vec2(0.5,0.5);vec3 p=m*vec3(uv,1.0);p.xy=p.xy+vec2(0.5,0.5);return p.xy;}void main(){vec4 finalColor=vec4(1.0);if(_FillType==0.0){finalColor=_Color;}else if(_FillType==1.0||_FillType==2.0||_FillType==3.0){float t=0.0;if(_FillType==1.0){vec2 gradientVector=_EndPoint-_StartPoint;vec2 pixelVector=uv0-_StartPoint;float denom=max(dot(gradientVector,gradientVector),1e-6);t=clamp(dot(pixelVector,gradientVector)/denom,0.0,1.0);}else if(_FillType==2.0){float maxRadius=max(distance(_EndPoint,_StartPoint),0.001);t=clamp(distance(uv0,_StartPoint)/maxRadius,0.0,1.0);}else{vec2 center=_StartPoint;vec2 referenceVector=_EndPoint-center;vec2 targetVector=uv0-center;if(length(targetVector)>0.001){t=calculateAngleRatio(referenceVector,targetVector);}}if(_StopsCount>0){if(t<=_Stops[0]){finalColor=_Colors[0];}else if(t>=_Stops[_StopsCount-1]){finalColor=_Colors[_StopsCount-1];}else{finalColor=_Colors[0];for(int i=1;i<_MAX_STOPS;i++){if(i>=_StopsCount)break;float prevStop=_Stops[i-1];float currStop=_Stops[i];if(t>=prevStop&&t<=currStop){float localT=(t-prevStop)/max(currStop-prevStop,1e-6);finalColor=smoothMix(_Colors[i-1],_Colors[i],localT);break;}}}}}else if(_FillType==4.0){vec2 uv=uv0;float rSrc=_ImageSize.x/max(_ImageSize.y,1.0);float rDst=_DestSize.x/max(_DestSize.y,1.0);bool maskOutside=false;if(_ImageScaleMode==0){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(1.0,rSrc/rDst);}else{scale=vec2(rDst/rSrc,1.0);}uv=(uv-0.5)*scale+0.5;uv=clamp(uv,0.0,1.0);}else if(_ImageScaleMode==1){vec2 scale=vec2(1.0);if(rDst>rSrc){scale=vec2(rSrc/rDst,1.0);}else{scale=vec2(1.0,rSrc/rDst);}uv=(uv-0.5)*scale+0.5;maskOutside=true;}else if(_ImageScaleMode==2){uv=applyTransform(_TextureTransform,uv0);maskOutside=true;}else if(_ImageScaleMode==3){float aspectFix=rDst/max(rSrc,1e-6);vec2 uvTile=(uv0-0.5)*vec2(aspectFix,1.0)+0.5;float s=max(abs(_ImageScalingFactor),1e-6);uv=fract(uvTile*s);}vec4 img=texture2D(_ImageTex,uv);if(maskOutside){if(uv.x<0.0||uv.x>1.0||uv.y<0.0||uv.y>1.0){img.a=0.0;}}img.a*=_ImageOpacity;finalColor=img;}finalColor.rgb*=finalColor.a;gl_FragColor=finalColor;}";
 
 exports.TexturePaintScaleMode = void 0;
 (function(TexturePaintScaleMode) {
@@ -31659,7 +31664,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.8.10";
+var version$2 = "2.8.11";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -35359,7 +35364,7 @@ registerPlugin("text", TextLoader);
 registerPlugin("sprite", SpriteLoader);
 registerPlugin("particle", ParticleLoader);
 registerPlugin("interact", InteractLoader);
-var version$1 = "2.8.10";
+var version$1 = "2.8.11";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -36936,7 +36941,7 @@ applyMixins(exports.ThreeTextComponent, [
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.8.10";
+var version = "2.8.11";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.ActivationMixerPlayable = ActivationMixerPlayable;