mage-engine 3.17.3 → 3.17.4

package/dist/mage.js

@@ -57203,7 +57203,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name = "mage-engine";
-var version = "3.17.3";
+var version = "3.17.4";
 var description = "A WebGL Javascript Game Engine, built on top of THREE.js and many other libraries.";
 var main = "dist/mage.js";
 var author$1 = {
@@ -60303,10 +60303,10 @@ var Element = /*#__PURE__*/function (_Entity) {
 
   var _super = _createSuper(Element);
 
-  function Element(geometry, material) {
+  function Element() {
     var _this;
 
-    var _options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var _options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
     _classCallCheck(this, Element);
 
@@ -60517,7 +60517,10 @@ var Element = /*#__PURE__*/function (_Entity) {
     });
 
     var _options$name = _options.name,
-        _name = _options$name === void 0 ? "default_".concat(Math.random()) : _options$name;
+        _name = _options$name === void 0 ? "default_".concat(Math.random()) : _options$name,
+        geometry = _options.geometry,
+        material = _options.material,
+        _body = _options.body;
 
     _this.textures = {};
     _this.opacity = 1;
@@ -60529,7 +60532,8 @@ var Element = /*#__PURE__*/function (_Entity) {
 
     _this.setBody({
       geometry: geometry,
-      material: material
+      material: material,
+      body: _body
     });
 
     _this.colliders = [];
@@ -61156,7 +61160,7 @@ var Element = /*#__PURE__*/function (_Entity) {
       color2: color2,
       name: "GridHelper_".concat(Math.random())
     };
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
     var body = new GridHelper(size, division, color1, color2);
 
     _this.setBody({
@@ -61188,7 +61192,7 @@ var Element = /*#__PURE__*/function (_Entity) {
 
     _classCallCheck(this, Cube);
 
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
     var geometry = new BoxGeometry(side, side, side);
     var material = new MeshBasicMaterial(_objectSpread2$1({
       color: color,
@@ -61220,7 +61224,7 @@ var Element = /*#__PURE__*/function (_Entity) {
 
     _classCallCheck(this, Sphere);
 
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
     var segments = 32;
     var geometry = new SphereGeometry(radius, segments, segments);
     var material = new MeshBasicMaterial(_objectSpread2$1({
@@ -61255,7 +61259,7 @@ var Element = /*#__PURE__*/function (_Entity) {
 
     _classCallCheck(this, Cylinder);
 
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
     var segments = 32;
     var geometry = new CylinderGeometry(radiusTop, radiusBottom, height, segments);
     var material = new MeshBasicMaterial(_objectSpread2$1({
@@ -61291,7 +61295,7 @@ var Line = /*#__PURE__*/function (_Element) {
 
     _classCallCheck(this, Line);
 
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
 
     _defineProperty$1(_assertThisInitialized(_this), "updatePoints", function (points) {
       var vectors = points.map(function (_ref) {
@@ -61425,7 +61429,7 @@ var Plane = /*#__PURE__*/function (_Element) {
 
     _classCallCheck(this, Plane);
 
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
     var _options$color = options.color,
         color = _options$color === void 0 ? 0xfffffff : _options$color,
         _options$transparent = options.transparent,
@@ -61485,7 +61489,7 @@ var Plane = /*#__PURE__*/function (_Element) {
 
     _classCallCheck(this, Box);
 
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
     var geometry = new BoxGeometry(width, height, depth);
     var material = new MeshBasicMaterial(_objectSpread2$1({
       color: color,
@@ -61525,7 +61529,7 @@ var Sprite = /*#__PURE__*/function (_Element) {
 
     _classCallCheck(this, Sprite);
 
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
 
     var _options$anisotropy = options.anisotropy,
         anisotropy = _options$anisotropy === void 0 ? 1 : _options$anisotropy,
@@ -72549,10 +72553,9 @@ var Models = function Models() {
         model = SkeletonUtils.clone(scene);
       }
 
-      var element = new Element(null, null, elementOptions);
-      element.setBody({
+      var element = new Element(_objectSpread2$1({
         body: prepareModel(model)
-      });
+      }, elementOptions));
       element.setEntityType(ENTITY_TYPES.MODEL);
 
       if (hasAnimations(animations)) {
@@ -73684,13 +73687,21 @@ var MeshLoader = /*#__PURE__*/function (_Loader) {
     }
   }, {
     key: "loadMesh",
-    value: function loadMesh(parsedMesh, scripts, texture, elementOptions) {
+    value: function loadMesh(_ref2, scripts, texture, elementOptions) {
+      var geometry = _ref2.geometry,
+          material = _ref2.material,
+          position = _ref2.position,
+          rotation = _ref2.rotation,
+          scale = _ref2.scale;
       var _this$options$scriptE = this.options.scriptEnabled,
           scriptEnabled = _this$options$scriptE === void 0 ? true : _this$options$scriptE;
-      var element = new Element(parsedMesh.geometry, parsedMesh.material, elementOptions);
-      element.setPosition(_objectSpread2$1({}, parsedMesh.position));
-      element.setRotation(_objectSpread2$1({}, parsedMesh.rotation));
-      element.setScale(_objectSpread2$1({}, parsedMesh.scale));
+      var element = new Element(_objectSpread2$1({
+        geometry: geometry,
+        material: material
+      }, elementOptions));
+      element.setPosition(_objectSpread2$1({}, position));
+      element.setRotation(_objectSpread2$1({}, rotation));
+      element.setScale(_objectSpread2$1({}, scale));
 
       if (scripts && scripts.length) {
         element.addScripts(scripts.names, scripts.options, scriptEnabled);
@@ -74028,7 +74039,10 @@ var SunLight = /*#__PURE__*/function (_Light) {
         color: 0xeeeeee,
         wireframe: true
       });
-      var target = new Element(geometry, material);
+      var target = new Element({
+        geometry: geometry,
+        material: material
+      });
       target.position(initialPosition);
       return target;
     }
@@ -74439,11 +74453,11 @@ var LightLoader$1 = new LightLoader();var Pass = /*#__PURE__*/function () {
 
   _createClass(Pass, [{
     key: "setSize",
-    value: function setSize(width, height) {}
+    value: function setSize() {}
   }, {
     key: "render",
-    value: function render(renderer, writeBuffer, readBuffer, delta, maskActive) {
-      console.error('Pass: .render() must be implemented in derived pass.');
+    value: function render() {
+      console.error('THREE.Pass: .render() must be implemented in derived pass.');
     }
   }]);
 
@@ -74498,7 +74512,7 @@ var FullScreenQuad = /*#__PURE__*/function () {
     _classCallCheck(this, ShaderPass);
 
     _this = _super.call(this);
-    _this.textureID = textureID !== undefined ? textureID : "tDiffuse";
+    _this.textureID = textureID !== undefined ? textureID : 'tDiffuse';
 
     if (shader instanceof ShaderMaterial) {
       _this.uniforms = shader.uniforms;
@@ -74519,7 +74533,9 @@ var FullScreenQuad = /*#__PURE__*/function () {
 
   _createClass(ShaderPass, [{
     key: "render",
-    value: function render(renderer, writeBuffer, readBuffer) {
+    value: function render(renderer, writeBuffer, readBuffer
+    /*, deltaTime, maskActive */
+    ) {
       if (this.uniforms[this.textureID]) {
         this.uniforms[this.textureID].value = readBuffer.texture;
       }
@@ -74540,21 +74556,23 @@ var FullScreenQuad = /*#__PURE__*/function () {
 
   return ShaderPass;
 }(Pass);/**
- * @author alteredq / http://alteredqualia.com/
- *
  * Full-screen textured quad shader
  */
 var CopyShader = {
   uniforms: {
-    "tDiffuse": {
+    'tDiffuse': {
       value: null
     },
-    "opacity": {
+    'opacity': {
       value: 1.0
     }
   },
-  vertexShader: ["varying vec2 vUv;", "void main() {", "	vUv = uv;", "	gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );", "}"].join("\n"),
-  fragmentShader: ["uniform float opacity;", "uniform sampler2D tDiffuse;", "varying vec2 vUv;", "void main() {", "	vec4 texel = texture2D( tDiffuse, vUv );", "	gl_FragColor = opacity * texel;", "}"].join("\n")
+  vertexShader:
+  /* glsl */
+  "\n\n        varying vec2 vUv;\n\n        void main() {\n            vUv = uv;\n            gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n        }",
+  fragmentShader:
+  /* glsl */
+  "\n\n        uniform float opacity;\n\n        uniform sampler2D tDiffuse;\n\n        varying vec2 vUv;\n\n        void main() {\n            gl_FragColor = texture2D( tDiffuse, vUv );\n            gl_FragColor.a *= opacity;\n        }"
 };var MaskPass = /*#__PURE__*/function (_Pass) {
   _inherits(MaskPass, _Pass);
 
@@ -74576,7 +74594,9 @@ var CopyShader = {
 
   _createClass(MaskPass, [{
     key: "render",
-    value: function render(renderer, writeBuffer, readBuffer) {
+    value: function render(renderer, writeBuffer, readBuffer
+    /*, deltaTime, maskActive */
+    ) {
       var context = renderer.getContext();
       var state = renderer.state; // don't update color or depth
 
@@ -74638,7 +74658,9 @@ var CopyShader = {
 
   _createClass(ClearMaskPass, [{
     key: "render",
-    value: function render(renderer, writeBuffer, readBuffer, delta, maskActive) {
+    value: function render(renderer
+    /*, writeBuffer, readBuffer, deltaTime, maskActive */
+    ) {
       renderer.state.buffers.stencil.setLocked(false);
       renderer.state.buffers.stencil.setTest(false);
     }
@@ -74660,16 +74682,11 @@ var CopyShader = {
     this.renderer = renderer;
 
     if (renderTarget === undefined) {
-      var parameters = {
-        minFilter: LinearFilter,
-        magFilter: LinearFilter,
-        format: RGBAFormat
-      };
       var size = renderer.getSize(new Vector2());
       this._pixelRatio = renderer.getPixelRatio();
       this._width = size.width;
       this._height = size.height;
-      renderTarget = new WebGLRenderTarget(this._width * this._pixelRatio, this._height * this._pixelRatio, parameters);
+      renderTarget = new WebGLRenderTarget(this._width * this._pixelRatio, this._height * this._pixelRatio);
       renderTarget.texture.name = 'EffectComposer.rt1';
     } else {
       this._pixelRatio = 1;
@@ -74686,11 +74703,11 @@ var CopyShader = {
     this.passes = []; // dependencies
 
     if (CopyShader === undefined) {
-      console.error('EffectComposer relies on CopyShader');
+      console.error('THREE.EffectComposer relies on CopyShader');
     }
 
     if (ShaderPass === undefined) {
-      console.error('EffectComposer relies on ShaderPass');
+      console.error('THREE.EffectComposer relies on ShaderPass');
     }
 
     this.copyPass = new ShaderPass(CopyShader);
@@ -74746,12 +74763,9 @@ var CopyShader = {
 
       var currentRenderTarget = this.renderer.getRenderTarget();
       var maskActive = false;
-      var pass,
-          i,
-          il = this.passes.length;
 
-      for (i = 0; i < il; i++) {
-        pass = this.passes[i];
+      for (var i = 0, il = this.passes.length; i < il; i++) {
+        var pass = this.passes[i];
         if (pass.enabled === false) continue;
         pass.renderToScreen = this.renderToScreen && this.isLastEnabledPass(i);
         pass.render(this.renderer, this.writeBuffer, this.readBuffer, deltaTime, maskActive);
@@ -74828,13 +74842,9 @@ var CopyShader = {
 
   var _super = _createSuper(RenderPass);
 
-  function RenderPass(scene, camera) {
+  function RenderPass(scene, camera, overrideMaterial, clearColor, clearAlpha) {
     var _this;
 
-    var overrideMaterial = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-    var clearColor = arguments.length > 3 ? arguments[3] : undefined;
-    var clearAlpha = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
-
     _classCallCheck(this, RenderPass);
 
     _this = _super.call(this);
@@ -74842,7 +74852,7 @@ var CopyShader = {
     _this.camera = camera;
     _this.overrideMaterial = overrideMaterial;
     _this.clearColor = clearColor;
-    _this.clearAlpha = clearAlpha;
+    _this.clearAlpha = clearAlpha !== undefined ? clearAlpha : 0;
     _this.clear = true;
     _this.clearDepth = false;
     _this.needsSwap = false;
@@ -74852,7 +74862,9 @@ var CopyShader = {
 
   _createClass(RenderPass, [{
     key: "render",
-    value: function render(renderer, writeBuffer, readBuffer) {
+    value: function render(renderer, writeBuffer, readBuffer
+    /*, deltaTime, maskActive */
+    ) {
       var oldAutoClear = renderer.autoClear;
       renderer.autoClear = false;
       var oldClearAlpha, oldOverrideMaterial;
@@ -75319,6 +75331,9 @@ var PALETTES = {
   FRENCH: FRENCH_PALETTE
 };var MAX_EDGE_THICKNESS = 4;
 var MAX_EDGE_GLOW = 4;
+var DEFAULT_EDGE_GLOW = 0.0;
+var DEFAULT_EDGE_THICKNES = 1.0;
+var DEFAULT_EDGE_STRENGTH = 10.0;
 var BlurDirectionX = new Vector2(1.0, 0.0);
 var BlurDirectionY = new Vector2(0.0, 1.0);
 
@@ -75337,15 +75352,17 @@ var SelectiveOutline = /*#__PURE__*/function (_Pass) {
 
     var _ref$resolution = _ref.resolution,
         resolution = _ref$resolution === void 0 ? {} : _ref$resolution,
-        selectedObjects = _ref.selectedObjects,
+        _ref$selectedObjects = _ref.selectedObjects,
+        selectedObjects = _ref$selectedObjects === void 0 ? [] : _ref$selectedObjects,
         _ref$visibleEdgeColor = _ref.visibleEdgeColor,
         visibleEdgeColor = _ref$visibleEdgeColor === void 0 ? PALETTES.BASE.WHITE : _ref$visibleEdgeColor,
         _ref$hiddenEdgeColor = _ref.hiddenEdgeColor,
-        hiddenEdgeColor = _ref$hiddenEdgeColor === void 0 ? PALETTES.BASE.BLACK : _ref$hiddenEdgeColor;
+        hiddenEdgeColor = _ref$hiddenEdgeColor === void 0 ? PALETTES.BASE.WHITE : _ref$hiddenEdgeColor;
 
     _classCallCheck(this, SelectiveOutline);
 
     _this = _super.call(this);
+    _this.isPass = true;
 
     var _config$screen = Config$1.screen(),
         height = _config$screen.h,
@@ -75357,13 +75374,13 @@ var SelectiveOutline = /*#__PURE__*/function (_Pass) {
         resolutionY = _resolution$y === void 0 ? height : _resolution$y;
     _this.renderScene = Scene$1.getScene();
     _this.renderCamera = Scene$1.getCameraBody();
-    _this.selectedObjects = selectedObjects !== undefined ? selectedObjects : [];
-    _this.visibleEdgeColor = visibleEdgeColor;
-    _this.hiddenEdgeColor = hiddenEdgeColor;
-    _this.edgeGlow = 0.0;
+    _this.selectedObjects = selectedObjects;
+    _this.visibleEdgeColor = new Color$1(visibleEdgeColor);
+    _this.hiddenEdgeColor = new Color$1(hiddenEdgeColor);
+    _this.edgeGlow = DEFAULT_EDGE_GLOW;
     _this.usePatternTexture = false;
-    _this.edgeThickness = 1.0;
-    _this.edgeStrength = 3.0;
+    _this.edgeThickness = DEFAULT_EDGE_THICKNES;
+    _this.edgeStrength = DEFAULT_EDGE_STRENGTH;
     _this.downSampleRatio = 2;
     _this.pulsePeriod = 0;
     _this._visibilityCache = new Map();
@@ -75449,6 +75466,36 @@ var SelectiveOutline = /*#__PURE__*/function (_Pass) {
         return o.getBody();
       });
     }
+  }, {
+    key: "setVisibleEdgeColor",
+    value: function setVisibleEdgeColor() {
+      var color = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : PALETTES.BASE.WHITE;
+      this.visibleEdgeColor = new Color$1(color);
+    }
+  }, {
+    key: "setHiddenEdgeColor",
+    value: function setHiddenEdgeColor() {
+      var color = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : PALETTES.BASE.WHITE;
+      this.hiddenEdgeColor = new Color$1(color);
+    }
+  }, {
+    key: "setEdgeGlow",
+    value: function setEdgeGlow() {
+      var glow = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_EDGE_GLOW;
+      this.edgeGlow = glow;
+    }
+  }, {
+    key: "setEdgeStrength",
+    value: function setEdgeStrength() {
+      var strength = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_EDGE_STRENGTH;
+      this.edgeStrength = strength;
+    }
+  }, {
+    key: "setEdgeThickness",
+    value: function setEdgeThickness() {
+      var thickness = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_EDGE_THICKNES;
+      this.edgeThickness = thickness;
+    }
   }, {
     key: "dispose",
     value: function dispose() {
@@ -75617,8 +75664,8 @@ var SelectiveOutline = /*#__PURE__*/function (_Pass) {
         this.fsQuad.material = this.edgeDetectionMaterial;
         this.edgeDetectionMaterial.uniforms['maskTexture'].value = this.renderTargetMaskDownSampleBuffer.texture;
         this.edgeDetectionMaterial.uniforms['texSize'].value.set(this.renderTargetMaskDownSampleBuffer.width, this.renderTargetMaskDownSampleBuffer.height);
-        this.edgeDetectionMaterial.uniforms['visibleEdgeColor'].value = this.tempPulseColor1;
-        this.edgeDetectionMaterial.uniforms['hiddenEdgeColor'].value = this.tempPulseColor2;
+        this.edgeDetectionMaterial.uniforms['visibleEdgeColor'].value.set(this.tempPulseColor1.getHex());
+        this.edgeDetectionMaterial.uniforms['hiddenEdgeColor'].value.set(this.tempPulseColor2.getHex());
         renderer.setRenderTarget(this.renderTargetEdgeBuffer1);
         renderer.clear();
         this.fsQuad.render(renderer); // 4. Apply Blur on Half res
@@ -75701,10 +75748,10 @@ var SelectiveOutline = /*#__PURE__*/function (_Pass) {
             value: new Vector2(0.5, 0.5)
           },
           'visibleEdgeColor': {
-            value: new Vector3$1(1.0, 1.0, 1.0)
+            value: new Color$1(1.0, 1.0, 1.0)
           },
           'hiddenEdgeColor': {
-            value: new Vector3$1(1.0, 1.0, 1.0)
+            value: new Color$1(1.0, 1.0, 1.0)
           }
         },
         vertexShader: "varying vec2 vUv;\n\n                void main() {\n                    vUv = uv;\n                    gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);\n                }",
@@ -86706,7 +86753,10 @@ var SpotLight = /*#__PURE__*/function (_Light) {
         color: 0xeeeeee,
         wireframe: true
       });
-      var target = new Element(geometry, material);
+      var target = new Element({
+        geometry: geometry,
+        material: material
+      });
       target.position(initialPosition);
       return target;
     }
@@ -88135,7 +88185,7 @@ var Water = /*#__PURE__*/function (_Element) {
 
     _classCallCheck(this, Water);
 
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
 
     _defineProperty$1(_assertThisInitialized(_this), "update", function (dt) {
       _get((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(Water.prototype)), "update", _thisSuper).call(_thisSuper, dt);
@@ -88285,7 +88335,7 @@ var Sky = /*#__PURE__*/function (_Element) {
 
     _classCallCheck(this, Sky);
 
-    _this = _super.call(this, null, null, options);
+    _this = _super.call(this, options);
     var _options$scale = options.scale,
         scale = _options$scale === void 0 ? DEFAULT_SCALE : _options$scale,
         _options$turbidity = options.turbidity,
@@ -88393,7 +88443,7 @@ var Skybox = /*#__PURE__*/function (_Element) {
         texture = _options$texture === void 0 ? 'skybox' : _options$texture,
         rest = _objectWithoutProperties(options, _excluded);
 
-    _this = _super.call(this, null, null, _objectSpread2$1({
+    _this = _super.call(this, _objectSpread2$1({
       name: name,
       texture: texture
     }, rest));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mage-engine",
-    "version": "3.17.3",
+    "version": "3.17.4",
     "description": "A WebGL Javascript Game Engine, built on top of THREE.js and many other libraries.",
     "main": "dist/mage.js",
     "author": {