@galacean/effects-plugin-orientation-transformer 2.0.0-alpha.2 → 2.0.0-alpha.21

package/dist/index.js

@@ -3,164 +3,159 @@
  * Description: Galacean Effects player orientation transformer plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,意绮
- * Version: v2.0.0-alpha.2
+ * Version: v2.0.0-alpha.21
  */
 
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var effects = require('@galacean/effects');
+var EFFECTS = require('@galacean/effects');
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    if (typeof b !== "function" && b !== null)
-        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var __assign = function() {
-    __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 __read(o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-}
-
-function __spreadArray(to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
+function _interopNamespace(e) {
+    if (e && e.__esModule) return e;
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n["default"] = e;
+    return Object.freeze(n);
+}
+
+var EFFECTS__namespace = /*#__PURE__*/_interopNamespace(EFFECTS);
+
+function _set_prototype_of(o, p) {
+    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
+        o.__proto__ = p;
+        return o;
+    };
+    return _set_prototype_of(o, p);
+}
+
+function _inherits(subClass, superClass) {
+    if (typeof superClass !== "function" && superClass !== null) {
+        throw new TypeError("Super expression must either be null or a function");
+    }
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+        constructor: {
+            value: subClass,
+            writable: true,
+            configurable: true
+        }
+    });
+    if (superClass) _set_prototype_of(subClass, superClass);
+}
 
-var CompositionTransformerAcceler = /** @class */ (function () {
+var CompositionTransformerAcceler = /*#__PURE__*/ function() {
     function CompositionTransformerAcceler(composition) {
         this.composition = composition;
         this.targets = {};
         this.records = {};
-        this.current = {};
-        this.gammaRange = [-89, 89];
-        this.betaRange = [-80, 80];
+        this.currentPos = {};
+        this.currentRot = {};
+        this.gammaRange = [
+            -89,
+            89
+        ];
+        this.betaRange = [
+            -89,
+            89
+        ];
     }
-    CompositionTransformerAcceler.prototype.update = function (_a) {
-        var x = _a.x, y = _a.y;
-        this.currentEvent = { x: x, y: y };
+    var _proto = CompositionTransformerAcceler.prototype;
+    _proto.update = function update(param) {
+        var x = param.x, y = param.y, beta = param.beta, gamma = param.gamma;
+        this.currentEvent = {
+            x: x,
+            y: y,
+            beta: beta,
+            gamma: gamma
+        };
     };
-    CompositionTransformerAcceler.prototype.updateOrientation = function () {
+    _proto.updateOrientation = function updateOrientation() {
         var _this = this;
         var event = this.currentEvent;
         if (event) {
-            Object.getOwnPropertyNames(this.targets).forEach(function (name) {
+            Object.getOwnPropertyNames(this.targets).forEach(function(name) {
                 _this.moveLayer(name, event);
             });
         }
     };
-    CompositionTransformerAcceler.prototype.initComposition = function () {
+    _proto.initComposition = function initComposition() {
         var items = this.composition.items;
-        for (var i = 0; i < items.length; i++) {
+        for(var i = 0; i < items.length; i++){
             var item = items[i];
             var target = this.targets[item.name];
             if (target) {
                 var position = item.transform.position.toArray();
-                var currentPosition = this.current[item.name];
+                var rotation = item.transform.rotation.toArray();
+                var currentPosition = this.currentPos[item.name];
+                var currentRot = this.currentRot[item.name];
                 this.records[item.name] = {
                     item: item,
                     position: position,
+                    rotation: rotation
                 };
                 if (currentPosition) {
-                    var _a = __read(currentPosition, 3), x = _a[0], y = _a[1], z = _a[2];
-                    item.transform.setPosition(x, y, z);
+                    item.transform.setPosition(currentPosition[0], currentPosition[1], currentPosition[2]);
+                }
+                if (currentRot) {
+                    item.transform.setRotation(currentRot[0], currentRot[1], currentRot[2]);
                 }
             }
         }
     };
-    CompositionTransformerAcceler.prototype.addTarget = function (target) {
+    _proto.addTarget = function addTarget(target) {
         this.targets[target.name] = target;
     };
-    CompositionTransformerAcceler.prototype.removeTarget = function (name) {
+    _proto.removeTarget = function removeTarget(name) {
         delete this.targets[name];
         delete this.records[name];
     };
-    CompositionTransformerAcceler.prototype.moveLayer = function (name, _a) {
-        var _b;
-        var _c;
-        var x = _a.x, y = _a.y;
-        var layer = (_c = this.records[name]) === null || _c === void 0 ? void 0 : _c.item;
+    _proto.moveLayer = function moveLayer(name, param) {
+        var x = param.x, y = param.y, b = param.beta, g = param.gamma;
+        var _this_records_name;
+        var layer = (_this_records_name = this.records[name]) == null ? void 0 : _this_records_name.item;
         if (layer) {
             var initPosition = this.records[name].position;
+            var initRotation = this.records[name].rotation;
             var target = this.targets[name];
             var beta = clamp(x, this.betaRange), gamma = clamp(y, this.gammaRange);
             if (target) {
+                var _layer_transform, _layer_transform1;
                 var position = [
-                    initPosition[0] + 1.2 * mapRange((beta - this.gammaRange[0]) / (this.gammaRange[1] - this.gammaRange[0]), target.xMin, target.xMax),
-                    initPosition[1] + 1.2 * mapRange((gamma - this.betaRange[0]) / (this.betaRange[1] - this.betaRange[0]), target.yMin, target.yMax),
-                    initPosition[2],
+                    initPosition[0] + 1.2 * mapRange(normalize(beta, this.gammaRange[0], this.gammaRange[1]), target.xMin, target.xMax),
+                    initPosition[1] + 1.2 * mapRange(normalize(gamma, this.betaRange[0], this.betaRange[1]), target.yMin, target.yMax),
+                    initPosition[2]
                 ];
-                (_b = layer.transform).setPosition.apply(_b, __spreadArray([], __read(position), false));
-                this.current[name] = position.slice();
+                var br = normalize(clamp(g * 0.8, this.gammaRange), this.gammaRange[0], this.gammaRange[1]);
+                var gr = normalize(clamp(b * 0.8, this.betaRange), this.betaRange[0], this.betaRange[1]);
+                var rotation = [
+                    initRotation[0] + mapRange(gr, target.hMin, target.hMax),
+                    initRotation[1] + mapRange(br, target.vMin, target.vMax),
+                    initRotation[2]
+                ];
+                (_layer_transform = layer.transform).setPosition.apply(_layer_transform, [].concat(position));
+                (_layer_transform1 = layer.transform).setRotation.apply(_layer_transform1, [].concat(rotation));
+                this.currentPos[name] = position.slice();
+                this.currentRot[name] = rotation.slice();
             }
         }
     };
     return CompositionTransformerAcceler;
-}());
+}();
 function clamp(x, range) {
     if (x < range[0]) {
         return range[0];
-    }
-    else if (x > range[1]) {
+    } else if (x > range[1]) {
         return range[1];
     }
     return x;
@@ -168,6 +163,20 @@ function clamp(x, range) {
 function mapRange(t, min, max) {
     return min + (max - min) * t;
 }
+function normalize(a, min, max) {
+    return (a - min) / (max - min);
+}
+
+function _extends() {
+    _extends = Object.assign || function assign(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);
+}
 
 function getObjectType(obj) {
     return Object.prototype.toString.call(obj);
@@ -178,117 +187,75 @@ function getObjectType(obj) {
  * @internal
  * @param angleObj 角度数值对象
  * @param validRange 角度限制值
- */
-function angleLimit(angleObj, validRange) {
+ */ function angleLimit(angleObj, validRange) {
     var flagAlpha = true;
     var flagBeta = true;
     var flagGamma = true;
-    if (getObjectType(validRange.alpha) === '[object Array]' && validRange.alpha.length >= 2) {
+    if (getObjectType(validRange.alpha) === "[object Array]" && validRange.alpha.length >= 2) {
         var referAlphaA = angleObj.alpha + validRange.alpha[0];
         var referAlphaB = angleObj.alpha + validRange.alpha[1];
         referAlphaA = referAlphaA < 0 ? referAlphaA + 360 : referAlphaA;
         referAlphaB = referAlphaB > 360 ? referAlphaB - 360 : referAlphaB;
         if (referAlphaA < referAlphaB) {
             flagAlpha = angleObj.alpha > referAlphaA && angleObj.alpha < referAlphaB;
-        }
-        else {
+        } else {
             flagAlpha = angleObj.alpha > referAlphaA || angleObj.alpha < referAlphaB;
         }
     }
-    if (getObjectType(validRange.beta) === '[object Array]' && validRange.beta.length >= 2) {
+    if (getObjectType(validRange.beta) === "[object Array]" && validRange.beta.length >= 2) {
         flagBeta = angleObj.beta >= validRange.beta[0] && angleObj.beta <= validRange.beta[1];
     }
-    if (getObjectType(validRange.gamma) === '[object Array]' && validRange.gamma.length >= 2) {
+    if (getObjectType(validRange.gamma) === "[object Array]" && validRange.gamma.length >= 2) {
         flagGamma = angleObj.gamma >= validRange.gamma[0] && angleObj.gamma <= validRange.gamma[1];
     }
     return flagAlpha && flagBeta && flagGamma;
 }
 
-function deepMerge(target, args) {
-    if (!effects.isObject(target) && !effects.isArray(target)) {
-        return target;
-    }
-    var result = effects.isArray(target) ? __spreadArray([], __read(target), false) : __assign({}, target);
-    var length = arguments.length;
-    for (var index = 1; index < length; index++) {
-        var source = arguments[index] || {};
-        if (effects.isObject(source)) {
-            var prop = void 0;
-            for (prop in source) {
-                if (source.hasOwnProperty(prop)) {
-                    if (effects.isObject(result[prop]) && effects.isObject(source[prop])) {
-                        result[prop] = deepMerge(result[prop], source[prop]);
-                    }
-                    else if (effects.isObject(source[prop])) {
-                        result[prop] = deepMerge(source[prop]);
-                    }
-                    else if (effects.isArray(source[prop])) {
-                        result[prop] = deepMerge(source[prop]);
-                    }
-                    else {
-                        result[prop] = source[prop];
-                    }
-                }
-            }
-            for (prop in result) {
-                if (effects.isObject(result[prop]) &&
-                    result.hasOwnProperty(prop) &&
-                    !source.hasOwnProperty(prop)) {
-                    result[prop] = deepMerge(result[prop]);
-                }
-            }
-        }
-    }
-    if (length === 1) {
-        for (var prop in result) {
-            if (effects.isObject(result[prop]) && result.hasOwnProperty(prop)) {
-                result[prop] = deepMerge(result[prop]);
-            }
-        }
-    }
-    return result;
-}
-
 function isIOS() {
     var str = navigator.userAgent.toLowerCase();
     var ver = str.match(/cpu (iphone )?os (.*?) like mac os/);
     return ver ? parseInt(ver[2], 10) : 0;
 }
+function isMiniProgram() {
+    return isAlipayMiniApp() || isWechatMiniApp();
+}
+function isAlipayMiniApp() {
+    var _my;
+    return typeof my !== "undefined" && ((_my = my) == null ? void 0 : _my.renderTarget) === "web";
+}
+function isWechatMiniApp() {
+    return window.__wxjs_environment === "miniprogram";
+}
 
 /**
  * 稳定区间
- */
-var STABLE_RANGE = 3;
+ */ var STABLE_RANGE = 3;
 /**
  * 每次增幅的最大值
- */
-var MAX_CHANGE = 5;
+ */ var MAX_CHANGE = 5;
 /**
  * 每次增幅的最小值
- */
-var MIN_CHANGE = 1;
+ */ var MIN_CHANGE = 1;
 /**
  * 数据缓存队列的长度
- */
-var VALUE_POOL_LENGTH = 5;
+ */ var VALUE_POOL_LENGTH = 5;
 /**
  * 滤波方法
- */
-var Filtering = /** @class */ (function () {
+ */ var Filtering = /*#__PURE__*/ function() {
     function Filtering(options) {
-        if (options === void 0) { options = {}; }
+        if (options === void 0) options = {};
         this.options = options;
         this.lastValue = 0;
         this.valuePool = [];
     }
+    var _proto = Filtering.prototype;
     /**
-     * 0deg 左右保持一定的稳定区间 STABLE_RANGE
-     * - 小于 STABLE_RANGE 的算 0
-     * - 大于 STABLE_RANGE 的减去 STABLE_RANGE
-     * @param value - 输入值
-     * @returns
-     */
-    Filtering.prototype.stableFix = function (value) {
+   * 0deg 左右保持一定的稳定区间 STABLE_RANGE
+   * - 小于 STABLE_RANGE 的算 0
+   * - 大于 STABLE_RANGE 的减去 STABLE_RANGE
+   * @param value - 输入值
+   * @returns
+   */ _proto.stableFix = function stableFix(value) {
         var stableRange = this.options.stableRange || STABLE_RANGE;
         if (Math.abs(value) < stableRange) {
             return 0;
@@ -296,13 +263,12 @@ var Filtering = /** @class */ (function () {
         return value > stableRange ? value - stableRange : value + stableRange;
     };
     /**
-     * 变幅限制
-     * - 最大变化 MAX_CHANGE
-     * - 最小变化 MIN_CHANGE
-     * @param value
-     * @returns
-     */
-    Filtering.prototype.changeLimit = function (value) {
+   * 变幅限制
+   * - 最大变化 MAX_CHANGE
+   * - 最小变化 MIN_CHANGE
+   * @param value
+   * @returns
+   */ _proto.changeLimit = function changeLimit(value) {
         var lastValue = this.lastValue;
         var result = value;
         if (Math.abs(value - lastValue) > MAX_CHANGE) {
@@ -314,21 +280,20 @@ var Filtering = /** @class */ (function () {
         this.lastValue = result;
         return result;
     };
-    Filtering.prototype.linearRegressionMedian = function (value) {
+    _proto.linearRegressionMedian = function linearRegressionMedian(value) {
         // 在队列中装载数据，达到队列阀值长度时开始计算
         this.valuePool.push(value);
         var result;
         if (this.valuePool.length >= VALUE_POOL_LENGTH) {
             result = getLinearRegressionFixedVal(this.valuePool);
             this.valuePool.shift();
-        }
-        else {
+        } else {
             result = this.lastValue;
         }
         return result;
     };
     return Filtering;
-}());
+}();
 // 计算出线性回归参数
 function linearRegression(x, y) {
     var result = {};
@@ -338,30 +303,30 @@ function linearRegression(x, y) {
     var sumXY = 0;
     var sumXX = 0;
     var sumYY = 0;
-    for (var i = 0; i < y.length; i++) {
+    for(var i = 0; i < y.length; i++){
         sumX += x[i];
         sumY += y[i];
-        sumXY += (x[i] * y[i]);
-        sumXX += (x[i] * x[i]);
-        sumYY += (y[i] * y[i]);
+        sumXY += x[i] * y[i];
+        sumXX += x[i] * x[i];
+        sumYY += y[i] * y[i];
     }
     var avgX = sumX / n;
     var avgY = sumY / n;
-    result['a'] = (sumXY - n * avgX * avgY) / (sumXX - n * avgX * avgX);
-    result['b'] = avgY - result.a * avgX;
-    result['miss'] = Math.pow((n * sumXY - sumX * sumY) / Math.sqrt((n * sumXX - sumX * sumX) * (n * sumYY - sumY * sumY)), 2);
+    result["a"] = (sumXY - n * avgX * avgY) / (sumXX - n * avgX * avgX);
+    result["b"] = avgY - result.a * avgX;
+    result["miss"] = Math.pow((n * sumXY - sumX * sumY) / Math.sqrt((n * sumXX - sumX * sumX) * (n * sumYY - sumY * sumY)), 2);
     return result;
 }
 // 生成线性回归函数 F(x) = ax + b
 function createLinearRegressionFx(values) {
     var x = [];
     var y = [];
-    values.forEach(function (item, index) {
+    values.forEach(function(item, index) {
         x.push(index); // 数据是连续的，所以直接取数组下标为 x
         y.push(item);
     });
     var key = linearRegression(x, y);
-    return function (x) {
+    return function(x) {
         return key.a * x + key.b;
     };
 }
@@ -369,14 +334,14 @@ function createLinearRegressionFx(values) {
 function getLinearRegressionFixedVal(valuePool) {
     var fx = createLinearRegressionFx(valuePool);
     // 这个迭代修正很重要
-    valuePool = valuePool.map(function (item, index) {
+    valuePool = valuePool.map(function(item, index) {
         return fx(index);
     });
     return fx(valuePool.length / 2);
 }
 
-var useJSBridge = isIOS() && typeof window.AlipayJSBridge !== 'undefined';
-var useWindVane = typeof window.WindVane !== 'undefined';
+var useJSBridge = isIOS() && typeof window.AlipayJSBridge !== "undefined";
+var useWindVane = typeof window.WindVane !== "undefined";
 // 默认参数
 var defaultOptions = {
     X: true,
@@ -386,31 +351,49 @@ var defaultOptions = {
     relativeBeta: false,
     relativeGamma: false,
     validRange: {
-        alpha: [-60, 60],
-        beta: [-60, 180],
-        gamma: [-89, 89],
+        alpha: [
+            -60,
+            60
+        ],
+        beta: [
+            -60,
+            180
+        ],
+        gamma: [
+            -89,
+            89
+        ]
     },
-    stableRange: 3,
+    stableRange: 3
 };
-var DeviceOrientation = /** @class */ (function () {
+var DeviceOrientation = /*#__PURE__*/ function() {
     function DeviceOrientation(options) {
-        if (options === void 0) { options = {}; }
+        if (options === void 0) options = {};
         this.lastX = 0;
         this.lastY = 0;
         this.prevAcceler = {
             x: 0,
             y: 0,
-            z: 0,
+            z: 0
         };
         this.stoped = false;
-        this.options = deepMerge(defaultOptions, options);
+        // 模拟简单的 deep merge
+        var validRange = _extends({}, defaultOptions.validRange, options.validRange);
+        var mergeOptions = _extends({}, defaultOptions, options);
+        mergeOptions.validRange = validRange;
+        this.options = mergeOptions;
         var stableRange = this.options.stableRange;
-        this.filterX = new Filtering({ stableRange: stableRange });
-        this.filterY = new Filtering({ stableRange: stableRange });
+        this.filterX = new Filtering({
+            stableRange: stableRange
+        });
+        this.filterY = new Filtering({
+            stableRange: stableRange
+        });
     }
-    DeviceOrientation.prototype.watch = function (callback) {
+    var _proto = DeviceOrientation.prototype;
+    _proto.watch = function watch(callback) {
         var _this = this;
-        if (typeof callback !== 'function') {
+        if (typeof callback !== "function") {
             return;
         }
         // 目前只能绑定一个方法，此处可以扩展成一个方法队列
@@ -419,66 +402,67 @@ var DeviceOrientation = /** @class */ (function () {
         }
         var timefragment = 0; // 时间片计时
         var nowts = 0; // 当前时间
-        var referGamma = 0; // 初始化角度，作为单独一个用户的空间旋转的参照
-        var referBeta = 0;
+        // 初始化角度，作为单独一个用户的空间旋转的参照
+        var referGamma = NaN, referBeta = NaN;
         var alpha;
         var beta;
         var gamma;
-        var gammaFixed;
-        var betaFixed;
         var isInValidDegRange;
         var x; // 最终输出的 x
         var y; // 最终输出的 y
-        var handleWatch = function (e) {
+        var handleWatch = function(e) {
             if (_this.stoped) {
                 return;
             }
             alpha = e.alpha; // 垂直于屏幕的轴 0 ~ 360
             beta = e.beta; // 横向 X 轴 -180 ~ 180
             gamma = e.gamma; // 纵向 Y 轴 -90 ~ 90
-            if (!referBeta) {
-                referBeta = beta || 0;
-            }
-            if (!referGamma) {
-                referGamma = gamma || 0;
-            }
-            //
             isInValidDegRange = angleLimit.call(_this, {
                 alpha: alpha,
                 beta: beta,
-                gamma: gamma,
+                gamma: gamma
             }, _this.options.validRange);
+            if (isNaN(referGamma)) {
+                referGamma = gamma;
+                _this.filterX.lastValue = gamma;
+            }
+            if (isNaN(referBeta)) {
+                referBeta = beta;
+                _this.filterY.lastValue = beta;
+            }
             if (isInValidDegRange) {
                 // 最终结果值
                 if (_this.options.X) {
-                    gammaFixed = gamma - referGamma;
-                    x = _this.options.relativeGamma ? gammaFixed : gamma;
+                    x = _this.options.relativeGamma ? gamma - referGamma : gamma;
                     x = _this.filterX.stableFix(x);
                     x = _this.filterX.changeLimit(x);
                     x = _this.filterX.linearRegressionMedian(+x);
-                }
-                else {
+                } else {
                     x = 0;
                 }
                 if (_this.options.Y) {
-                    // beta 相对 referBeta 的角度
-                    betaFixed = beta - referBeta;
-                    y = _this.options.relativeBeta ? betaFixed : beta;
+                    y = _this.options.relativeBeta ? beta - referBeta : beta;
                     y = _this.filterY.stableFix(y);
                     y = _this.filterY.changeLimit(y);
                     y = _this.filterY.linearRegressionMedian(+y);
-                }
-                else {
+                } else {
                     y = 0;
                 }
                 if (_this.isValid(x, y)) {
                     if (_this.options.useRequestAnimationFrame) {
-                        window.requestAnimationFrame(function () {
-                            callback(x, y, { alpha: alpha, beta: beta, gamma: gamma });
+                        window.requestAnimationFrame(function() {
+                            callback(x, y, {
+                                alpha: alpha,
+                                beta: y - referBeta,
+                                gamma: x - referGamma
+                            });
+                        });
+                    } else {
+                        callback(x, y, {
+                            alpha: alpha,
+                            beta: y - referBeta,
+                            gamma: x - referGamma
                         });
-                    }
-                    else {
-                        callback(x, y, { alpha: alpha, beta: beta, gamma: gamma });
                     }
                     _this.lastX = x;
                     _this.lastY = y;
@@ -489,51 +473,52 @@ var DeviceOrientation = /** @class */ (function () {
         this.stoped = false;
         if (useWindVane) {
             switchWindVane(true, this.options.interval);
-            this.watchListener = function (e) {
-                if ('param' in e) {
-                    var _a = e.param, x_1 = _a.x, y_1 = _a.y, z = _a.z;
+            this.watchListener = function(e) {
+                if ("param" in e) {
+                    var _e_param = e.param, x = _e_param.x, y = _e_param.y, z = _e_param.z;
                     // 即使手机没动，也会不停触发，所以这里加个判断，值相等则不调用回调
-                    if (x_1 === _this.prevAcceler.x && y_1 === _this.prevAcceler.y && z === _this.prevAcceler.z) {
+                    if (x === _this.prevAcceler.x && y === _this.prevAcceler.y && z === _this.prevAcceler.z) {
                         return;
                     }
-                    _this.prevAcceler = { x: x_1, y: y_1, z: z };
+                    _this.prevAcceler = {
+                        x: x,
+                        y: y,
+                        z: z
+                    };
                     var evt = {
                         alpha: +z * 180,
-                        beta: +y_1 * -90,
-                        gamma: +x_1 * 90,
+                        beta: +y * -90,
+                        gamma: +x * 90
                     };
                     handleWatch(evt);
                 }
             };
-            document.addEventListener('motion.gyro', this.watchListener, false);
-        }
-        else if (useJSBridge) {
+            document.addEventListener("motion.gyro", this.watchListener, false);
+        } else if (useJSBridge && !isMiniProgram()) {
             switchIOSEvent(true, this.options.interval / 1000);
-            this.watchListener = function (e) {
-                if (e && 'data' in e) {
+            this.watchListener = function(e) {
+                if (e && "data" in e) {
                     /*
-                    data:
-                    {
-                      data: {
-                        x: 0.0, // gamma -1 ~ 1
-                        y: 0.0, // beta -1 ~ 1
-                        z: 0.0, // alpha
-                      }
-                    }
-                    */
-                    var _a = e.data, x_2 = _a.x, y_2 = _a.y, z = _a.z;
+          data:
+          {
+            data: {
+              x: 0.0, // gamma -1 ~ 1
+              y: 0.0, // beta -1 ~ 1
+              z: 0.0, // alpha
+            }
+          }
+          */ var _e_data = e.data, x = _e_data.x, y = _e_data.y, z = _e_data.z;
                     var evt = {
                         alpha: z * 180,
-                        beta: y_2 * -90,
-                        gamma: x_2 * 90,
+                        beta: y * -90,
+                        gamma: x * 90
                     };
                     handleWatch(evt);
                 }
             };
-            document.addEventListener('accelerometerChange', this.watchListener, false);
-        }
-        else {
-            this.watchListener = function (e) {
+            document.addEventListener("accelerometerChange", this.watchListener, false);
+        } else {
+            this.watchListener = function(e) {
                 nowts = new Date().getTime();
                 // 控制时间片
                 if (nowts - timefragment >= _this.options.interval) {
@@ -541,80 +526,87 @@ var DeviceOrientation = /** @class */ (function () {
                     handleWatch(e);
                 }
             };
-            window.addEventListener('deviceorientation', this.watchListener, false);
+            window.addEventListener("deviceorientation", this.watchListener, false);
         }
     };
-    DeviceOrientation.prototype.unWatch = function () {
-        effects.assertExist(this.watchListener);
+    _proto.unWatch = function unWatch() {
+        EFFECTS.assertExist(this.watchListener);
         if (useWindVane) {
             switchWindVane(false);
-            document.removeEventListener('motion.gyro', this.watchListener);
-        }
-        else if (useJSBridge) {
+            document.removeEventListener("motion.gyro", this.watchListener);
+        } else if (useJSBridge) {
             switchIOSEvent(false);
-            document.removeEventListener('accelerometerChange', this.watchListener);
-        }
-        else {
-            window.removeEventListener('deviceorientation', this.watchListener);
+            document.removeEventListener("accelerometerChange", this.watchListener);
+        } else {
+            window.removeEventListener("deviceorientation", this.watchListener);
         }
         this.stoped = true;
         this.watchListener = undefined;
     };
-    DeviceOrientation.prototype.pause = function () {
+    _proto.pause = function pause() {
         this.stoped = true;
         if (useJSBridge) {
             switchIOSEvent(false);
         }
     };
-    DeviceOrientation.prototype.continue = function () {
+    _proto.continue = function _continue() {
         this.stoped = false;
         if (useJSBridge) {
             switchIOSEvent(true, this.options.interval / 1000);
         }
     };
-    DeviceOrientation.prototype.isValid = function (x, y) {
+    _proto.isValid = function isValid(x, y) {
         // 判断是否和上次的值一样，检测有没有变
         return this.lastX !== x || this.lastY !== y;
     };
     return DeviceOrientation;
-}());
+}();
 // 开启/关闭 iOS 的陀螺仪监听
 function switchIOSEvent(open, interval) {
-    window.AlipayJSBridge.call('watchShake', {
+    window.AlipayJSBridge.call("watchShake", {
         monitorGyroscope: false,
         monitorAccelerometer: !!open,
-        interval: !open ? 10 : parseFloat(interval.toFixed(3)),
-    }, function () { });
+        interval: !open ? 10 : parseFloat(interval.toFixed(3))
+    }, function() {});
 }
 function switchWindVane(open, interval) {
     var params = {
         // 是开启还是关闭陀螺仪的监听
         on: open,
         // 陀螺仪事件的时间间隔
-        frequency: interval,
+        frequency: interval
     };
-    window.WindVane.call('WVMotion', 'listenGyro', params, function (e) {
-        console.info('call WVMotion success');
-    }, function (e) {
-        console.error('call WVMotion failed:' + JSON.stringify(e));
+    window.WindVane.call("WVMotion", "listenGyro", params, function(e) {
+        console.info("Call WVMotion success.");
+    }, function(e) {
+        console.error("Call WVMotion failed: " + JSON.stringify(e) + ".");
     });
 }
 
 /**
  *
- */
-var OrientationAdapterAcceler = /** @class */ (function () {
+ */ var OrientationAdapterAcceler = /*#__PURE__*/ function() {
     function OrientationAdapterAcceler() {
         this.transformers = [];
         this.connected = false;
         this.accelerMotion = null;
         this.validRange = {
-            alpha: [-60, 60],
-            beta: [-80, 80],
-            gamma: [-89, 89], // 左右翻转
+            alpha: [
+                -60,
+                60
+            ],
+            beta: [
+                -80,
+                80
+            ],
+            gamma: [
+                -89,
+                89
+            ]
         };
     }
-    OrientationAdapterAcceler.prototype.connect = function () {
+    var _proto = OrientationAdapterAcceler.prototype;
+    _proto.connect = function connect() {
         var _this = this;
         if (!this.connected) {
             this.accelerMotion = new DeviceOrientation({
@@ -625,37 +617,41 @@ var OrientationAdapterAcceler = /** @class */ (function () {
                 relativeBeta: false,
                 relativeGamma: false,
                 validRange: this.validRange,
-                stableRange: 3, // 稳定区间
+                stableRange: 3
             });
-            this.accelerMotion.watch(function (x, y) {
+            this.accelerMotion.watch(function(x, y, param) {
+                var beta = param.beta, gamma = param.gamma;
                 var motion = {
                     x: x,
                     y: y,
+                    beta: beta,
+                    gamma: gamma
                 };
                 _this.dispatchMotion(motion);
             });
         }
         this.connected = true;
     };
-    OrientationAdapterAcceler.prototype.disconnect = function () {
+    _proto.disconnect = function disconnect() {
         if (this.accelerMotion) {
             this.accelerMotion.unWatch();
         }
         this.connected = false;
     };
     /**
-     *
-     * @param motion
-     */
-    OrientationAdapterAcceler.prototype.dispatchMotion = function (motion) {
-        this.transformers.forEach(function (t) { return t.update(motion); });
-    };
-    OrientationAdapterAcceler.prototype.addTransformer = function (transformer) {
+   *
+   * @param motion
+   */ _proto.dispatchMotion = function dispatchMotion(motion) {
+        this.transformers.forEach(function(t) {
+            return t.update(motion);
+        });
+    };
+    _proto.addTransformer = function addTransformer(transformer) {
         if (!this.transformers.includes(transformer)) {
             this.transformers.push(transformer);
         }
     };
-    OrientationAdapterAcceler.prototype.removeTransformer = function (transformer) {
+    _proto.removeTransformer = function removeTransformer(transformer) {
         var index = this.transformers.indexOf(transformer);
         if (index > -1) {
             this.transformers.splice(index, 1);
@@ -663,7 +659,7 @@ var OrientationAdapterAcceler = /** @class */ (function () {
         return this.transformers.length === 0;
     };
     return OrientationAdapterAcceler;
-}());
+}();
 var adapter;
 function getAccelerAdapter() {
     if (!adapter) {
@@ -672,72 +668,74 @@ function getAccelerAdapter() {
     return adapter;
 }
 
-var OrientationPluginLoader = /** @class */ (function (_super) {
-    __extends(OrientationPluginLoader, _super);
+var OrientationPluginLoader = /*#__PURE__*/ function(AbstractPlugin) {
+    _inherits(OrientationPluginLoader, AbstractPlugin);
     function OrientationPluginLoader() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+        var _this;
+        _this = AbstractPlugin.apply(this, arguments) || this;
         _this.order = 90;
         _this.adapter = null;
-        _this.handleConnect = function () {
-            var _a;
+        _this.handleConnect = function() {
             if (!closeManually) {
-                (_a = _this.adapter) === null || _a === void 0 ? void 0 : _a.connect();
+                var _this_adapter;
+                (_this_adapter = _this.adapter) == null ? void 0 : _this_adapter.connect();
             }
         };
-        _this.handleDisconnect = function () {
-            var _a;
-            (_a = _this.adapter) === null || _a === void 0 ? void 0 : _a.disconnect();
+        _this.handleDisconnect = function() {
+            var _this_adapter;
+            (_this_adapter = _this.adapter) == null ? void 0 : _this_adapter.disconnect();
         };
         return _this;
     }
-    OrientationPluginLoader.prototype.onCompositionConstructed = function () {
-        var _a;
+    var _proto = OrientationPluginLoader.prototype;
+    _proto.onCompositionConstructed = function onCompositionConstructed() {
+        var _this_adapter;
         this.adapter = getAdapter();
-        (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.connect();
+        (_this_adapter = this.adapter) == null ? void 0 : _this_adapter.connect();
         this.bindAccelerDocumentEvent();
     };
-    OrientationPluginLoader.prototype.onCompositionReset = function (composition) {
-        var _a;
+    _proto.onCompositionReset = function onCompositionReset(composition) {
+        var _this_adapter;
         var transformer = composition.loaderData.deviceTransformer = new CompositionTransformerAcceler(composition);
-        (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.addTransformer(transformer);
+        (_this_adapter = this.adapter) == null ? void 0 : _this_adapter.addTransformer(transformer);
     };
-    OrientationPluginLoader.prototype.onCompositionUpdate = function (composition) {
+    _proto.onCompositionUpdate = function onCompositionUpdate(composition) {
         var transformer = composition.loaderData.deviceTransformer;
         if (transformer) {
             transformer.updateOrientation();
         }
     };
-    OrientationPluginLoader.prototype.onCompositionDestroyed = function (composition) {
-        var _a, _b;
-        var empty = (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.removeTransformer(composition.loaderData.deviceTransformer);
+    _proto.onCompositionDestroyed = function onCompositionDestroyed(composition) {
+        var _this_adapter;
+        var empty = (_this_adapter = this.adapter) == null ? void 0 : _this_adapter.removeTransformer(composition.loaderData.deviceTransformer);
         if (empty) {
-            (_b = this.adapter) === null || _b === void 0 ? void 0 : _b.disconnect();
+            var _this_adapter1;
+            (_this_adapter1 = this.adapter) == null ? void 0 : _this_adapter1.disconnect();
         }
     };
-    OrientationPluginLoader.prototype.bindAccelerDocumentEvent = function () {
+    _proto.bindAccelerDocumentEvent = function bindAccelerDocumentEvent() {
         this.unbindAccelerDocumentEvent(); // 保证全局只监听一份
-        document.addEventListener('resume', this.handleConnect, false);
-        document.addEventListener('pause', this.handleDisconnect, false);
-        document.addEventListener('back', this.handleDisconnect, false);
+        document.addEventListener("resume", this.handleConnect, false);
+        document.addEventListener("pause", this.handleDisconnect, false);
+        document.addEventListener("back", this.handleDisconnect, false);
     };
-    OrientationPluginLoader.prototype.unbindAccelerDocumentEvent = function () {
-        document.removeEventListener('resume', this.handleConnect);
-        document.removeEventListener('pause', this.handleDisconnect);
-        document.removeEventListener('back', this.handleDisconnect);
+    _proto.unbindAccelerDocumentEvent = function unbindAccelerDocumentEvent() {
+        document.removeEventListener("resume", this.handleConnect);
+        document.removeEventListener("pause", this.handleDisconnect);
+        document.removeEventListener("back", this.handleDisconnect);
     };
-    OrientationPluginLoader.prototype.dispose = function () {
+    _proto.dispose = function dispose() {
         getAdapter().disconnect();
         this.unbindAccelerDocumentEvent();
     };
     return OrientationPluginLoader;
-}(effects.AbstractPlugin));
+}(EFFECTS.AbstractPlugin);
 // 是否是手动关闭，如果是，那么 resume 时不要恢复
 var closeManually = false;
 /**
  *
  * @returns
- */
-function getAdapter() {
+ */ function getAdapter() {
     // 运动感应类型（默认使用加速度，Native 环境使用陀螺仪）
     return getAccelerAdapter();
 }
@@ -750,63 +748,83 @@ function openDeviceMotion() {
     getAdapter().connect();
 }
 
-var OrientationComponent = /** @class */ (function (_super) {
-    __extends(OrientationComponent, _super);
+function __decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+typeof SuppressedError === "function" ? SuppressedError : function _SuppressedError(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+exports.OrientationComponent = /*#__PURE__*/ function(ItemBehaviour) {
+    _inherits(OrientationComponent, ItemBehaviour);
     function OrientationComponent() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        return ItemBehaviour.apply(this, arguments);
     }
-    OrientationComponent.prototype.fromData = function (data) {
-        _super.prototype.fromData.call(this, data);
-        var targets = data.content.options.targets;
+    var _proto = OrientationComponent.prototype;
+    _proto.fromData = function fromData(data) {
+        ItemBehaviour.prototype.fromData.call(this, data);
+        var targets = data.options.targets;
         if (targets) {
-            this.targets = targets.map(function (t) { return ({
-                name: t.name,
-                xMin: +t.xMin || 0,
-                yMin: +t.yMin || 0,
-                xMax: +t.xMax || 0,
-                yMax: +t.yMax || 0,
-            }); });
+            this.targets = targets.map(function(t) {
+                return {
+                    name: t.name,
+                    xMin: +t.xMin || 0,
+                    yMin: +t.yMin || 0,
+                    xMax: +t.xMax || 0,
+                    yMax: +t.yMax || 0,
+                    vMin: +t.vMin || 0,
+                    hMin: +t.hMin || 0,
+                    vMax: +t.vMax || 0,
+                    hMax: +t.hMax || 0
+                };
+            });
         }
     };
-    OrientationComponent.prototype.start = function () {
-        var _a, _b;
-        var transformer = (_a = this.item.composition) === null || _a === void 0 ? void 0 : _a.loaderData.deviceTransformer;
+    _proto.start = function start() {
+        var _this_item_composition;
+        var transformer = (_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.loaderData.deviceTransformer;
         if (transformer) {
-            (_b = this.targets) === null || _b === void 0 ? void 0 : _b.forEach(function (target) { return transformer.addTarget(target); });
+            var _this_targets;
+            (_this_targets = this.targets) == null ? void 0 : _this_targets.forEach(function(target) {
+                return transformer.addTarget(target);
+            });
             transformer.initComposition();
         }
     };
-    OrientationComponent.prototype.update = function (dt) {
-        var _a;
-        var transformer = (_a = this.item.composition) === null || _a === void 0 ? void 0 : _a.loaderData.deviceTransformer;
+    _proto.update = function update(dt) {
+        var _this_item_composition;
+        var transformer = (_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.loaderData.deviceTransformer;
         if (transformer) {
             transformer.updateOrientation();
         }
     };
-    OrientationComponent.prototype.onDestroy = function () {
+    _proto.onDestroy = function onDestroy() {
         var _this = this;
-        var _a;
-        (_a = this.targets) === null || _a === void 0 ? void 0 : _a.forEach(function (target) { var _a, _b; return (_b = (_a = _this.item.composition) === null || _a === void 0 ? void 0 : _a.loaderData.deviceTransformer) === null || _b === void 0 ? void 0 : _b.removeTarget(target.name); });
+        var _this_targets;
+        (_this_targets = this.targets) == null ? void 0 : _this_targets.forEach(function(target) {
+            var _this_item_composition_loaderData_deviceTransformer, _this_item_composition;
+            return (_this_item_composition = _this.item.composition) == null ? void 0 : (_this_item_composition_loaderData_deviceTransformer = _this_item_composition.loaderData.deviceTransformer) == null ? void 0 : _this_item_composition_loaderData_deviceTransformer.removeTarget(target.name);
+        });
     };
     return OrientationComponent;
-}(effects.ItemBehaviour));
+}(EFFECTS.ItemBehaviour);
+exports.OrientationComponent = __decorate([
+    EFFECTS.effectsClass("OrientationComponent")
+], exports.OrientationComponent);
 
-var TransformVFXItem = /** @class */ (function (_super) {
-    __extends(TransformVFXItem, _super);
-    function TransformVFXItem(engine, props) {
-        var _this = _super.call(this, engine, props) || this;
-        var component = _this.addComponent(OrientationComponent);
-        component.fromData(props);
-        return _this;
-    }
-    return TransformVFXItem;
-}(effects.VFXItem));
-
-effects.registerPlugin('orientation-transformer', OrientationPluginLoader, TransformVFXItem);
-var version = "2.0.0-alpha.2";
-effects.logger.info('plugin orientation transformer version: ' + version);
+EFFECTS.registerPlugin("orientation-transformer", OrientationPluginLoader, EFFECTS.VFXItem);
+var version = "2.0.0-alpha.21";
+EFFECTS.logger.info("Plugin orientation transformer version: " + version + ".");
+if (version !== EFFECTS__namespace.version) {
+    console.error("注意：请统一 Orientation Transformer 插件与 Player 版本，不统一的版本混用会有不可预知的后果！", "\nAttention: Please ensure the Orientation Transformer plugin is synchronized with the Player version. Mixing and matching incompatible versions may result in unpredictable consequences!");
+}
 
 exports.OrientationAdapterAcceler = OrientationAdapterAcceler;
+exports.OrientationPluginLoader = OrientationPluginLoader;
 exports.closeDeviceMotion = closeDeviceMotion;
 exports.getAdapter = getAdapter;
 exports.openDeviceMotion = openDeviceMotion;