@eva/plugin-renderer-mask 1.2.7-editor.1 → 1.2.7-editor.12

package/dist/EVA.plugin.renderer.mask.js

@@ -33,22 +33,6 @@ var _EVA_IIFE_mask = function (exports, eva_js, pluginRenderer, rendererAdapter)
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
   }
 
-  var _assign = function __assign() {
-    _assign = Object.assign || function __assign(t) {
-      for (var s, i = 1, n = arguments.length; i < n; i++) {
-        s = arguments[i];
-
-        for (var p in s) {
-          if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-      }
-
-      return t;
-    };
-
-    return _assign.apply(this, arguments);
-  };
-
   function __decorate(decorators, target, key, desc) {
     var c = arguments.length,
         r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
@@ -59,10 +43,6 @@ var _EVA_IIFE_mask = function (exports, eva_js, pluginRenderer, rendererAdapter)
     return c > 3 && r && Object.defineProperty(target, key, r), r;
   }
 
-  function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-  }
-
   function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) {
       return value instanceof P ? value : new P(function (resolve) {
@@ -258,109 +238,6 @@ var _EVA_IIFE_mask = function (exports, eva_js, pluginRenderer, rendererAdapter)
     return ar;
   }
 
-  var SymbolKeysNotSupportedError = function (_super) {
-    __extends(SymbolKeysNotSupportedError, _super);
-
-    function SymbolKeysNotSupportedError() {
-      var _newTarget = this.constructor;
-
-      var _this = _super.call(this, 'Symbol keys are not supported yet!') || this;
-
-      Object.setPrototypeOf(_this, _newTarget.prototype);
-      return _this;
-    }
-
-    return SymbolKeysNotSupportedError;
-  }(Error);
-
-  (function (_super) {
-    __extends(StaticGetPropertiesIsNotAFunctionError, _super);
-
-    function StaticGetPropertiesIsNotAFunctionError() {
-      var _newTarget = this.constructor;
-
-      var _this = _super.call(this, 'getProperties is not a function!') || this;
-
-      Object.setPrototypeOf(_this, _newTarget.prototype);
-      return _this;
-    }
-
-    return StaticGetPropertiesIsNotAFunctionError;
-  })(Error);
-
-  var IDE_PROPERTY_METADATA = 'IDE_PROPERTY_METADATA';
-
-  function transformBasicType(type) {
-    if (type === String) {
-      return 'string';
-    }
-
-    if (type === Number) {
-      return 'number';
-    }
-
-    if (type === Boolean) {
-      return 'boolean';
-    }
-
-    return 'unknown';
-  }
-
-  function defineTypes(target, key, options, returnTypeFunction) {
-    var type = Reflect.getMetadata('design:type', target, key);
-    var isArray = type === Array;
-    var str = transformBasicType(type);
-
-    if (str !== 'unknown') {
-      type = str;
-    }
-
-    if (returnTypeFunction) {
-      var returnType = returnTypeFunction();
-
-      if (Array.isArray(returnType)) {
-        isArray = true;
-        type = returnType[0];
-      } else {
-        type = returnType;
-      }
-    }
-
-    var properties = Reflect.getMetadata(IDE_PROPERTY_METADATA, target.constructor) || {};
-    properties[key] = _assign({
-      type: type,
-      isArray: isArray
-    }, options);
-    Reflect.defineMetadata(IDE_PROPERTY_METADATA, properties, target.constructor);
-  }
-
-  function getTypeDecoratorParams(returnTypeFuncOrOptions, maybeOptions) {
-    if (typeof returnTypeFuncOrOptions === 'function') {
-      return {
-        returnTypeFunc: returnTypeFuncOrOptions,
-        options: maybeOptions || {}
-      };
-    }
-
-    return {
-      options: returnTypeFuncOrOptions || {}
-    };
-  }
-
-  function Field(returnTypeFunction, maybeOptions) {
-    return function (target, propertyKey) {
-      if (typeof propertyKey === 'symbol') {
-        throw new SymbolKeysNotSupportedError();
-      }
-
-      var _a = getTypeDecoratorParams(returnTypeFunction, maybeOptions),
-          options = _a.options,
-          returnTypeFunc = _a.returnTypeFunc;
-
-      defineTypes(target, propertyKey, options, returnTypeFunc);
-    };
-  }
-
   exports.MASK_TYPE = void 0;
 
   (function (MASK_TYPE) {
@@ -390,11 +267,6 @@ var _EVA_IIFE_mask = function (exports, eva_js, pluginRenderer, rendererAdapter)
     };
 
     Mask.componentName = 'Mask';
-
-    __decorate([Field(), __metadata("design:type", String)], Mask.prototype, "resource", void 0);
-
-    __decorate([Field(), __metadata("design:type", String)], Mask.prototype, "spriteName", void 0);
-
     return Mask;
   }(eva_js.Component);
 
@@ -534,9 +406,10 @@ var _EVA_IIFE_mask = function (exports, eva_js, pluginRenderer, rendererAdapter)
       if (changed.prop.prop[0] === 'type') {
         this.changedCache[changed.gameObject.id] = true;
 
-        if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1) {
+        if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1 || component._lastType !== component.type) {
           this.remove(changed);
           this.add(changed);
+          component._lastType = component.type;
         } else {
           this.redrawGraphics(changed);
         }

package/dist/EVA.plugin.renderer.mask.min.js

@@ -1 +1 @@
-function _extends(){return(_extends=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e}).apply(this,arguments)}window.EVA=window.EVA||{},window.EVA.plugin=window.EVA.plugin||{},window.EVA.plugin.renderer=window.EVA.plugin.renderer||{};var _EVA_IIFE_mask=function(e,t,r,n){"use strict";var o=function(e,t){return(o=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])})(e,t)};function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function r(){this.constructor=e}o(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}var a=function(){return(a=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var o in t=arguments[r])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};function c(e,t,r,n){var o,i=arguments.length,a=i<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,r,n);else for(var c=e.length-1;c>=0;c--)(o=e[c])&&(a=(i<3?o(a):i>3?o(t,r,a):o(t,r))||a);return i>3&&a&&Object.defineProperty(t,r,a),a}function s(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function p(e,t,r,n){return new(r||(r=Promise))((function(o,i){function a(e){try{s(n.next(e))}catch(e){i(e)}}function c(e){try{s(n.throw(e))}catch(e){i(e)}}function s(e){var t;e.done?o(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(a,c)}s((n=n.apply(e,t||[])).next())}))}function l(e,t){var r,n,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function c(i){return function(c){return function(i){if(r)throw new TypeError("Generator is already executing.");for(;a;)try{if(r=1,n&&(o=2&i[0]?n.return:i[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,i[1])).done)return o;switch(n=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,n=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=a.trys,(o=o.length>0&&o[o.length-1])||6!==i[0]&&2!==i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){a.label=i[1];break}if(6===i[0]&&a.label<o[1]){a.label=o[1],o=i;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(i);break}o[2]&&a.ops.pop(),a.trys.pop();continue}i=t.call(e,a)}catch(e){i=[6,e],n=0}finally{r=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,c])}}}function u(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,o,i=r.call(e),a=[];try{for(;(void 0===t||t-- >0)&&!(n=i.next()).done;)a.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(r=i.return)&&r.call(i)}finally{if(o)throw o.error}}return a}var y=function(e){function t(){var t=this.constructor,r=e.call(this,"Symbol keys are not supported yet!")||this;return Object.setPrototypeOf(r,t.prototype),r}return i(t,e),t}(Error);!function(e){function t(){var t=this.constructor,r=e.call(this,"getProperties is not a function!")||this;return Object.setPrototypeOf(r,t.prototype),r}i(t,e)}(Error);var h="IDE_PROPERTY_METADATA";function d(e,t,r,n){var o=Reflect.getMetadata("design:type",e,t),i=o===Array,c=function(e){return e===String?"string":e===Number?"number":e===Boolean?"boolean":"unknown"}(o);if("unknown"!==c&&(o=c),n){var s=n();Array.isArray(s)?(i=!0,o=s[0]):o=s}var p=Reflect.getMetadata(h,e.constructor)||{};p[t]=a({type:o,isArray:i},r),Reflect.defineMetadata(h,p,e.constructor)}function f(e,t){return function(r,n){if("symbol"==typeof n)throw new y;var o=function(e,t){return"function"==typeof e?{returnTypeFunc:e,options:t||{}}:{options:e||{}}}(e,t);d(r,n,o.options,o.returnTypeFunc)}}e.MASK_TYPE=void 0,function(e){e.Circle="Circle",e.Ellipse="Ellipse",e.Rect="Rect",e.RoundedRect="RoundedRect",e.Polygon="Polygon",e.Img="Img",e.Sprite="Sprite"}(e.MASK_TYPE||(e.MASK_TYPE={}));var g,m=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.style={},t.resource="",t.spriteName="",t}return i(t,e),t.prototype.init=function(e){_extends(this,e)},t.componentName="Mask",c([f(),s("design:type",String)],t.prototype,"resource",void 0),c([f(),s("design:type",String)],t.prototype,"spriteName",void 0),t}(t.Component),w={Circle:["x","y","radius"],Ellipse:["x","y","width","height"],Rect:["x","y","width","height"],RoundedRect:["x","y","width","height","radius"],Polygon:["paths"]},v={Circle:"drawCircle",Ellipse:"drawEllipse",Rect:"drawRect",RoundedRect:"drawRoundedRect",Polygon:"drawPolygon"};!function(e){e.Circle="Circle",e.Ellipse="Ellipse",e.Rect="Rect",e.RoundedRect="RoundedRect",e.Polygon="Polygon",e.Img="Img",e.Sprite="Sprite"}(g||(g={}));var b=function(e){function o(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Mask",t.changedCache={},t.maskSpriteCache={},t}return i(o,e),o.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},o.prototype.rendererUpdate=function(){this.changedCache={}},o.prototype.componentChanged=function(e){if("Mask"===e.component.name)switch(e.type){case t.OBSERVER_TYPE.ADD:this.add(e);break;case t.OBSERVER_TYPE.REMOVE:this.remove(e);break;case t.OBSERVER_TYPE.CHANGE:this.change(e)}},o.prototype.add=function(e){var t,r=e.component;if(!(r.type in g))throw new Error("no have Mask type: "+r.type);if(!r.style)throw new Error("no have Mask style: "+r.type);switch(r.type){case g.Circle:case g.Ellipse:case g.Rect:case g.RoundedRect:case g.Polygon:t=this.createGraphics(r);break;case g.Img:case g.Sprite:t=this.createSprite(r)}if(!t)throw new Error("no have mask instance, check your mask params: "+r.type);var n=this.containerManager.getContainer(e.gameObject.id);n.mask=t,n.addChild(t)},o.prototype.remove=function(e){var t=this.containerManager.getContainer(e.gameObject.id);t.removeChild(t.mask),t.mask.destroy({children:!0}),t.mask=null,delete this.maskSpriteCache[e.gameObject.id]},o.prototype.change=function(e){if(!this.changedCache[e.gameObject.id]){var t=e.component;"type"===e.prop.prop[0]?(this.changedCache[e.gameObject.id]=!0,[g.Sprite,g.Img].indexOf(t.type)>-1?(this.remove(e),this.add(e)):this.redrawGraphics(e)):"style"===e.prop.prop[0]?[g.Sprite,g.Img].indexOf(t.type)>-1?this.changeSpriteStyle(t):this.redrawGraphics(e):("resource"===e.prop.prop[0]||"spriteName"===e.prop.prop[0])&&(this.changedCache[e.gameObject.id]=!0,this.changeSprite(t))}},o.prototype.createGraphics=function(e){var t=new n.Graphics;return this.draw(t,e),t},o.prototype.redrawGraphics=function(e){var t=this.containerManager.getContainer(e.gameObject.id).mask;t.clear(),this.draw(t,e.component)},o.prototype.draw=function(e,t){var r,n,o=[];try{for(var i=function(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0;if(r)return r.call(e);if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}};throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}(w[t.type]),a=i.next();!a.done;a=i.next()){var c=a.value;o.push(t.style[c])}}catch(e){r={error:e}}finally{try{a&&!a.done&&(n=i.return)&&n.call(i)}finally{if(r)throw r.error}}e.beginFill(0,1),e[v[t.type]].apply(e,function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(u(arguments[t]));return e}(o)),e.endFill()},o.prototype.createSprite=function(e){var t=new n.Sprite(null);return this.maskSpriteCache[e.gameObject.id]=t,this.setSprite(e,t),t.sprite},o.prototype.changeSpriteStyle=function(e){var t=this.maskSpriteCache[e.gameObject.id];t.sprite.width=e.style.width,t.sprite.height=e.style.height,t.sprite.position.x=e.style.x,t.sprite.position.y=e.style.y},o.prototype.changeSprite=function(e){var t=this.maskSpriteCache[e.gameObject.id];this.setSprite(e,t)},o.prototype.setSprite=function(e,r){return p(this,void 0,void 0,(function(){var n,o,i,a;return l(this,(function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),o=this.increaseAsyncId(e.gameObject.id),[4,t.resource.getResource(e.resource)];case 1:return n=c.sent(),this.validateAsyncId(e.gameObject.id,o)?[3,3]:[2];case 2:throw c.sent(),new Error("mask resource load error");case 3:return e.type===g.Sprite?(i=e.resource+"_s|r|c_"+e.spriteName,a=n.instance[i],r.image=a):r.image=n.data.image,r.sprite.width=e.style.width,r.sprite.height=e.style.height,r.sprite.position.x=e.style.x,r.sprite.position.y=e.style.y,[2]}}))}))},o.systemName="Mask",o=c([t.decorators.componentObserver({Mask:["type",{prop:["style"],deep:!0},"resource","spriteName"]})],o)}(r.Renderer);return e.Mask=m,e.MaskSystem=b,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,EVA.rendererAdapter);window.EVA.plugin.renderer.mask=window.EVA.plugin.renderer.mask||_EVA_IIFE_mask;
+function _extends(){return _extends=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},_extends.apply(this,arguments)}window.EVA=window.EVA||{},window.EVA.plugin=window.EVA.plugin||{},window.EVA.plugin.renderer=window.EVA.plugin.renderer||{};var _EVA_IIFE_mask=function(e,t,r,n){"use strict";var i=function(e,t){return i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])},i(e,t)};function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");function r(){this.constructor=e}i(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function a(e,t,r,n){return new(r||(r=Promise))((function(i,o){function a(e){try{s(n.next(e))}catch(e){o(e)}}function c(e){try{s(n.throw(e))}catch(e){o(e)}}function s(e){var t;e.done?i(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(a,c)}s((n=n.apply(e,t||[])).next())}))}function c(e,t){var r,n,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function c(o){return function(c){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;a;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return a.label++,{value:o[1],done:!1};case 5:a.label++,n=o[1],o=[0];continue;case 7:o=a.ops.pop(),a.trys.pop();continue;default:if(!(i=a.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1];break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o;break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o);break}i[2]&&a.ops.pop(),a.trys.pop();continue}o=t.call(e,a)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,c])}}}function s(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,i,o=r.call(e),a=[];try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a}e.MASK_TYPE=void 0,function(e){e.Circle="Circle",e.Ellipse="Ellipse",e.Rect="Rect",e.RoundedRect="RoundedRect",e.Polygon="Polygon",e.Img="Img",e.Sprite="Sprite"}(e.MASK_TYPE||(e.MASK_TYPE={}));var p,l=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.style={},t.resource="",t.spriteName="",t}return o(t,e),t.prototype.init=function(e){_extends(this,e)},t.componentName="Mask",t}(t.Component),u=l,h={Circle:["x","y","radius"],Ellipse:["x","y","width","height"],Rect:["x","y","width","height"],RoundedRect:["x","y","width","height","radius"],Polygon:["paths"]},d={Circle:"drawCircle",Ellipse:"drawEllipse",Rect:"drawRect",RoundedRect:"drawRoundedRect",Polygon:"drawPolygon"};!function(e){e.Circle="Circle",e.Ellipse="Ellipse",e.Rect="Rect",e.RoundedRect="RoundedRect",e.Polygon="Polygon",e.Img="Img",e.Sprite="Sprite"}(p||(p={}));var y=function(e){function i(){var t=null!==e&&e.apply(this,arguments)||this;return t.name="Mask",t.changedCache={},t.maskSpriteCache={},t}return o(i,e),i.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},i.prototype.rendererUpdate=function(){this.changedCache={}},i.prototype.componentChanged=function(e){if("Mask"===e.component.name)switch(e.type){case t.OBSERVER_TYPE.ADD:this.add(e);break;case t.OBSERVER_TYPE.REMOVE:this.remove(e);break;case t.OBSERVER_TYPE.CHANGE:this.change(e)}},i.prototype.add=function(e){var t,r=e.component;if(!(r.type in p))throw new Error("no have Mask type: "+r.type);if(!r.style)throw new Error("no have Mask style: "+r.type);switch(r.type){case p.Circle:case p.Ellipse:case p.Rect:case p.RoundedRect:case p.Polygon:t=this.createGraphics(r);break;case p.Img:case p.Sprite:t=this.createSprite(r)}if(!t)throw new Error("no have mask instance, check your mask params: "+r.type);var n=this.containerManager.getContainer(e.gameObject.id);n.mask=t,n.addChild(t)},i.prototype.remove=function(e){var t=this.containerManager.getContainer(e.gameObject.id);t.removeChild(t.mask),t.mask.destroy({children:!0}),t.mask=null,delete this.maskSpriteCache[e.gameObject.id]},i.prototype.change=function(e){if(!this.changedCache[e.gameObject.id]){var t=e.component;"type"===e.prop.prop[0]?(this.changedCache[e.gameObject.id]=!0,[p.Sprite,p.Img].indexOf(t.type)>-1||t._lastType!==t.type?(this.remove(e),this.add(e),t._lastType=t.type):this.redrawGraphics(e)):"style"===e.prop.prop[0]?[p.Sprite,p.Img].indexOf(t.type)>-1?this.changeSpriteStyle(t):this.redrawGraphics(e):("resource"===e.prop.prop[0]||"spriteName"===e.prop.prop[0])&&(this.changedCache[e.gameObject.id]=!0,this.changeSprite(t))}},i.prototype.createGraphics=function(e){var t=new n.Graphics;return this.draw(t,e),t},i.prototype.redrawGraphics=function(e){var t=this.containerManager.getContainer(e.gameObject.id).mask;t.clear(),this.draw(t,e.component)},i.prototype.draw=function(e,t){var r,n,i=[];try{for(var o=function(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0;if(r)return r.call(e);if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}};throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}(h[t.type]),a=o.next();!a.done;a=o.next()){var c=a.value;i.push(t.style[c])}}catch(e){r={error:e}}finally{try{a&&!a.done&&(n=o.return)&&n.call(o)}finally{if(r)throw r.error}}e.beginFill(0,1),e[d[t.type]].apply(e,function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(s(arguments[t]));return e}(i)),e.endFill()},i.prototype.createSprite=function(e){var t=new n.Sprite(null);return this.maskSpriteCache[e.gameObject.id]=t,this.setSprite(e,t),t.sprite},i.prototype.changeSpriteStyle=function(e){var t=this.maskSpriteCache[e.gameObject.id];t.sprite.width=e.style.width,t.sprite.height=e.style.height,t.sprite.position.x=e.style.x,t.sprite.position.y=e.style.y},i.prototype.changeSprite=function(e){var t=this.maskSpriteCache[e.gameObject.id];this.setSprite(e,t)},i.prototype.setSprite=function(e,r){return a(this,void 0,void 0,(function(){var n,i,o,a;return c(this,(function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),i=this.increaseAsyncId(e.gameObject.id),[4,t.resource.getResource(e.resource)];case 1:return n=c.sent(),this.validateAsyncId(e.gameObject.id,i)?[3,3]:[2];case 2:throw c.sent(),new Error("mask resource load error");case 3:return e.type===p.Sprite?(o=e.resource+"_s|r|c_"+e.spriteName,a=n.instance[o],r.image=a):r.image=n.data.image,r.sprite.width=e.style.width,r.sprite.height=e.style.height,r.sprite.position.x=e.style.x,r.sprite.position.y=e.style.y,[2]}}))}))},i.systemName="Mask",i=function(e,t,r,n){var i,o=arguments.length,a=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,r,n);else for(var c=e.length-1;c>=0;c--)(i=e[c])&&(a=(o<3?i(a):o>3?i(t,r,a):i(t,r))||a);return o>3&&a&&Object.defineProperty(t,r,a),a}([t.decorators.componentObserver({Mask:["type",{prop:["style"],deep:!0},"resource","spriteName"]})],i),i}(r.Renderer),f=y;return e.Mask=u,e.MaskSystem=f,Object.defineProperty(e,"__esModule",{value:!0}),e}({},EVA,EVA.plugin.renderer,EVA.rendererAdapter);window.EVA.plugin.renderer.mask=window.EVA.plugin.renderer.mask||_EVA_IIFE_mask;

package/dist/plugin-renderer-mask.cjs.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var eva_js = require('@eva/eva.js');
-var inspectorDecorator = require('@eva/inspector-decorator');
 var pluginRenderer = require('@eva/plugin-renderer');
 var rendererAdapter = require('@eva/renderer-adapter');
 
@@ -43,10 +42,6 @@ function __decorate(decorators, target, key, desc) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-
 function __awaiter(thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -141,14 +136,6 @@ var Mask$2 = (function (_super) {
         Object.assign(this, obj);
     };
     Mask.componentName = 'Mask';
-    __decorate([
-        inspectorDecorator.Field(),
-        __metadata("design:type", String)
-    ], Mask.prototype, "resource", void 0);
-    __decorate([
-        inspectorDecorator.Field(),
-        __metadata("design:type", String)
-    ], Mask.prototype, "spriteName", void 0);
     return Mask;
 }(eva_js.Component));
 var Mask$3 = Mask$2;
@@ -261,9 +248,11 @@ var Mask = (function (_super) {
         var component = changed.component;
         if (changed.prop.prop[0] === 'type') {
             this.changedCache[changed.gameObject.id] = true;
-            if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1) {
+            if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1 ||
+                component._lastType !== component.type) {
                 this.remove(changed);
                 this.add(changed);
+                component._lastType = component.type;
             }
             else {
                 this.redrawGraphics(changed);

package/dist/plugin-renderer-mask.cjs.prod.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/inspector-decorator"),r=require("@eva/plugin-renderer"),n=require("@eva/renderer-adapter"),i=function(e,t){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])})(e,t)};function o(e,t){function r(){this.constructor=e}i(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function a(e,t,r,n){var i,o=arguments.length,a=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,r,n);else for(var c=e.length-1;c>=0;c--)(i=e[c])&&(a=(o<3?i(a):o>3?i(t,r,a):i(t,r))||a);return o>3&&a&&Object.defineProperty(t,r,a),a}function c(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function s(e,t){var r,n,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function c(o){return function(c){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;a;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return a.label++,{value:o[1],done:!1};case 5:a.label++,n=o[1],o=[0];continue;case 7:o=a.ops.pop(),a.trys.pop();continue;default:if(!(i=a.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1];break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o;break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o);break}i[2]&&a.ops.pop(),a.trys.pop();continue}o=t.call(e,a)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,c])}}}function p(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,i,o=r.call(e),a=[];try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a}exports.MASK_TYPE=void 0,function(e){e.Circle="Circle",e.Ellipse="Ellipse",e.Rect="Rect",e.RoundedRect="RoundedRect",e.Polygon="Polygon",e.Img="Img",e.Sprite="Sprite"}(exports.MASK_TYPE||(exports.MASK_TYPE={}));var l,u=function(e){function r(){var t=null!==e&&e.apply(this,arguments)||this;return t.style={},t.resource="",t.spriteName="",t}return o(r,e),r.prototype.init=function(e){Object.assign(this,e)},r.componentName="Mask",a([t.Field(),c("design:type",String)],r.prototype,"resource",void 0),a([t.Field(),c("design:type",String)],r.prototype,"spriteName",void 0),r}(e.Component),h={Circle:["x","y","radius"],Ellipse:["x","y","width","height"],Rect:["x","y","width","height"],RoundedRect:["x","y","width","height","radius"],Polygon:["paths"]},y={Circle:"drawCircle",Ellipse:"drawEllipse",Rect:"drawRect",RoundedRect:"drawRoundedRect",Polygon:"drawPolygon"};!function(e){e.Circle="Circle",e.Ellipse="Ellipse",e.Rect="Rect",e.RoundedRect="RoundedRect",e.Polygon="Polygon",e.Img="Img",e.Sprite="Sprite"}(l||(l={}));var d=function(t){function i(){var e=null!==t&&t.apply(this,arguments)||this;return e.name="Mask",e.changedCache={},e.maskSpriteCache={},e}return o(i,t),i.prototype.init=function(){this.renderSystem=this.game.getSystem(r.RendererSystem),this.renderSystem.rendererManager.register(this)},i.prototype.rendererUpdate=function(){this.changedCache={}},i.prototype.componentChanged=function(t){if("Mask"===t.component.name)switch(t.type){case e.OBSERVER_TYPE.ADD:this.add(t);break;case e.OBSERVER_TYPE.REMOVE:this.remove(t);break;case e.OBSERVER_TYPE.CHANGE:this.change(t)}},i.prototype.add=function(e){var t,r=e.component;if(!(r.type in l))throw new Error("no have Mask type: "+r.type);if(!r.style)throw new Error("no have Mask style: "+r.type);switch(r.type){case l.Circle:case l.Ellipse:case l.Rect:case l.RoundedRect:case l.Polygon:t=this.createGraphics(r);break;case l.Img:case l.Sprite:t=this.createSprite(r)}if(!t)throw new Error("no have mask instance, check your mask params: "+r.type);var n=this.containerManager.getContainer(e.gameObject.id);n.mask=t,n.addChild(t)},i.prototype.remove=function(e){var t=this.containerManager.getContainer(e.gameObject.id);t.removeChild(t.mask),t.mask.destroy({children:!0}),t.mask=null,delete this.maskSpriteCache[e.gameObject.id]},i.prototype.change=function(e){if(!this.changedCache[e.gameObject.id]){var t=e.component;"type"===e.prop.prop[0]?(this.changedCache[e.gameObject.id]=!0,[l.Sprite,l.Img].indexOf(t.type)>-1?(this.remove(e),this.add(e)):this.redrawGraphics(e)):"style"===e.prop.prop[0]?[l.Sprite,l.Img].indexOf(t.type)>-1?this.changeSpriteStyle(t):this.redrawGraphics(e):("resource"===e.prop.prop[0]||"spriteName"===e.prop.prop[0])&&(this.changedCache[e.gameObject.id]=!0,this.changeSprite(t))}},i.prototype.createGraphics=function(e){var t=new n.Graphics;return this.draw(t,e),t},i.prototype.redrawGraphics=function(e){var t=this.containerManager.getContainer(e.gameObject.id).mask;t.clear(),this.draw(t,e.component)},i.prototype.draw=function(e,t){var r,n,i=[];try{for(var o=function(e){var t="function"==typeof Symbol&&e[Symbol.iterator],r=0;return t?t.call(e):{next:function(){return e&&r>=e.length&&(e=void 0),{value:e&&e[r++],done:!e}}}}(h[t.type]),a=o.next();!a.done;a=o.next()){var c=a.value;i.push(t.style[c])}}catch(e){r={error:e}}finally{try{a&&!a.done&&(n=o.return)&&n.call(o)}finally{if(r)throw r.error}}e.beginFill(0,1),e[y[t.type]].apply(e,function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(p(arguments[t]));return e}(i)),e.endFill()},i.prototype.createSprite=function(e){var t=new n.Sprite(null);return this.maskSpriteCache[e.gameObject.id]=t,this.setSprite(e,t),t.sprite},i.prototype.changeSpriteStyle=function(e){var t=this.maskSpriteCache[e.gameObject.id];t.sprite.width=e.style.width,t.sprite.height=e.style.height,t.sprite.position.x=e.style.x,t.sprite.position.y=e.style.y},i.prototype.changeSprite=function(e){var t=this.maskSpriteCache[e.gameObject.id];this.setSprite(e,t)},i.prototype.setSprite=function(t,r){return n=this,i=void 0,a=function(){var n,i,o,a;return s(this,(function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),i=this.increaseAsyncId(t.gameObject.id),[4,e.resource.getResource(t.resource)];case 1:return n=c.sent(),this.validateAsyncId(t.gameObject.id,i)?[3,3]:[2];case 2:throw c.sent(),new Error("mask resource load error");case 3:return t.type===l.Sprite?(o=t.resource+"_s|r|c_"+t.spriteName,a=n.instance[o],r.image=a):r.image=n.data.image,r.sprite.width=t.style.width,r.sprite.height=t.style.height,r.sprite.position.x=t.style.x,r.sprite.position.y=t.style.y,[2]}}))},new((o=void 0)||(o=Promise))((function(e,t){function r(e){try{s(a.next(e))}catch(e){t(e)}}function c(e){try{s(a.throw(e))}catch(e){t(e)}}function s(t){t.done?e(t.value):new o((function(e){e(t.value)})).then(r,c)}s((a=a.apply(n,i||[])).next())}));var n,i,o,a},i.systemName="Mask",i=a([e.decorators.componentObserver({Mask:["type",{prop:["style"],deep:!0},"resource","spriteName"]})],i)}(r.Renderer);exports.Mask=u,exports.MaskSystem=d;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@eva/eva.js"),t=require("@eva/plugin-renderer"),r=require("@eva/renderer-adapter"),n=function(e,t){return n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])},n(e,t)};function i(e,t){function r(){this.constructor=e}n(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function o(e,t){var r,n,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function c(o){return function(c){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;a;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return a.label++,{value:o[1],done:!1};case 5:a.label++,n=o[1],o=[0];continue;case 7:o=a.ops.pop(),a.trys.pop();continue;default:if(!(i=a.trys,(i=i.length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1];break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o;break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o);break}i[2]&&a.ops.pop(),a.trys.pop();continue}o=t.call(e,a)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,c])}}}function a(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,i,o=r.call(e),a=[];try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a}exports.MASK_TYPE=void 0,function(e){e.Circle="Circle",e.Ellipse="Ellipse",e.Rect="Rect",e.RoundedRect="RoundedRect",e.Polygon="Polygon",e.Img="Img",e.Sprite="Sprite"}(exports.MASK_TYPE||(exports.MASK_TYPE={}));var c,s=function(e){function t(){var t=null!==e&&e.apply(this,arguments)||this;return t.style={},t.resource="",t.spriteName="",t}return i(t,e),t.prototype.init=function(e){Object.assign(this,e)},t.componentName="Mask",t}(e.Component),p=s,l={Circle:["x","y","radius"],Ellipse:["x","y","width","height"],Rect:["x","y","width","height"],RoundedRect:["x","y","width","height","radius"],Polygon:["paths"]},h={Circle:"drawCircle",Ellipse:"drawEllipse",Rect:"drawRect",RoundedRect:"drawRoundedRect",Polygon:"drawPolygon"};!function(e){e.Circle="Circle",e.Ellipse="Ellipse",e.Rect="Rect",e.RoundedRect="RoundedRect",e.Polygon="Polygon",e.Img="Img",e.Sprite="Sprite"}(c||(c={}));var u=function(n){function s(){var e=null!==n&&n.apply(this,arguments)||this;return e.name="Mask",e.changedCache={},e.maskSpriteCache={},e}return i(s,n),s.prototype.init=function(){this.renderSystem=this.game.getSystem(t.RendererSystem),this.renderSystem.rendererManager.register(this)},s.prototype.rendererUpdate=function(){this.changedCache={}},s.prototype.componentChanged=function(t){if("Mask"===t.component.name)switch(t.type){case e.OBSERVER_TYPE.ADD:this.add(t);break;case e.OBSERVER_TYPE.REMOVE:this.remove(t);break;case e.OBSERVER_TYPE.CHANGE:this.change(t)}},s.prototype.add=function(e){var t,r=e.component;if(!(r.type in c))throw new Error("no have Mask type: "+r.type);if(!r.style)throw new Error("no have Mask style: "+r.type);switch(r.type){case c.Circle:case c.Ellipse:case c.Rect:case c.RoundedRect:case c.Polygon:t=this.createGraphics(r);break;case c.Img:case c.Sprite:t=this.createSprite(r)}if(!t)throw new Error("no have mask instance, check your mask params: "+r.type);var n=this.containerManager.getContainer(e.gameObject.id);n.mask=t,n.addChild(t)},s.prototype.remove=function(e){var t=this.containerManager.getContainer(e.gameObject.id);t.removeChild(t.mask),t.mask.destroy({children:!0}),t.mask=null,delete this.maskSpriteCache[e.gameObject.id]},s.prototype.change=function(e){if(!this.changedCache[e.gameObject.id]){var t=e.component;"type"===e.prop.prop[0]?(this.changedCache[e.gameObject.id]=!0,[c.Sprite,c.Img].indexOf(t.type)>-1||t._lastType!==t.type?(this.remove(e),this.add(e),t._lastType=t.type):this.redrawGraphics(e)):"style"===e.prop.prop[0]?[c.Sprite,c.Img].indexOf(t.type)>-1?this.changeSpriteStyle(t):this.redrawGraphics(e):("resource"===e.prop.prop[0]||"spriteName"===e.prop.prop[0])&&(this.changedCache[e.gameObject.id]=!0,this.changeSprite(t))}},s.prototype.createGraphics=function(e){var t=new r.Graphics;return this.draw(t,e),t},s.prototype.redrawGraphics=function(e){var t=this.containerManager.getContainer(e.gameObject.id).mask;t.clear(),this.draw(t,e.component)},s.prototype.draw=function(e,t){var r,n,i=[];try{for(var o=function(e){var t="function"==typeof Symbol&&e[Symbol.iterator],r=0;return t?t.call(e):{next:function(){return e&&r>=e.length&&(e=void 0),{value:e&&e[r++],done:!e}}}}(l[t.type]),c=o.next();!c.done;c=o.next()){var s=c.value;i.push(t.style[s])}}catch(e){r={error:e}}finally{try{c&&!c.done&&(n=o.return)&&n.call(o)}finally{if(r)throw r.error}}e.beginFill(0,1),e[h[t.type]].apply(e,function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(a(arguments[t]));return e}(i)),e.endFill()},s.prototype.createSprite=function(e){var t=new r.Sprite(null);return this.maskSpriteCache[e.gameObject.id]=t,this.setSprite(e,t),t.sprite},s.prototype.changeSpriteStyle=function(e){var t=this.maskSpriteCache[e.gameObject.id];t.sprite.width=e.style.width,t.sprite.height=e.style.height,t.sprite.position.x=e.style.x,t.sprite.position.y=e.style.y},s.prototype.changeSprite=function(e){var t=this.maskSpriteCache[e.gameObject.id];this.setSprite(e,t)},s.prototype.setSprite=function(t,r){return n=this,i=void 0,s=function(){var n,i,a,s;return o(this,(function(o){switch(o.label){case 0:return o.trys.push([0,2,,3]),i=this.increaseAsyncId(t.gameObject.id),[4,e.resource.getResource(t.resource)];case 1:return n=o.sent(),this.validateAsyncId(t.gameObject.id,i)?[3,3]:[2];case 2:throw o.sent(),new Error("mask resource load error");case 3:return t.type===c.Sprite?(a=t.resource+"_s|r|c_"+t.spriteName,s=n.instance[a],r.image=s):r.image=n.data.image,r.sprite.width=t.style.width,r.sprite.height=t.style.height,r.sprite.position.x=t.style.x,r.sprite.position.y=t.style.y,[2]}}))},new((a=void 0)||(a=Promise))((function(e,t){function r(e){try{c(s.next(e))}catch(e){t(e)}}function o(e){try{c(s.throw(e))}catch(e){t(e)}}function c(t){t.done?e(t.value):new a((function(e){e(t.value)})).then(r,o)}c((s=s.apply(n,i||[])).next())}));var n,i,a,s},s.systemName="Mask",s=function(e,t,r,n){var i,o=arguments.length,a=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,r,n);else for(var c=e.length-1;c>=0;c--)(i=e[c])&&(a=(o<3?i(a):o>3?i(t,r,a):i(t,r))||a);return o>3&&a&&Object.defineProperty(t,r,a),a}([e.decorators.componentObserver({Mask:["type",{prop:["style"],deep:!0},"resource","spriteName"]})],s),s}(t.Renderer);exports.Mask=p,exports.MaskSystem=u;

package/dist/plugin-renderer-mask.d.ts

@@ -11,6 +11,8 @@ import { Sprite } from '@eva/renderer-adapter';
 
 export declare class Mask extends Component<MaskParams> {
     static componentName: string;
+    _lastType: MaskParams['type'];
+    mask_type: string;
     type: MaskParams['type'];
     style?: MaskParams['style'];
     resource?: string;

package/dist/plugin-renderer-mask.esm.js

@@ -1,5 +1,4 @@
 import { Component, OBSERVER_TYPE, decorators, resource } from '@eva/eva.js';
-import { Field } from '@eva/inspector-decorator';
 import { RendererSystem, Renderer } from '@eva/plugin-renderer';
 import { Graphics, Sprite } from '@eva/renderer-adapter';
 
@@ -39,10 +38,6 @@ function __decorate(decorators, target, key, desc) {
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-
 function __awaiter(thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -137,14 +132,6 @@ var Mask$2 = (function (_super) {
         Object.assign(this, obj);
     };
     Mask.componentName = 'Mask';
-    __decorate([
-        Field(),
-        __metadata("design:type", String)
-    ], Mask.prototype, "resource", void 0);
-    __decorate([
-        Field(),
-        __metadata("design:type", String)
-    ], Mask.prototype, "spriteName", void 0);
     return Mask;
 }(Component));
 var Mask$3 = Mask$2;
@@ -257,9 +244,11 @@ var Mask = (function (_super) {
         var component = changed.component;
         if (changed.prop.prop[0] === 'type') {
             this.changedCache[changed.gameObject.id] = true;
-            if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1) {
+            if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1 ||
+                component._lastType !== component.type) {
                 this.remove(changed);
                 this.add(changed);
+                component._lastType = component.type;
             }
             else {
                 this.redrawGraphics(changed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-renderer-mask",
-  "version": "1.2.7-editor.1",
+  "version": "1.2.7-editor.12",
   "description": "@eva/plugin-renderer-mask",
   "main": "index.js",
   "module": "dist/plugin-renderer-mask.esm.js",
@@ -18,10 +18,10 @@
   "license": "MIT",
   "homepage": "https://eva.js.org",
   "dependencies": {
-    "@eva/inspector-decorator": "0.1.0-alpha.1",
-    "@eva/plugin-renderer": "1.2.7-editor.1",
-    "@eva/renderer-adapter": "1.2.7-editor.1",
-    "@eva/eva.js": "1.2.7-editor.1",
+    "@eva/inspector-decorator": "0.1.0-alpha.3",
+    "@eva/plugin-renderer": "1.2.7-editor.12",
+    "@eva/renderer-adapter": "1.2.7-editor.12",
+    "@eva/eva.js": "1.2.7-editor.12",
     "pixi.js": "^4.8.7"
   }
 }

package/dist/miniprogram.js

@@ -1,313 +0,0 @@
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-import { __extends, __decorate, __metadata, __values, __spread, __awaiter, __generator } from 'tslib';
-import { Component, OBSERVER_TYPE, resource, decorators } from '@eva/eva.js/dist/miniprogram';
-import { Field } from '@eva/inspector-decorator';
-import { RendererSystem, Renderer } from '@eva/plugin-renderer/dist/miniprogram';
-import { Graphics, Sprite } from '@eva/renderer-adapter/dist/miniprogram';
-var MASK_TYPE$1;
-
-(function (MASK_TYPE) {
-  MASK_TYPE["Circle"] = "Circle";
-  MASK_TYPE["Ellipse"] = "Ellipse";
-  MASK_TYPE["Rect"] = "Rect";
-  MASK_TYPE["RoundedRect"] = "RoundedRect";
-  MASK_TYPE["Polygon"] = "Polygon";
-  MASK_TYPE["Img"] = "Img";
-  MASK_TYPE["Sprite"] = "Sprite";
-})(MASK_TYPE$1 || (MASK_TYPE$1 = {}));
-
-var Mask$2 = function (_super) {
-  __extends(Mask, _super);
-
-  function Mask() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
-
-    _this.style = {};
-    _this.resource = '';
-    _this.spriteName = '';
-    return _this;
-  }
-
-  Mask.prototype.init = function (obj) {
-    _extends(this, obj);
-  };
-
-  Mask.componentName = 'Mask';
-
-  __decorate([Field(), __metadata("design:type", String)], Mask.prototype, "resource", void 0);
-
-  __decorate([Field(), __metadata("design:type", String)], Mask.prototype, "spriteName", void 0);
-
-  return Mask;
-}(Component);
-
-var Mask$3 = Mask$2;
-var resourceKeySplit = '_s|r|c_';
-var propertyForGraphics = {
-  Circle: ['x', 'y', 'radius'],
-  Ellipse: ['x', 'y', 'width', 'height'],
-  Rect: ['x', 'y', 'width', 'height'],
-  RoundedRect: ['x', 'y', 'width', 'height', 'radius'],
-  Polygon: ['paths']
-};
-var functionForGraphics = {
-  Circle: 'drawCircle',
-  Ellipse: 'drawEllipse',
-  Rect: 'drawRect',
-  RoundedRect: 'drawRoundedRect',
-  Polygon: 'drawPolygon'
-};
-var MASK_TYPE;
-
-(function (MASK_TYPE) {
-  MASK_TYPE["Circle"] = "Circle";
-  MASK_TYPE["Ellipse"] = "Ellipse";
-  MASK_TYPE["Rect"] = "Rect";
-  MASK_TYPE["RoundedRect"] = "RoundedRect";
-  MASK_TYPE["Polygon"] = "Polygon";
-  MASK_TYPE["Img"] = "Img";
-  MASK_TYPE["Sprite"] = "Sprite";
-})(MASK_TYPE || (MASK_TYPE = {}));
-
-var Mask = function (_super) {
-  __extends(Mask, _super);
-
-  function Mask() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
-
-    _this.name = 'Mask';
-    _this.changedCache = {};
-    _this.maskSpriteCache = {};
-    return _this;
-  }
-
-  Mask.prototype.init = function () {
-    this.renderSystem = this.game.getSystem(RendererSystem);
-    this.renderSystem.rendererManager.register(this);
-  };
-
-  Mask.prototype.rendererUpdate = function () {
-    this.changedCache = {};
-  };
-
-  Mask.prototype.componentChanged = function (changed) {
-    if (changed.component.name !== 'Mask') return;
-
-    switch (changed.type) {
-      case OBSERVER_TYPE.ADD:
-        this.add(changed);
-        break;
-
-      case OBSERVER_TYPE.REMOVE:
-        this.remove(changed);
-        break;
-
-      case OBSERVER_TYPE.CHANGE:
-        this.change(changed);
-        break;
-    }
-  };
-
-  Mask.prototype.add = function (changed) {
-    var component = changed.component;
-
-    if (!(component.type in MASK_TYPE)) {
-      throw new Error('no have Mask type: ' + component.type);
-    }
-
-    if (!component.style) {
-      throw new Error('no have Mask style: ' + component.type);
-    }
-
-    var mask;
-
-    switch (component.type) {
-      case MASK_TYPE.Circle:
-        mask = this.createGraphics(component);
-        break;
-
-      case MASK_TYPE.Ellipse:
-        mask = this.createGraphics(component);
-        break;
-
-      case MASK_TYPE.Rect:
-        mask = this.createGraphics(component);
-        break;
-
-      case MASK_TYPE.RoundedRect:
-        mask = this.createGraphics(component);
-        break;
-
-      case MASK_TYPE.Polygon:
-        mask = this.createGraphics(component);
-        break;
-
-      case MASK_TYPE.Img:
-        mask = this.createSprite(component);
-        break;
-
-      case MASK_TYPE.Sprite:
-        mask = this.createSprite(component);
-        break;
-    }
-
-    if (!mask) {
-      throw new Error('no have mask instance, check your mask params: ' + component.type);
-    }
-
-    var container = this.containerManager.getContainer(changed.gameObject.id);
-    container.mask = mask;
-    container.addChild(mask);
-  };
-
-  Mask.prototype.remove = function (changed) {
-    var container = this.containerManager.getContainer(changed.gameObject.id);
-    container.removeChild(container.mask);
-    container.mask.destroy({
-      children: true
-    });
-    container.mask = null;
-    delete this.maskSpriteCache[changed.gameObject.id];
-  };
-
-  Mask.prototype.change = function (changed) {
-    if (this.changedCache[changed.gameObject.id]) return;
-    var component = changed.component;
-
-    if (changed.prop.prop[0] === 'type') {
-      this.changedCache[changed.gameObject.id] = true;
-
-      if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1) {
-        this.remove(changed);
-        this.add(changed);
-      } else {
-        this.redrawGraphics(changed);
-      }
-    } else if (changed.prop.prop[0] === 'style') {
-      if ([MASK_TYPE.Sprite, MASK_TYPE.Img].indexOf(component.type) > -1) {
-        this.changeSpriteStyle(component);
-      } else {
-        this.redrawGraphics(changed);
-      }
-    } else if (changed.prop.prop[0] === 'resource') {
-      this.changedCache[changed.gameObject.id] = true;
-      this.changeSprite(component);
-    } else if (changed.prop.prop[0] === 'spriteName') {
-      this.changedCache[changed.gameObject.id] = true;
-      this.changeSprite(component);
-    }
-  };
-
-  Mask.prototype.createGraphics = function (component) {
-    var graphics = new Graphics();
-    this.draw(graphics, component);
-    return graphics;
-  };
-
-  Mask.prototype.redrawGraphics = function (changed) {
-    var container = this.containerManager.getContainer(changed.gameObject.id);
-    var graphics = container.mask;
-    graphics.clear();
-    this.draw(graphics, changed.component);
-  };
-
-  Mask.prototype.draw = function (graphics, component) {
-    var e_1, _a;
-
-    var params = [];
-
-    try {
-      for (var _b = __values(propertyForGraphics[component.type]), _c = _b.next(); !_c.done; _c = _b.next()) {
-        var key = _c.value;
-        params.push(component.style[key]);
-      }
-    } catch (e_1_1) {
-      e_1 = {
-        error: e_1_1
-      };
-    } finally {
-      try {
-        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-      } finally {
-        if (e_1) throw e_1.error;
-      }
-    }
-
-    graphics.beginFill(0x000000, 1);
-    graphics[functionForGraphics[component.type]].apply(graphics, __spread(params));
-    graphics.endFill();
-  };
-
-  Mask.prototype.createSprite = function (component) {
-    var sprite = new Sprite(null);
-    this.maskSpriteCache[component.gameObject.id] = sprite;
-    this.setSprite(component, sprite);
-    return sprite.sprite;
-  };
-
-  Mask.prototype.changeSpriteStyle = function (component) {
-    var sprite = this.maskSpriteCache[component.gameObject.id];
-    sprite.sprite.width = component.style.width;
-    sprite.sprite.height = component.style.height;
-    sprite.sprite.position.x = component.style.x;
-    sprite.sprite.position.y = component.style.y;
-  };
-
-  Mask.prototype.changeSprite = function (component) {
-    var sprite = this.maskSpriteCache[component.gameObject.id];
-    this.setSprite(component, sprite);
-  };
-
-  Mask.prototype.setSprite = function (component, sprite) {
-    return __awaiter(this, void 0, void 0, function () {
-      var res, asyncId, img, texture;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            _a.trys.push([0, 2,, 3]);
-
-            asyncId = this.increaseAsyncId(component.gameObject.id);
-            return [4, resource.getResource(component.resource)];
-
-          case 1:
-            res = _a.sent();
-            if (!this.validateAsyncId(component.gameObject.id, asyncId)) return [2];
-            return [3, 3];
-
-          case 2:
-            _a.sent();
-
-            throw new Error('mask resource load error');
-
-          case 3:
-            if (component.type === MASK_TYPE.Sprite) {
-              img = component.resource + resourceKeySplit + component.spriteName;
-              texture = res.instance[img];
-              sprite.image = texture;
-            } else {
-              sprite.image = res.data.image;
-            }
-
-            sprite.sprite.width = component.style.width;
-            sprite.sprite.height = component.style.height;
-            sprite.sprite.position.x = component.style.x;
-            sprite.sprite.position.y = component.style.y;
-            return [2];
-        }
-      });
-    });
-  };
-
-  Mask.systemName = 'Mask';
-  Mask = __decorate([decorators.componentObserver({
-    Mask: ['type', {
-      prop: ['style'],
-      deep: true
-    }, 'resource', 'spriteName']
-  })], Mask);
-  return Mask;
-}(Renderer);
-
-var Mask$1 = Mask;
-export { MASK_TYPE$1 as MASK_TYPE, Mask$3 as Mask, Mask$1 as MaskSystem };