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

package/dist/components/base-render-component.d.ts

@@ -27,10 +27,10 @@ export declare class BaseRenderComponent extends RendererComponent implements Ma
     };
     renderer: ItemRenderer;
     geometry: Geometry;
-    readonly maskManager: MaskProcessor;
     protected visible: boolean;
-    protected textureSheetAnimation?: spec.TextureSheetAnimation;
     protected splits: splitsDataType;
+    protected textureSheetAnimation?: spec.TextureSheetAnimation;
+    protected readonly maskManager: MaskProcessor;
     /**
      * 用于点击测试的碰撞器
      */

package/dist/composition.d.ts

@@ -231,7 +231,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
      * 合成暂停/播放 标识
      */
     private paused;
-    private lastVideoUpdateTime;
     private isEndCalled;
     private _textures;
     /**
@@ -358,11 +357,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
     update(deltaTime: number): void;
     private shouldDispose;
     private callAwake;
-    /**
-     * 更新视频数据到纹理
-     * @override
-     */
-    updateVideo(): void;
     /**
      * 更新相机
      * @override

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.2
+ * Version: v2.5.0-alpha.4
  */
 
 'use strict';
@@ -12871,25 +12871,47 @@ 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 = this.geometry.getAttributeData("aUV");
-            var aPos = this.geometry.getAttributeData("aPos");
-            if (aUV && aPos) {
+            var angle = isRotate90 === 0 ? 0 : -Math.PI / 2;
+            var aUV = baseGeometry.getAttributeData("aUV");
+            var aPos = baseGeometry.getAttributeData("aPos");
+            var indices = baseGeometry.getIndexData();
+            var tempPosition = [
+                0,
+                0
+            ];
+            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;
+                    tempPosition[0] = positionX;
+                    tempPosition[1] = positionY;
+                    rotateVec2(tempPosition, tempPosition, angle);
+                    aUV[uvOffset] = (tempPosition[0] + 0.5) * width + x;
+                    aUV[uvOffset + 1] = (tempPosition[1] + 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;
@@ -21248,7 +21270,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;
@@ -21490,7 +21511,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         var previousCompositionTime = this.time;
         this.updateCompositionTime(deltaTime * this.speed / 1000);
         var deltaTimeInMs = (this.time - previousCompositionTime) * 1000;
-        this.updateVideo();
         // 更新 model-tree-plugin
         this.updatePluginLoaders(deltaTimeInMs);
         this.sceneTicking.update.tick(deltaTimeInMs);
@@ -21524,20 +21544,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() {
@@ -22797,6 +22803,7 @@ exports.SpriteComponent = /*#__PURE__*/ function(BaseRenderComponent) {
                     _this.engine.renderErrors.add(e);
                 });
             }
+            this.renderer.texture.uploadCurrentVideoFrame();
         }
         if (ta) {
             var _this_material_getVector4;
@@ -26810,10 +26817,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) {
@@ -28393,7 +28400,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$1 = "2.5.0-alpha.2";
+var version$1 = "2.5.0-alpha.4";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -31643,7 +31650,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.2";
+var version = "2.5.0-alpha.4";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;