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

package/dist/composition.d.ts

@@ -357,7 +357,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
      */
     update(deltaTime: number): void;
     private shouldDispose;
-    private getUpdateTime;
     private callAwake;
     /**
      * 更新视频数据到纹理
@@ -377,7 +376,7 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
     /**
      * 更新主合成组件
      */
-    private updateRootComposition;
+    private updateCompositionTime;
     /**
      * 通过名称获取元素
      * @param name - 元素名称

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.5.0-alpha.1
+ * Version: v2.5.0-alpha.2
  */
 
 'use strict';
@@ -12872,6 +12872,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);
@@ -20234,7 +20253,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) {
@@ -21423,11 +21442,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);
         }
@@ -21467,13 +21487,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) {
@@ -21489,14 +21510,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;
@@ -21541,14 +21554,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){
@@ -21573,7 +21590,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) {
@@ -28376,7 +28393,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$1 = "2.5.0-alpha.1";
+var version$1 = "2.5.0-alpha.2";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -31626,7 +31643,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem);
 registerPlugin("particle", ParticleLoader, exports.VFXItem);
 registerPlugin("cal", CalculateLoader, exports.VFXItem);
 registerPlugin("interact", InteractLoader, exports.VFXItem);
-var version = "2.5.0-alpha.1";
+var version = "2.5.0-alpha.2";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;