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

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.5.0-alpha.1
+ * Version: v2.5.0-alpha.3
  */
 
 'use strict';
@@ -12893,7 +12893,40 @@ var singleSplits = [
         };
         this.configureMaterial(this.renderer);
         if (baseRenderComponentData.geometry) {
-            this.geometry = this.engine.findObject(baseRenderComponentData.geometry);
+            var baseGeometry = 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 = baseGeometry.getAttributeData("aUV");
+            var aPos = baseGeometry.getAttributeData("aPos");
+            var indices = baseGeometry.getIndexData();
+            if (aUV && aPos && indices) {
+                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;
+                }
+                this.geometry.setAttributeData("aPos", aPos.slice());
+                this.geometry.setAttributeData("aUV", aUV.slice());
+                this.geometry.setIndexData(indices.slice());
+                this.geometry.setDrawCount(indices.length);
+            }
+            this.geometry.subMeshes.length = 0;
+            for(var _iterator = _create_for_of_iterator_helper_loose(baseGeometry.subMeshes), _step; !(_step = _iterator()).done;){
+                var subMesh = _step.value;
+                this.geometry.subMeshes.push({
+                    offset: subMesh.offset,
+                    indexCount: subMesh.indexCount,
+                    vertexCount: subMesh.vertexCount
+                });
+            }
         } else {
             this.geometry = this.defaultGeometry;
             this.configureDefaultGeometry(this.renderer);
@@ -20256,7 +20289,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) {
@@ -21251,7 +21284,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         /**
    * 合成暂停/播放 标识
    */ _this.paused = false;
-        _this.lastVideoUpdateTime = 0;
         _this.isEndCalled = false;
         _this._textures = [];
         var _props_reusable = props.reusable, reusable = _props_reusable === void 0 ? false : _props_reusable, _props_speed = props.speed, speed = _props_speed === void 0 ? 1 : _props_speed, _props_baseRenderOrder = props.baseRenderOrder, baseRenderOrder = _props_baseRenderOrder === void 0 ? 0 : _props_baseRenderOrder, renderer = props.renderer, event = props.event, width = props.width, height = props.height, handleItemMessage = props.handleItemMessage;
@@ -21445,11 +21477,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);
         }
@@ -21489,13 +21522,13 @@ 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);
-        this.updateVideo();
+        var previousCompositionTime = this.time;
+        this.updateCompositionTime(deltaTime * this.speed / 1000);
+        var deltaTimeInMs = (this.time - previousCompositionTime) * 1000;
         // 更新 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) {
@@ -21511,14 +21544,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;
@@ -21533,20 +21558,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         }
     };
     /**
-   * 更新视频数据到纹理
-   * @override
-   */ _proto.updateVideo = function updateVideo() {
-        var now = performance.now();
-        // 视频固定30帧更新
-        if (now - this.lastVideoUpdateTime > 33) {
-            var _this_textures;
-            ((_this_textures = this.textures) != null ? _this_textures : []).forEach(function(tex) {
-                return tex == null ? void 0 : tex.uploadCurrentVideoFrame();
-            });
-            this.lastVideoUpdateTime = now;
-        }
-    };
-    /**
    * 更新相机
    * @override
    */ _proto.updateCamera = function updateCamera() {
@@ -21563,14 +21574,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){
@@ -21595,7 +21610,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) {
@@ -22802,6 +22817,7 @@ exports.SpriteComponent = /*#__PURE__*/ function(BaseRenderComponent) {
                     _this.engine.renderErrors.add(e);
                 });
             }
+            this.renderer.texture.uploadCurrentVideoFrame();
         }
         if (ta) {
             var _this_material_getVector4;
@@ -26815,10 +26831,10 @@ var SerializationHelper = /*#__PURE__*/ function() {
     }
     var _proto = AssetLoader.prototype;
     _proto.loadGUID = function loadGUID(dataPath) {
-        var guid = dataPath.id;
         if (!dataPath) {
             return null;
         }
+        var guid = dataPath.id;
         var effectsObjectData = this.findData(guid);
         var effectsObject;
         if (!effectsObjectData) {
@@ -28398,7 +28414,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$2 = "2.5.0-alpha.1";
+var version$2 = "2.5.0-alpha.3";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -31648,7 +31664,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem);
 registerPlugin("particle", ParticleLoader, exports.VFXItem);
 registerPlugin("cal", CalculateLoader, exports.VFXItem);
 registerPlugin("interact", InteractLoader, exports.VFXItem);
-var version$1 = "2.5.0-alpha.1";
+var version$1 = "2.5.0-alpha.3";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -33250,7 +33266,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.3";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;