@galacean/effects-core 2.4.0 → 2.4.1-alpha.1

package/dist/engine.d.ts

@@ -2,7 +2,6 @@ import * as spec from '@galacean/effects-specification';
 import type { Database, SceneData } from './asset-loader';
 import type { EffectsObject } from './effects-object';
 import type { Material } from './material';
-import { MaskRefManager } from './material';
 import type { GPUCapability, Geometry, Mesh, RenderPass, Renderer, ShaderLibrary } from './render';
 import type { Scene, SceneRenderLevel } from './scene';
 import type { Texture } from './texture';
@@ -32,10 +31,6 @@ export declare class Engine implements Disposable {
      * 渲染过程中错误队列
      */
     renderErrors: Set<Error>;
-    /**
-     * maskRef 值分配
-     */
-    maskRefManager: MaskRefManager;
     protected destroyed: boolean;
     protected textures: Texture[];
     protected materials: Material[];

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.4.0
+ * Version: v2.4.1-alpha.1
  */
 
 'use strict';
@@ -7621,26 +7621,16 @@ exports.MaterialRenderType = void 0;
     return Material;
 }(EffectsObject);
 
-var MaskRefManager = /*#__PURE__*/ function() {
-    function MaskRefManager(initRef) {
-        this.currentRef = initRef || 0;
-    }
-    var _proto = MaskRefManager.prototype;
-    _proto.distributeRef = function distributeRef() {
-        return ++this.currentRef;
-    };
-    return MaskRefManager;
-}();
 var MaskProcessor = /*#__PURE__*/ function() {
     function MaskProcessor(engine) {
         this.engine = engine;
+        this.stencilClearAction = {
+            stencilAction: exports.TextureLoadAction.clear
+        };
     }
     var _proto = MaskProcessor.prototype;
     _proto.getRefValue = function getRefValue() {
-        if (isNaN(this.maskRef)) {
-            this.maskRef = this.engine.maskRefManager.distributeRef();
-        }
-        return this.maskRef;
+        return 1;
     };
     _proto.getMaskMode = function getMaskMode(data) {
         var maskMode = exports.MaskMode.NONE;
@@ -7648,18 +7638,18 @@ var MaskProcessor = /*#__PURE__*/ function() {
             var _data_mask = data.mask, _data_mask_mask = _data_mask.mask, mask = _data_mask_mask === void 0 ? false : _data_mask_mask, _data_mask_mode = _data_mask.mode, mode = _data_mask_mode === void 0 ? exports.MaskMode.NONE : _data_mask_mode, ref = _data_mask.ref;
             if (mask) {
                 maskMode = exports.MaskMode.MASK;
-                this.getRefValue();
             } else if (mode === ObscuredMode.OBSCURED || mode === ObscuredMode.REVERSE_OBSCURED) {
                 maskMode = mode === ObscuredMode.OBSCURED ? exports.MaskMode.OBSCURED : exports.MaskMode.REVERSE_OBSCURED;
-                this.maskRef = ref.maskManager.getRefValue();
                 this.maskable = ref;
             }
         }
         return maskMode;
     };
     _proto.drawStencilMask = function drawStencilMask(renderer) {
-        var _this_maskable;
-        (_this_maskable = this.maskable) == null ? void 0 : _this_maskable.drawStencilMask(renderer);
+        if (this.maskable) {
+            renderer.clear(this.stencilClearAction);
+            this.maskable.drawStencilMask(renderer);
+        }
     };
     return MaskProcessor;
 }();
@@ -19572,10 +19562,12 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
         var maskMode = exports.MaskMode.NONE;
         var maskRef = 0;
         if (data.mask) {
-            var _data_mask = data.mask, mode = _data_mask.mode, ref = _data_mask.ref;
-            var refComponent = this.engine.findObject(ref);
-            maskMode = mode;
-            maskRef = refComponent.maskManager.getRefValue();
+            var maskProps = data.mask;
+            if (maskProps && maskProps.ref) {
+                maskProps.ref = this.engine.findObject(maskProps.ref);
+            }
+            maskMode = this.maskManager.getMaskMode(data);
+            maskRef = this.maskManager.getRefValue();
         }
         return {
             maskMode: maskMode,
@@ -31265,9 +31257,6 @@ var FBGeometryDataT = /*#__PURE__*/ function() {
         /**
    * 渲染过程中错误队列
    */ this.renderErrors = new Set();
-        /**
-   * maskRef 值分配
-   */ this.maskRefManager = new MaskRefManager();
         this.destroyed = false;
         this.textures = [];
         this.materials = [];
@@ -31638,7 +31627,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem);
 registerPlugin("particle", ParticleLoader, exports.VFXItem);
 registerPlugin("cal", CalculateLoader, exports.VFXItem);
 registerPlugin("interact", InteractLoader, exports.VFXItem);
-var version = "2.4.0";
+var version = "2.4.1-alpha.1";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;
@@ -31692,7 +31681,6 @@ exports.KTXTexture = KTXTexture;
 exports.LineSegments = LineSegments;
 exports.LinearValue = LinearValue;
 exports.MaskProcessor = MaskProcessor;
-exports.MaskRefManager = MaskRefManager;
 exports.Material = Material;
 exports.MaterialDataBlock = MaterialDataBlock;
 exports.Mesh = Mesh;