mage-engine 3.20.0 → 3.20.1

package/dist/mage.js

@@ -57411,7 +57411,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name = "mage-engine";
-var version$1 = "3.20.0";
+var version$1 = "3.20.1";
 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 = {
@@ -59638,7 +59638,44 @@ var prepareModel = function prepareModel(model) {
   REPEAT: 'repeat',
   NONE: false
 };
-var FUNCTIONS = _objectSpread2$1({}, Between.Easing);var easing=/*#__PURE__*/Object.freeze({__proto__:null,LOOPING:LOOPING,FUNCTIONS:FUNCTIONS});var Entity = /*#__PURE__*/function (_EventDispatcher) {
+var EASING_EVENTS = {
+  UPDATE: 'update',
+  COMPLETE: 'complete'
+};
+var FUNCTIONS = _objectSpread2$1({}, Between.Easing);
+var tweenTo = function tweenTo(origin, target) {
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  return new Promise(function (resolve) {
+    var time = options.time,
+        _options$easing = options.easing,
+        easing = _options$easing === void 0 ? FUNCTIONS.Linear.None : _options$easing,
+        _options$loop = options.loop,
+        loop = _options$loop === void 0 ? LOOPING.NONE : _options$loop,
+        _options$onUpdate = options.onUpdate,
+        onUpdate = _options$onUpdate === void 0 ? function (f) {
+      return f;
+    } : _options$onUpdate,
+        _options$repeat = options.repeat,
+        repeat = _options$repeat === void 0 ? undefined : _options$repeat;
+    var tween = new Between(origin, target).time(time).easing(easing).on(EASING_EVENTS.UPDATE, onUpdate);
+    var infinite = loop && !repeat;
+
+    var onComplete = function onComplete() {
+      return resolve(tween, infinite);
+    };
+
+    if (loop) {
+      tween.loop(loop, repeat);
+    }
+
+    if (infinite) {
+      var timeToCompleteLoop = time * 2;
+      setTimeout(onComplete, timeToCompleteLoop);
+    } else {
+      tween.on(EASING_EVENTS.COMPLETE, onComplete);
+    }
+  });
+};var easing=/*#__PURE__*/Object.freeze({__proto__:null,LOOPING:LOOPING,EASING_EVENTS:EASING_EVENTS,FUNCTIONS:FUNCTIONS,tweenTo:tweenTo});var Entity = /*#__PURE__*/function (_EventDispatcher) {
   _inherits(Entity, _EventDispatcher);
 
   var _super = _createSuper(Entity);
@@ -60292,39 +60329,31 @@ var FUNCTIONS = _objectSpread2$1({}, Between.Easing);var easing=/*#__PURE__*/Obj
 
       var scale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getScale();
       var time = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 250;
-
-      var _ref9 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-          _ref9$easing = _ref9.easing,
-          easing = _ref9$easing === void 0 ? FUNCTIONS.Linear.None : _ref9$easing,
-          _ref9$loop = _ref9.loop,
-          loop = _ref9$loop === void 0 ? LOOPING.NONE : _ref9$loop;
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
       var _this$getScale = this.getScale(),
           x = _this$getScale.x,
           y = _this$getScale.y,
           z = _this$getScale.z;
 
-      var targetScale = _objectSpread2$1({
+      var target = _objectSpread2$1({
         x: x,
         y: y,
         z: z
       }, scale);
 
-      return new Promise(function (resolve) {
-        var between = new Between({
-          x: x,
-          y: y,
-          z: z
-        }, targetScale).time(time).easing(easing);
-
-        if (loop) {
-          between.loop(loop);
-        }
+      var onUpdate = function onUpdate(value) {
+        return !_this7.isDisposed() && _this7.setScale(value);
+      };
 
-        between.on('update', function (value) {
-          return !_this7.isDisposed() && _this7.setScale(value);
-        }).on('complete', resolve);
-      });
+      return tweenTo({
+        x: x,
+        y: y,
+        z: z
+      }, target, _objectSpread2$1(_objectSpread2$1({}, options), {}, {
+        time: time,
+        onUpdate: onUpdate
+      }));
     }
   }, {
     key: "rotateTo",
@@ -60333,39 +60362,31 @@ var FUNCTIONS = _objectSpread2$1({}, Between.Easing);var easing=/*#__PURE__*/Obj
 
       var rotation = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getRotation();
       var time = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 250;
-
-      var _ref10 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-          _ref10$easing = _ref10.easing,
-          easing = _ref10$easing === void 0 ? FUNCTIONS.Linear.None : _ref10$easing,
-          _ref10$loop = _ref10.loop,
-          loop = _ref10$loop === void 0 ? LOOPING.NONE : _ref10$loop;
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
       var _this$getRotation2 = this.getRotation(),
           x = _this$getRotation2.x,
           y = _this$getRotation2.y,
           z = _this$getRotation2.z;
 
-      var targetRotation = _objectSpread2$1({
+      var target = _objectSpread2$1({
         x: x,
         y: y,
         z: z
       }, rotation);
 
-      return new Promise(function (resolve) {
-        var between = new Between({
-          x: x,
-          y: y,
-          z: z
-        }, targetRotation).time(time).easing(easing);
-
-        if (loop) {
-          between.loop(loop);
-        }
+      var onUpdate = function onUpdate(value) {
+        return !_this8.isDisposed() && _this8.setRotation(value);
+      };
 
-        between.on('update', function (value) {
-          return !_this8.isDisposed() && _this8.setRotation(value);
-        }).on('complete', resolve);
-      });
+      return tweenTo({
+        x: x,
+        y: y,
+        z: z
+      }, target, _objectSpread2$1(_objectSpread2$1({}, options), {}, {
+        time: time,
+        onUpdate: onUpdate
+      }));
     }
   }, {
     key: "goTo",
@@ -60374,39 +60395,31 @@ var FUNCTIONS = _objectSpread2$1({}, Between.Easing);var easing=/*#__PURE__*/Obj
 
       var position = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getPosition();
       var time = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 250;
-
-      var _ref11 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-          _ref11$easing = _ref11.easing,
-          easing = _ref11$easing === void 0 ? FUNCTIONS.Linear.None : _ref11$easing,
-          _ref11$loop = _ref11.loop,
-          loop = _ref11$loop === void 0 ? LOOPING.NONE : _ref11$loop;
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
       var _this$getPosition2 = this.getPosition(),
           x = _this$getPosition2.x,
           y = _this$getPosition2.y,
           z = _this$getPosition2.z;
 
-      var targetPosition = _objectSpread2$1({
+      var target = _objectSpread2$1({
         x: x,
         y: y,
         z: z
       }, position);
 
-      return new Promise(function (resolve) {
-        var between = new Between({
-          x: x,
-          y: y,
-          z: z
-        }, targetPosition).time(time).easing(easing);
-
-        if (loop) {
-          between.loop(loop);
-        }
+      var onUpdate = function onUpdate(value) {
+        return !_this9.isDisposed() && _this9.setPosition(value);
+      };
 
-        between.on('update', function (value) {
-          return !_this9.isDisposed() && _this9.setPosition(value);
-        }).on('complete', resolve);
-      });
+      return tweenTo({
+        x: x,
+        y: y,
+        z: z
+      }, target, _objectSpread2$1(_objectSpread2$1({}, options), {}, {
+        time: time,
+        onUpdate: onUpdate
+      }));
     }
   }, {
     key: "uuid",
@@ -60477,10 +60490,10 @@ var FUNCTIONS = _objectSpread2$1({}, Between.Easing);var easing=/*#__PURE__*/Obj
   }, {
     key: "mapScriptsToJSON",
     value: function mapScriptsToJSON() {
-      this.scripts.reduce(function (acc, _ref12) {
-        var name = _ref12.name,
-            _ref12$options = _ref12.options,
-            options = _ref12$options === void 0 ? {} : _ref12$options;
+      this.scripts.reduce(function (acc, _ref9) {
+        var name = _ref9.name,
+            _ref9$options = _ref9.options,
+            options = _ref9$options === void 0 ? {} : _ref9$options;
         acc.names.push(name);
         acc.options.push(options);
         return acc;

package/package.json

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