@galacean/effects-threejs 2.4.1-alpha.1 → 2.4.2

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.4.1-alpha.1
+ * Version: v2.4.2
  */
 
 'use strict';
@@ -891,7 +891,7 @@ function unregisterPlugin(name) {
     removeItem(defaultPlugins, name);
 }
 var PluginSystem = /*#__PURE__*/ function() {
-    function PluginSystem() {
+    function PluginSystem(pluginNames) {
         var loaders = {};
         var loaded = [];
         var addLoader = function(name) {
@@ -902,12 +902,15 @@ var PluginSystem = /*#__PURE__*/ function() {
             }
         };
         defaultPlugins.forEach(addLoader);
-        this.plugins = Object.keys(loaders).map(function(name) {
-            var CTRL = pluginLoaderMap[name];
-            if (!CTRL) {
-                throw new Error("The plugin '" + name + "' not found." + getPluginUsageInfo(name));
+        for(var _iterator = _create_for_of_iterator_helper_loose(pluginNames), _step; !(_step = _iterator()).done;){
+            var customPluginName = _step.value;
+            if (!pluginLoaderMap[customPluginName]) {
+                throw new Error("The plugin '" + customPluginName + "' not found." + getPluginUsageInfo(customPluginName));
             }
-            var loader = new CTRL();
+        }
+        this.plugins = Object.keys(loaders).map(function(name) {
+            var pluginConstructor = pluginLoaderMap[name];
+            var loader = new pluginConstructor();
             loader.name = name;
             return loader;
         }).sort(function(a, b) {
@@ -7646,6 +7649,7 @@ exports.MaterialRenderType = void 0;
 var MaskProcessor = /*#__PURE__*/ function() {
     function MaskProcessor(engine) {
         this.engine = engine;
+        this.maskable = null;
         this.stencilClearAction = {
             stencilAction: exports.TextureLoadAction.clear
         };
@@ -7662,7 +7666,9 @@ var MaskProcessor = /*#__PURE__*/ function() {
                 maskMode = exports.MaskMode.MASK;
             } else if (mode === ObscuredMode.OBSCURED || mode === ObscuredMode.REVERSE_OBSCURED) {
                 maskMode = mode === ObscuredMode.OBSCURED ? exports.MaskMode.OBSCURED : exports.MaskMode.REVERSE_OBSCURED;
-                this.maskable = ref;
+                if (ref) {
+                    this.maskable = ref;
+                }
             }
         }
         return maskMode;
@@ -12585,6 +12591,9 @@ function getBezier2DValue(out, t, p0, p1, cpx0, cpy0, cpx1, cpy1) {
     /**
    * @internal
    */ _proto.drawStencilMask = function drawStencilMask(renderer) {
+        if (!this.isActiveAndEnabled) {
+            return;
+        }
         var previousColorMask = this.material.colorMask;
         this.material.colorMask = false;
         this.draw(renderer);
@@ -27409,13 +27418,6 @@ var refCompositions = new Map();
  * 3.1 版本数据适配
  * - 富文本插件名称的适配
  */ function version31Migration(json) {
-    var // 修正老版本数据中，富文本插件名称的问题
-    _json_plugins;
-    (_json_plugins = json.plugins) == null ? void 0 : _json_plugins.forEach(function(plugin, index) {
-        if (plugin === "richtext") {
-            json.plugins[index] = "rich-text";
-        }
-    });
     // Custom shape fill 属性位置迁移
     for(var _iterator = _create_for_of_iterator_helper_loose(json.components), _step; !(_step = _iterator()).done;){
         var component = _step.value;
@@ -27483,6 +27485,13 @@ function version32Migration(json) {
     return json;
 }
 function version33Migration(json) {
+    var // 修正老版本数据中，富文本插件名称的问题
+    _json_plugins;
+    (_json_plugins = json.plugins) == null ? void 0 : _json_plugins.forEach(function(plugin, index) {
+        if (plugin === "richtext") {
+            json.plugins[index] = "rich-text";
+        }
+    });
     // 老 shape 数据兼容
     for(var _iterator = _create_for_of_iterator_helper_loose(json.items), _step; !(_step = _iterator()).done;){
         var item = _step.value;
@@ -29093,12 +29102,13 @@ var seed$1 = 1;
     _proto.processJSON = function processJSON(json) {
         var _this = this;
         return _async_to_generator(function() {
-            var jsonScene, pluginSystem;
+            var jsonScene, _jsonScene_plugins, plugins, pluginSystem;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         jsonScene = getStandardJSON(json);
-                        pluginSystem = new PluginSystem();
+                        _jsonScene_plugins = jsonScene.plugins, plugins = _jsonScene_plugins === void 0 ? [] : _jsonScene_plugins;
+                        pluginSystem = new PluginSystem(plugins);
                         return [
                             4,
                             pluginSystem.processRawJSON(jsonScene, _this.options)
@@ -31649,7 +31659,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.4.1-alpha.1";
+var version$1 = "2.4.2";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -33251,7 +33261,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.4.1-alpha.1";
+var version = "2.4.2";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;