@galacean/effects-threejs 2.8.7 → 2.8.9

package/dist/index.mjs

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.8.7
+ * Version: v2.8.9
  */
 
 import * as THREE from 'three';
@@ -17843,14 +17843,14 @@ var CompositionComponent = /*#__PURE__*/ function(Component) {
                         }
                     }
                 }
-                if (VFXItem.isComposition(hitTestItem)) {
-                    if (hitTestItem.getComponent(CompositionComponent).hitTest(ray, x, y, regions, force, options)) {
-                        hitTestSuccess = true;
-                    }
-                } else {
-                    if (_this.hitTestRecursive(hitTestItem, ray, x, y, regions, force, options)) {
-                        hitTestSuccess = true;
-                    }
+            }
+            if (VFXItem.isComposition(hitTestItem)) {
+                if (hitTestItem.getComponent(CompositionComponent).hitTest(ray, x, y, regions, force, options)) {
+                    hitTestSuccess = true;
+                }
+            } else {
+                if (_this.hitTestRecursive(hitTestItem, ray, x, y, regions, force, options)) {
+                    hitTestSuccess = true;
                 }
             }
         };
@@ -28983,8 +28983,8 @@ var TextComponentBase = /*#__PURE__*/ function() {
     };
     _proto.setupShadow = function setupShadow() {
         var context = this.context;
-        var _this_textStyle = this.textStyle, outlineColor = _this_textStyle.outlineColor, shadowBlur = _this_textStyle.shadowBlur, shadowOffsetX = _this_textStyle.shadowOffsetX, shadowOffsetY = _this_textStyle.shadowOffsetY;
-        var r = outlineColor[0], g = outlineColor[1], b = outlineColor[2], a = outlineColor[3];
+        var _this_textStyle = this.textStyle, shadowColor = _this_textStyle.shadowColor, shadowBlur = _this_textStyle.shadowBlur, shadowOffsetX = _this_textStyle.shadowOffsetX, shadowOffsetY = _this_textStyle.shadowOffsetY;
+        var r = shadowColor[0], g = shadowColor[1], b = shadowColor[2], a = shadowColor[3];
         if (context) {
             context.shadowColor = "rgba(" + r * 255 + ", " + g * 255 + ", " + b * 255 + ", " + a + ")";
             context.shadowBlur = shadowBlur;
@@ -29209,11 +29209,11 @@ var TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
     _proto.getLineCount = function getLineCount(text) {
         var context = this.context;
         var _this_textLayout = this.textLayout, letterSpace = _this_textLayout.letterSpace, overflow = _this_textLayout.overflow;
-        // const fontScale = init ? this.textStyle.fontSize / 10 : 1 / this.textStyle.fontScale;
         this.maxLineWidth = 0;
         var width = this.textLayout.width + this.textStyle.fontOffset;
         var lineCount = 1;
         var x = 0;
+        var charCountInLine = 0; // 跟踪当前行的字符数
         // 设置 context.font 的字号，确保 measureText 能正确计算字宽
         if (context) {
             context.font = this.getFontDesc(this.textStyle.fontSize);
@@ -29224,14 +29224,19 @@ var TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
             var _context_measureText_width;
             var textMetrics = (_context_measureText_width = context == null ? void 0 : (_context_measureText = context.measureText(str)) == null ? void 0 : _context_measureText.width) != null ? _context_measureText_width : 0;
             // 和浏览器行为保持一致
-            x += letterSpace;
+            // 字符间距只应用在字符之间，每行第一个字符不加间距
+            if (charCountInLine > 0) {
+                x += letterSpace;
+            }
             // 处理文本结束行为
             if (overflow === TextOverflow.display) {
                 if (str === "\n") {
                     lineCount++;
                     x = 0;
+                    charCountInLine = 0; // 重置行字符计数
                 } else {
                     x += textMetrics;
+                    charCountInLine++;
                     this.maxLineWidth = Math.max(this.maxLineWidth, x);
                 }
             } else {
@@ -29239,9 +29244,11 @@ var TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                     lineCount++;
                     this.maxLineWidth = Math.max(this.maxLineWidth, x);
                     x = 0;
+                    charCountInLine = 0; // 重置行字符计数
                 }
                 if (str !== "\n") {
                     x += textMetrics;
+                    charCountInLine++;
                 }
             }
         }
@@ -29370,12 +29377,6 @@ var TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
             } else {
                 context.font = style.fontDesc;
             }
-            if (style.hasShadow) {
-                _this.setupShadow();
-            }
-            if (style.isOutlined) {
-                _this.setupOutline();
-            }
             // textColor 统一是 0-1，写入 canvas 时乘 255
             var _style_textColor = style.textColor, r = _style_textColor[0], g = _style_textColor[1], b = _style_textColor[2], a = _style_textColor[3];
             context.fillStyle = "rgba(" + r * 255 + ", " + g * 255 + ", " + b * 255 + ", " + a + ")";
@@ -29388,7 +29389,10 @@ var TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                 var str = char[i];
                 var textMetrics = context.measureText(str);
                 // 和浏览器行为保持一致
-                x += layout.letterSpace * fontScale;
+                // 字符间距只应用在字符之间，每行第一个字符不加间距
+                if (charsArray.length > 0) {
+                    x += layout.letterSpace * fontScale;
+                }
                 if (x + textMetrics.width > baseWidth && i > 0 || str === "\n") {
                     charsInfo.push({
                         y: y,
@@ -29413,8 +29417,13 @@ var TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                 chars: charsArray,
                 charOffsetX: charOffsetX
             });
-            // 先描边
-            if (style.isOutlined && style.outlineWidth > 0) {
+            var hasOutline = style.isOutlined && style.outlineWidth > 0;
+            if (hasOutline) {
+                // 有描边：在描边时启用阴影
+                if (style.hasShadow) {
+                    _this.setupShadow();
+                }
+                _this.setupOutline();
                 charsInfo.forEach(function(charInfo) {
                     var ox = layout.getOffsetX(style, charInfo.width);
                     for(var i = 0; i < charInfo.chars.length; i++){
@@ -29424,8 +29433,15 @@ var TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                         context.strokeText(str, drawX, drawY);
                     }
                 });
+                // 描边完成后立即禁用阴影，避免填充时重复绘制阴影
+                if (style.hasShadow) {
+                    context.shadowColor = "transparent";
+                }
+            }
+            // 填充阶段：无描边时才启用阴影
+            if (!hasOutline && style.hasShadow) {
+                _this.setupShadow();
             }
-            // 再填充
             charsInfo.forEach(function(charInfo) {
                 var ox = layout.getOffsetX(style, charInfo.width);
                 for(var i = 0; i < charInfo.chars.length; i++){
@@ -29435,6 +29451,7 @@ var TextComponent = /*#__PURE__*/ function(MaskableGraphic) {
                     context.fillText(str, drawX, drawY);
                 }
             });
+            // 清理阴影状态
             if (style.hasShadow) {
                 context.shadowColor = "transparent";
             }
@@ -31618,7 +31635,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.8.7";
+var version$2 = "2.8.9";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -35318,7 +35335,7 @@ registerPlugin("text", TextLoader);
 registerPlugin("sprite", SpriteLoader);
 registerPlugin("particle", ParticleLoader);
 registerPlugin("interact", InteractLoader);
-var version$1 = "2.8.7";
+var version$1 = "2.8.9";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -36895,7 +36912,7 @@ applyMixins(ThreeTextComponent, [
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.8.7";
+var version = "2.8.9";
 logger.info("THREEJS plugin version: " + version + ".");
 
 export { ActivationMixerPlayable, ActivationPlayable, ActivationPlayableAsset, ActivationTrack, AndNode, AndNodeData, Animatable, AnimationClip, AnimationClipNode, AnimationClipNodeData, AnimationGraphAsset, Animator, ApplyAdditiveNode, ApplyAdditiveNodeData, Asset, AssetLoader, AssetManager, AssetService, BYTES_TYPE_MAP, Behaviour, BezierCurve, BezierCurvePath, BezierCurveQuat, BinaryAsset, BlendNode, BlendNodeData, BoolValueNode, CONSTANT_MAP_BLEND, CONSTANT_MAP_DEPTH, CONSTANT_MAP_STENCIL_FUNC, CONSTANT_MAP_STENCIL_OP, COPY_FRAGMENT_SHADER, COPY_MESH_SHADER_ID, COPY_VERTEX_SHADER, Camera, CameraController, CameraVFXItemLoader, ColorCurve, ColorPlayable, ColorPropertyMixerPlayable, ColorPropertyPlayableAsset, ColorPropertyTrack, Component, ComponentTimePlayable, ComponentTimePlayableAsset, ComponentTimeTrack, Composition, CompositionComponent, CompressTextureCapabilityType, ConstBoolNode, ConstBoolNodeData, ConstFloatNode, ConstFloatNodeData, ConstraintTarget, ControlParameterBoolNode, ControlParameterBoolNodeData, ControlParameterFloatNode, ControlParameterFloatNodeData, ControlParameterTriggerNode, ControlParameterTriggerNodeData, DEFAULT_FONTS, DEFAULT_FPS, Database, Deferred, DestroyOptions, Downloader, DrawObjectPass, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, EffectComponent, EffectComponentTimeTrack, EffectsObject, EffectsPackage, Ellipse, Engine, EqualNodeData, EventEmitter, EventSystem, Fake3DAnimationMode, Fake3DComponent, FilterMode, Float16ArrayWrapper, FloatComparisonNode, FloatComparisonNodeData, FloatPropertyMixerPlayable, FloatPropertyPlayableAsset, FloatPropertyTrack, FloatValueNode, Framebuffer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, GraphInstance, GraphNode, GraphNodeData, GraphicsPath, GreaterNodeData, HELP_LINK, HitTestType, InteractComponent, InteractLoader, InteractMesh, InvalidIndex, Item, LayerBlendNode, LayerBlendNodeData, LessNodeData, LineSegments, LinearValue, MaskMode, MaskProcessor, MaskableGraphic, Material, MaterialDataBlock, MaterialRenderType, MaterialTrack, Mesh, MeshCollider, NodeTransform, NotNode, NotNodeData, ObjectBindingTrack, OrNode, OrNodeData, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleBehaviourPlayable, ParticleBehaviourPlayableAsset, ParticleLoader, ParticleMesh, ParticleMixerPlayable, ParticleSystem, ParticleSystemRenderer, ParticleTrack, PassTextureCache, PathSegments, PlayState, Playable, PlayableAsset, PlayableOutput, Plugin, PluginSystem, PointerEventData, PointerEventType, PolyStar, Polygon, Pose, PoseNode, PositionConstraint, PostProcessVolume, PropertyClipPlayable, PropertyTrack, RENDER_PREFER_LOOKUP_TEXTURE, RUNTIME_ENV, RandomSetValue, RandomValue, RandomVectorValue, RaycastResult, RenderFrame, RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, RenderTargetHandle, RenderTargetPool, RenderTextureFormat, Renderbuffer, Renderer, RendererComponent, RuntimeClip, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_0, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_SIZE_0, SEMANTIC_PRE_COLOR_ATTACHMENT_0, SEMANTIC_PRE_COLOR_ATTACHMENT_SIZE_0, SPRITE_VERTEX_STRIDE, Scene, SceneLoader, SerializationHelper, Shader, ShaderCompileResultStatus, ShaderFactory, ShaderType, ShaderVariant, ShapeComponent, ShapePath, SourceType, SpriteColorMixerPlayable, SpriteColorPlayableAsset, SpriteColorTrack, SpriteComponent, SpriteComponentTimeTrack, SpriteLoader, StarType, StateMachineNode, StateMachineNodeData, StateNode, StateNodeData, StaticValue, SubCompositionClipPlayable, SubCompositionMixerPlayable, SubCompositionPlayableAsset, SubCompositionTrack, TEMPLATE_USE_OFFSCREEN_CANVAS, TEXTURE_UNIFORM_MAP, TangentMode, TextComponent, TextComponentBase, TextLayout, TextLoader, TextStyle, Texture, TextureFactory, TextureLoadAction, TexturePaintScaleMode, TextureSourceType, TextureStoreAction, ThreeComposition, ThreeDisplayObject, ThreeEngine, ThreeMaterial, ThreeSpriteComponent, ThreeTextComponent, ThreeTexture, Ticker, TimelineAsset, TimelineClip, TimelineInstance, TrackAsset, TrackMixerPlayable, TrackType, Transform, TransformMixerPlayable, TransformPlayable, TransformPlayableAsset, TransformTrack, TransitionNode, TransitionNodeData, TransitionState, VFXItem, ValueGetter, ValueNode, Vector2Curve, Vector2PropertyMixerPlayable, Vector2PropertyPlayableAsset, Vector2PropertyTrack, Vector3Curve, Vector3PropertyMixerPlayable, Vector3PropertyTrack, Vector3ropertyPlayableAsset, Vector4Curve, Vector4PropertyMixerPlayable, Vector4PropertyPlayableAsset, Vector4PropertyTrack, WeightedMode, addByOrder, addItem, addItemWithOrder, applyMixins, assertExist, asserts, base64ToFile, buildLine, calculateTranslation, canUseBOM, canvasPool, closePointEps, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, createGLContext, createKeyFrameMeta, createShape, createValueGetter, curveEps, decimalEqual, deserializeMipmapTexture, earcut, effectsClass, effectsClassStore, enlargeBuffer, ensureFixedNumber, ensureVec3, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateGUID, generateHalfFloatTexture, generateTransparentTexture, generateWhiteTexture, getBackgroundImage, getClass, getColorFromGradientStops, getConfig, getDefaultTextureFactory, getGeometryByShape, getGeometryTriangles, getKeyFrameMetaByRawValue, getMergedStore, getNodeDataClass, getParticleMeshShader, getPixelRatio, getPluginUsageInfo, getPreMultiAlpha, getStandardComposition, getStandardImage, getStandardItem, getStandardJSON, getTextureSize, glContext, glType2VertexFormatType, gpuTimer, imageDataFromColor, imageDataFromGradient, initErrors, initGLContext, integrate, interpolateColor, isAlipayMiniApp, isAndroid, isArray, isCanvas, isFunction, isIOS, isIOSByUA, isMiniProgram, isObject, isOpenHarmony, isPlainObject, isPowerOfTwo, isSafeFontFamily, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isValidFontFamily, isWebGL2, isWechatMiniApp, itemFrag, itemVert, loadAVIFOptional, loadBinary, loadBlob, loadImage, loadMedia, loadVideo, loadWebPOptional, logger, index as math, modifyMaxKeyframeShader, nearestPowerOfTwo, nodeDataClass, noop, normalizeColor, numberToFix, oldBezierKeyFramesToNew, parsePercent$1 as parsePercent, particleFrag, particleOriginTranslateMap$1 as particleOriginTranslateMap, particleUniformTypeMap, particleVert, passRenderLevel, pluginLoaderMap, randomInRange, registerPlugin, removeItem, rotateVec2, screenMeshVert, serialize, setBlendMode, setConfig, setDefaultTextureFactory, setMaskMode, setRayFromCamera, setSideMode, setUniformValue, sortByOrder, index$1 as spec, textureLoaderRegistry, thresholdFrag, throwDestroyedError, trailVert, translatePoint, trianglesFromRect, unregisterPlugin, valIfUndefined, value, valueDefine, vecFill, vecMulCombine, version, vertexFormatType2GLType };