@galacean/effects-threejs 2.5.0-alpha.1 → 2.5.0-alpha.2

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.5.0-alpha.1
+ * Version: v2.5.0-alpha.2
  */
 
 import * as THREE from 'three';
@@ -12870,6 +12870,25 @@ var singleSplits = [
         this.configureMaterial(this.renderer);
         if (baseRenderComponentData.geometry) {
             this.geometry = this.engine.findObject(baseRenderComponentData.geometry);
+            var uvTransform = baseRenderComponentData.splits && !baseRenderComponentData.textureSheetAnimation ? baseRenderComponentData.splits[0] : singleSplits[0];
+            var x = uvTransform[0];
+            var y = uvTransform[1];
+            var isRotate90 = uvTransform[4];
+            var width = isRotate90 ? uvTransform[3] : uvTransform[2];
+            var height = isRotate90 ? uvTransform[2] : uvTransform[3];
+            var aUV = this.geometry.getAttributeData("aUV");
+            var aPos = this.geometry.getAttributeData("aPos");
+            if (aUV && aPos) {
+                var vertexCount = aUV.length / 2;
+                for(var i = 0; i < vertexCount; i++){
+                    var positionOffset = i * 3;
+                    var uvOffset = i * 2;
+                    var positionX = aPos[positionOffset];
+                    var positionY = aPos[positionOffset + 1];
+                    aUV[uvOffset] = (positionX + 0.5) * width + x;
+                    aUV[uvOffset + 1] = (positionY + 0.5) * height + y;
+                }
+            }
         } else {
             this.geometry = this.defaultGeometry;
             this.configureDefaultGeometry(this.renderer);
@@ -20232,7 +20251,7 @@ var RuntimeClip = /*#__PURE__*/ function() {
             this.playable.play();
         }
         this.parentMixer.setClipWeight(this.playable, weight);
-        var clipTime = parseFloat(clip.toLocalTime(localTime).toFixed(3));
+        var clipTime = clip.toLocalTime(localTime);
         this.playable.setTime(clipTime);
         // 判断动画是否结束
         if (ended) {
@@ -21421,11 +21440,12 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
    * 前进合成到指定时间
    * @param time - 相对0时刻的时间
    */ _proto.forwardTime = function forwardTime(time) {
-        var deltaTime = time * 1000 - this.rootComposition.time * 1000;
+        var deltaTime = time * 1000 - this.time * 1000;
         var reverse = deltaTime < 0;
         var step = 15;
         var t = Math.abs(deltaTime);
         var ss = reverse ? -step : step;
+        // FIXME Update 中可能会修改合成时间，这边需要优化更新逻辑
         for(t; t > step; t -= step){
             this.update(ss);
         }
@@ -21465,13 +21485,14 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
             this.callAwake(this.rootItem);
             this.rootItem.beginPlay();
         }
-        var dt = parseFloat(this.getUpdateTime(deltaTime * this.speed).toFixed(0));
-        this.updateRootComposition(dt / 1000);
+        var previousCompositionTime = this.time;
+        this.updateCompositionTime(deltaTime * this.speed / 1000);
+        var deltaTimeInMs = (this.time - previousCompositionTime) * 1000;
         this.updateVideo();
         // 更新 model-tree-plugin
-        this.updatePluginLoaders(deltaTime);
-        this.sceneTicking.update.tick(dt);
-        this.sceneTicking.lateUpdate.tick(dt);
+        this.updatePluginLoaders(deltaTimeInMs);
+        this.sceneTicking.update.tick(deltaTimeInMs);
+        this.sceneTicking.lateUpdate.tick(deltaTimeInMs);
         this.updateCamera();
         this.prepareRender();
         if (this.isEnded && !this.isEndCalled) {
@@ -21487,14 +21508,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
     _proto.shouldDispose = function shouldDispose() {
         return this.isEnded && this.rootItem.endBehavior === EndBehavior.destroy && !this.reusable;
     };
-    _proto.getUpdateTime = function getUpdateTime(t) {
-        var startTimeInMs = this.startTime * 1000;
-        var now = this.rootComposition.time * 1000;
-        if (t < 0 && now + t < startTimeInMs) {
-            return startTimeInMs - now;
-        }
-        return t;
-    };
     _proto.callAwake = function callAwake(item) {
         for(var _iterator = _create_for_of_iterator_helper_loose(item.components), _step; !(_step = _iterator()).done;){
             var component = _step.value;
@@ -21539,14 +21552,18 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
     };
     /**
    * 更新主合成组件
-   */ _proto.updateRootComposition = function updateRootComposition(deltaTime) {
+   */ _proto.updateCompositionTime = function updateCompositionTime(deltaTime) {
         if (this.rootComposition.state === PlayState.Paused || !this.rootComposition.isActiveAndEnabled) {
             return;
         }
-        var localTime = parseFloat((this.time + deltaTime - this.rootItem.start).toFixed(3));
-        var isEnded = false;
+        // 相对于合成开始时间的时间
+        var localTime = this.time + deltaTime - this.startTime;
+        if (deltaTime < 0 && localTime < 0) {
+            localTime = 0;
+        }
         var duration = this.rootItem.duration;
         var endBehavior = this.rootItem.endBehavior;
+        var isEnded = false;
         if (localTime - duration > 0.001) {
             isEnded = true;
             switch(endBehavior){
@@ -21571,7 +21588,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
                     }
             }
         }
-        this.rootComposition.time = localTime;
+        this.rootComposition.time = localTime + this.startTime;
         // end state changed, handle onEnd flags
         if (this.isEnded !== isEnded) {
             if (isEnded) {
@@ -28374,7 +28391,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.5.0-alpha.1";
+var version$2 = "2.5.0-alpha.2";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -31624,7 +31641,7 @@ registerPlugin("sprite", SpriteLoader, VFXItem);
 registerPlugin("particle", ParticleLoader, VFXItem);
 registerPlugin("cal", CalculateLoader, VFXItem);
 registerPlugin("interact", InteractLoader, VFXItem);
-var version$1 = "2.5.0-alpha.1";
+var version$1 = "2.5.0-alpha.2";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -33226,7 +33243,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.5.0-alpha.1";
+var version = "2.5.0-alpha.2";
 logger.info("THREEJS plugin version: " + version + ".");
 
 export { AbstractPlugin, ActivationPlayable, ActivationPlayableAsset, ActivationTrack, AnimationClip, AnimationClipPlayable, Asset, AssetLoader, AssetManager, AssetService, BYTES_TYPE_MAP, BaseRenderComponent, Behaviour, BezierCurve, BezierCurvePath, BezierCurveQuat, BinaryAsset, COMPRESSED_TEXTURE, CONSTANT_MAP_BLEND, CONSTANT_MAP_DEPTH, CONSTANT_MAP_STENCIL_FUNC, CONSTANT_MAP_STENCIL_OP, COPY_FRAGMENT_SHADER, COPY_MESH_SHADER_ID, COPY_VERTEX_SHADER, CalculateLoader, Camera, CameraController, CameraVFXItemLoader, ColorCurve, ColorPropertyPlayableAsset, ColorPropertyTrack, Component, Composition, CompositionComponent, DEFAULT_FONTS, DEFAULT_FPS, Database, Deferred, DestroyOptions, Downloader, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, EffectComponent, EffectsObject, EffectsPackage, Ellipse, Engine, EventEmitter, EventSystem, Fake3DAnimationMode, Fake3DComponent, FilterMode, Float16ArrayWrapper, FloatPropertyPlayableAsset, FloatPropertyTrack, Framebuffer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, GraphicsPath, HELP_LINK, HitTestType, InteractComponent, InteractLoader, InteractMesh, Item, KTXTexture, LineSegments, LinearValue, MaskMode, MaskProcessor, Material, MaterialDataBlock, MaterialRenderType, MaterialTrack, Mesh, MeshCollider, ObjectBindingTrack, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleBehaviourPlayable, ParticleBehaviourPlayableAsset, ParticleLoader, ParticleMesh, ParticleSystem, ParticleSystemRenderer, ParticleTrack, PassTextureCache, PathSegments, PluginSystem, PolyStar, Polygon, PostProcessVolume, PropertyTrack, RENDER_PASS_NAME_PREFIX, RENDER_PREFER_LOOKUP_TEXTURE, RUNTIME_ENV, RandomSetValue, RandomValue, RandomVectorValue, RenderFrame, RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, RenderTargetHandle, 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, SemanticMap, SerializationHelper, Shader, ShaderCompileResultStatus, ShaderFactory, ShaderType, ShaderVariant, ShapeComponent, ShapePath, SpriteColorPlayableAsset, SpriteColorTrack, SpriteComponent, SpriteLoader, StarType, StaticValue, SubCompositionPlayableAsset, SubCompositionTrack, TEMPLATE_USE_OFFSCREEN_CANVAS, TEXTURE_UNIFORM_MAP, TextComponent, TextComponentBase, TextLayout, TextLoader, TextStyle, Texture, TextureFactory, TextureLoadAction, TextureSourceType, TextureStoreAction, ThreeComposition, ThreeDisplayObject, ThreeEngine, ThreeMaterial, ThreeSpriteComponent, ThreeTextComponent, ThreeTexture, Ticker, TimelineAsset, TimelineClip, TimelinePlayable, TrackAsset, TrackSortWrapper, TrackType, Transform, TransformAnimationPlayable, TransformPlayableAsset, TransformTrack, VFXItem, ValueGetter, Vector2Curve, Vector2PropertyPlayableAsset, Vector2PropertyTrack, Vector4Curve, Vector4PropertyPlayableAsset, Vector4PropertyTrack, addByOrder, addItem, addItemWithOrder, applyMixins, assertExist, asserts, base64ToFile, blend, buildLine, calculateTranslation, canvasPool, closePointEps, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, createCopyShader, createGLContext, createKeyFrameMeta, createShape, createValueGetter, curveEps, decimalEqual, defaultPlugins, deserializeMipmapTexture, earcut, effectsClass, effectsClassStore, enlargeBuffer, ensureFixedNumber, ensureVec3, findPreviousRenderPass, gaussianDown_frag as gaussianDownFrag, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateGUID, generateHalfFloatTexture, generateTransparentTexture, generateWhiteTexture, getBackgroundImage, getColorFromGradientStops, getConfig, getDefaultTextureFactory, getGeometryByShape, getGeometryTriangles, getKTXTextureOptions, getKeyFrameMetaByRawValue, getMergedStore, getParticleMeshShader, getPixelRatio, 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, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isValidFontFamily, isWebGL2, isWechatMiniApp, itemFrag, itemFrame_frag as itemFrameFrag, itemVert, loadAVIFOptional, loadBinary, loadBlob, loadImage, loadMedia, loadVideo, loadWebPOptional, logger, index as math, maxSpriteMeshItemCount, modifyMaxKeyframeShader, nearestPowerOfTwo, noop, normalizeColor, numberToFix, parsePercent$1 as parsePercent, particleFrag, particleOriginTranslateMap$1 as particleOriginTranslateMap, particleUniformTypeMap, particleVert, passRenderLevel, pluginLoaderMap, randomInRange, registerPlugin, removeItem, rotateVec2, screenMeshVert, serialize, setBlendMode, setConfig, setDefaultTextureFactory, setMaskMode, setMaxSpriteMeshItemCount, setRayFromCamera, setSideMode, setSpriteMeshMaxItemCountByGPU, setUniformValue, sortByOrder, index$1 as spec, thresholdFrag, throwDestroyedError, trailVert, translatePoint, trianglesFromRect, unregisterPlugin, valIfUndefined, value, valueDefine, vecFill, vecMulCombine, version, vertexFormatType2GLType };