@galacean/effects-plugin-orientation-transformer 1.4.0 → 1.4.2

package/dist/composition-transformer-acceler.d.ts

@@ -1,8 +1,5 @@
 import type { Composition, spec } from '@galacean/effects';
-type EventType = {
-    x: number;
-    y: number;
-};
+import type { AccelerMotionData } from './orientation-adapter-acceler';
 export declare class CompositionTransformerAcceler {
     private readonly composition;
     private readonly targets;
@@ -13,11 +10,10 @@ export declare class CompositionTransformerAcceler {
     private betaRange;
     private currentEvent?;
     constructor(composition: Composition);
-    update({ x, y }: EventType): void;
+    update({ x, y, beta, gamma }: AccelerMotionData): void;
     updateOrientation(): void;
     initComposition(): void;
     addTarget(target: spec.PluginGyroscopeTarget): void;
     removeTarget(name: string): void;
     private moveLayer;
 }
-export {};

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player orientation transformer plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,意绮
- * Version: v1.4.0
+ * Version: v1.4.2
  */
 
 'use strict';
@@ -86,55 +86,6 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-/**
- * 水平旋转变化起始角（手机处于改角度时无变化）
- * 待调试
- */
-var VERTICAL_INIT_DEGREE = 45;
-var TransformVFXItem = /** @class */ (function (_super) {
-    __extends(TransformVFXItem, _super);
-    function TransformVFXItem() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Object.defineProperty(TransformVFXItem.prototype, "type", {
-        get: function () {
-            return 'orientation-transformer';
-        },
-        enumerable: false,
-        configurable: true
-    });
-    TransformVFXItem.prototype.onConstructed = function (options) {
-        var targets = options.content.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,
-                vMin: +t.vMin || 0,
-                hMin: +t.hMin || 0,
-                vMax: +t.vMax || 0,
-                hMax: +t.hMax || 0,
-            }); });
-        }
-    };
-    TransformVFXItem.prototype.onItemRemoved = function (composition) {
-        var _a;
-        (_a = this.targets) === null || _a === void 0 ? void 0 : _a.forEach(function (target) { var _a; return (_a = composition.loaderData.deviceTransformer) === null || _a === void 0 ? void 0 : _a.removeTarget(target.name); });
-    };
-    TransformVFXItem.prototype.doCreateContent = function (composition) {
-        var _a;
-        var transformer = composition.loaderData.deviceTransformer;
-        if (transformer) {
-            (_a = this.targets) === null || _a === void 0 ? void 0 : _a.forEach(function (target) { return transformer.addTarget(target); });
-            transformer.initComposition();
-        }
-        return {};
-    };
-    return TransformVFXItem;
-}(effects.VFXItem));
-
 var CompositionTransformerAcceler = /** @class */ (function () {
     function CompositionTransformerAcceler(composition) {
         this.composition = composition;
@@ -146,8 +97,8 @@ var CompositionTransformerAcceler = /** @class */ (function () {
         this.betaRange = [-89, 89];
     }
     CompositionTransformerAcceler.prototype.update = function (_a) {
-        var x = _a.x, y = _a.y;
-        this.currentEvent = { x: x, y: y };
+        var x = _a.x, y = _a.y, beta = _a.beta, gamma = _a.gamma;
+        this.currentEvent = { x: x, y: y, beta: beta, gamma: gamma };
     };
     CompositionTransformerAcceler.prototype.updateOrientation = function () {
         var _this = this;
@@ -192,7 +143,7 @@ var CompositionTransformerAcceler = /** @class */ (function () {
     CompositionTransformerAcceler.prototype.moveLayer = function (name, _a) {
         var _b, _c;
         var _d;
-        var x = _a.x, y = _a.y;
+        var x = _a.x, y = _a.y, b = _a.beta, g = _a.gamma;
         var layer = (_d = this.records[name]) === null || _d === void 0 ? void 0 : _d.item;
         if (layer) {
             var initPosition = this.records[name].position;
@@ -201,17 +152,18 @@ var CompositionTransformerAcceler = /** @class */ (function () {
             var beta = clamp(x, this.betaRange), gamma = clamp(y, this.gammaRange);
             if (target) {
                 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[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],
                 ];
-                var br = (clamp(x * 2, this.betaRange) - this.betaRange[0]) / (this.betaRange[1] - this.betaRange[0]);
-                var gr = (clamp(y * 2 - VERTICAL_INIT_DEGREE, this.gammaRange) - this.gammaRange[0]) / (this.gammaRange[1] - this.gammaRange[0]);
+                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],
                 ];
+                // console.log(y, initY, y - initY);
                 (_b = layer.transform).setPosition.apply(_b, __spreadArray([], __read(position), false));
                 (_c = layer.transform).setRotation.apply(_c, __spreadArray([], __read(rotation), false));
                 this.currentPos[name] = position.slice();
@@ -233,6 +185,9 @@ 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 getObjectType(obj) {
     return Object.prototype.toString.call(obj);
@@ -484,13 +439,11 @@ 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
@@ -501,23 +454,23 @@ var DeviceOrientation = /** @class */ (function () {
             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,
             }, _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);
@@ -526,9 +479,7 @@ var DeviceOrientation = /** @class */ (function () {
                     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);
@@ -539,11 +490,11 @@ var DeviceOrientation = /** @class */ (function () {
                 if (_this.isValid(x, y)) {
                     if (_this.options.useRequestAnimationFrame) {
                         window.requestAnimationFrame(function () {
-                            callback(x, y, { alpha: alpha, beta: beta, gamma: gamma });
+                            callback(x, y, { alpha: alpha, beta: y - referBeta, gamma: x - referGamma });
                         });
                     }
                     else {
-                        callback(x, y, { alpha: alpha, beta: beta, gamma: gamma });
+                        callback(x, y, { alpha: alpha, beta: y - referBeta, gamma: x - referGamma });
                     }
                     _this.lastX = x;
                     _this.lastY = y;
@@ -692,10 +643,13 @@ var OrientationAdapterAcceler = /** @class */ (function () {
                 validRange: this.validRange,
                 stableRange: 3, // 稳定区间
             });
-            this.accelerMotion.watch(function (x, y) {
+            this.accelerMotion.watch(function (x, y, _a) {
+                var beta = _a.beta, gamma = _a.gamma;
                 var motion = {
                     x: x,
                     y: y,
+                    beta: beta,
+                    gamma: gamma,
                 };
                 _this.dispatchMotion(motion);
             });
@@ -815,8 +769,52 @@ function openDeviceMotion() {
     getAdapter().connect();
 }
 
+var TransformVFXItem = /** @class */ (function (_super) {
+    __extends(TransformVFXItem, _super);
+    function TransformVFXItem() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(TransformVFXItem.prototype, "type", {
+        get: function () {
+            return 'orientation-transformer';
+        },
+        enumerable: false,
+        configurable: true
+    });
+    TransformVFXItem.prototype.onConstructed = function (options) {
+        var targets = options.content.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,
+                vMin: +t.vMin || 0,
+                hMin: +t.hMin || 0,
+                vMax: +t.vMax || 0,
+                hMax: +t.hMax || 0,
+            }); });
+        }
+    };
+    TransformVFXItem.prototype.onItemRemoved = function (composition) {
+        var _a;
+        (_a = this.targets) === null || _a === void 0 ? void 0 : _a.forEach(function (target) { var _a; return (_a = composition.loaderData.deviceTransformer) === null || _a === void 0 ? void 0 : _a.removeTarget(target.name); });
+    };
+    TransformVFXItem.prototype.doCreateContent = function (composition) {
+        var _a;
+        var transformer = composition.loaderData.deviceTransformer;
+        if (transformer) {
+            (_a = this.targets) === null || _a === void 0 ? void 0 : _a.forEach(function (target) { return transformer.addTarget(target); });
+            transformer.initComposition();
+        }
+        return {};
+    };
+    return TransformVFXItem;
+}(effects.VFXItem));
+
 effects.registerPlugin('orientation-transformer', OrientationPluginLoader, TransformVFXItem);
-var version = "1.4.0";
+var version = "1.4.2";
 effects.logger.info('plugin orientation transformer version: ' + version);
 
 exports.OrientationAdapterAcceler = OrientationAdapterAcceler;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/index.min.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player orientation transformer plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,意绮
- * Version: v1.4.0
+ * Version: v1.4.2
  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("@galacean/effects")):"function"==typeof define&&define.amd?define(["exports","@galacean/effects"],e):e(((t="undefined"!=typeof globalThis?globalThis:t||self).ge=t.ge||{},t.ge.orientationTransformerPlugin={}),t.ge)}(this,(function(t,e){"use strict";var n=function(t,e){return n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])},n(t,e)};function o(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function o(){this.constructor=t}n(t,e),t.prototype=null===e?Object.create(e):(o.prototype=e.prototype,new o)}var r=function(){return r=Object.assign||function(t){for(var e,n=1,o=arguments.length;n<o;n++)for(var r in e=arguments[n])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t},r.apply(this,arguments)};function i(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator];if(!n)return t;var o,r,i=n.call(t),a=[];try{for(;(void 0===e||e-- >0)&&!(o=i.next()).done;)a.push(o.value)}catch(t){r={error:t}}finally{try{o&&!o.done&&(n=i.return)&&n.call(i)}finally{if(r)throw r.error}}return a}function a(t,e,n){if(n||2===arguments.length)for(var o,r=0,i=e.length;r<i;r++)!o&&r in e||(o||(o=Array.prototype.slice.call(e,0,r)),o[r]=e[r]);return t.concat(o||Array.prototype.slice.call(e))}"function"==typeof SuppressedError&&SuppressedError;var s=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return o(e,t),Object.defineProperty(e.prototype,"type",{get:function(){return"orientation-transformer"},enumerable:!1,configurable:!0}),e.prototype.onConstructed=function(t){var e=t.content.options.targets;e&&(this.targets=e.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}})))},e.prototype.onItemRemoved=function(t){var e;null===(e=this.targets)||void 0===e||e.forEach((function(e){var n;return null===(n=t.loaderData.deviceTransformer)||void 0===n?void 0:n.removeTarget(e.name)}))},e.prototype.doCreateContent=function(t){var e,n=t.loaderData.deviceTransformer;return n&&(null===(e=this.targets)||void 0===e||e.forEach((function(t){return n.addTarget(t)})),n.initComposition()),{}},e}(e.VFXItem),c=function(){function t(t){this.composition=t,this.targets={},this.records={},this.currentPos={},this.currentRot={},this.gammaRange=[-89,89],this.betaRange=[-89,89]}return t.prototype.update=function(t){var e=t.x,n=t.y;this.currentEvent={x:e,y:n}},t.prototype.updateOrientation=function(){var t=this,e=this.currentEvent;e&&Object.getOwnPropertyNames(this.targets).forEach((function(n){t.moveLayer(n,e)}))},t.prototype.initComposition=function(){for(var t=this.composition.items,e=0;e<t.length;e++){var n=t[e];if(this.targets[n.name]){var o=n.transform.position.toArray(),r=n.transform.rotation.toArray(),i=this.currentPos[n.name],a=this.currentRot[n.name];this.records[n.name]={item:n,position:o,rotation:r},i&&n.transform.setPosition(i[0],i[1],i[2]),a&&n.transform.setRotation(a[0],a[1],a[2])}}},t.prototype.addTarget=function(t){this.targets[t.name]=t},t.prototype.removeTarget=function(t){delete this.targets[t],delete this.records[t]},t.prototype.moveLayer=function(t,e){var n,o,r,s=e.x,c=e.y,h=null===(r=this.records[t])||void 0===r?void 0:r.item;if(h){var p=this.records[t].position,f=this.records[t].rotation,d=this.targets[t],m=l(s,this.betaRange),v=l(c,this.gammaRange);if(d){var g=[p[0]+1.2*u((m-this.gammaRange[0])/(this.gammaRange[1]-this.gammaRange[0]),d.xMin,d.xMax),p[1]+1.2*u((v-this.betaRange[0])/(this.betaRange[1]-this.betaRange[0]),d.yMin,d.yMax),p[2]],y=(l(2*s,this.betaRange)-this.betaRange[0])/(this.betaRange[1]-this.betaRange[0]),b=(l(2*c-45,this.gammaRange)-this.gammaRange[0])/(this.gammaRange[1]-this.gammaRange[0]),w=[f[0]+u(b,d.hMin,d.hMax),f[1]+u(y,d.vMin,d.vMax),f[2]];(n=h.transform).setPosition.apply(n,a([],i(g),!1)),(o=h.transform).setRotation.apply(o,a([],i(w),!1)),this.currentPos[t]=g.slice(),this.currentRot[t]=w.slice()}}},t}();function l(t,e){return t<e[0]?e[0]:t>e[1]?e[1]:t}function u(t,e,n){return e+(n-e)*t}function h(t){return Object.prototype.toString.call(t)}function p(t,e){var n=!0,o=!0,r=!0;if("[object Array]"===h(e.alpha)&&e.alpha.length>=2){var i=t.alpha+e.alpha[0],a=t.alpha+e.alpha[1];n=(i=i<0?i+360:i)<(a=a>360?a-360:a)?t.alpha>i&&t.alpha<a:t.alpha>i||t.alpha<a}return"[object Array]"===h(e.beta)&&e.beta.length>=2&&(o=t.beta>=e.beta[0]&&t.beta<=e.beta[1]),"[object Array]"===h(e.gamma)&&e.gamma.length>=2&&(r=t.gamma>=e.gamma[0]&&t.gamma<=e.gamma[1]),n&&o&&r}function f(t,n){if(!e.isObject(t)&&!e.isArray(t))return t;for(var o=e.isArray(t)?a([],i(t),!1):r({},t),s=arguments.length,c=1;c<s;c++){var l=arguments[c]||{};if(e.isObject(l)){var u=void 0;for(u in l)l.hasOwnProperty(u)&&(e.isObject(o[u])&&e.isObject(l[u])?o[u]=f(o[u],l[u]):e.isObject(l[u])||e.isArray(l[u])?o[u]=f(l[u]):o[u]=l[u]);for(u in o)e.isObject(o[u])&&o.hasOwnProperty(u)&&!l.hasOwnProperty(u)&&(o[u]=f(o[u]))}}if(1===s)for(var u in o)e.isObject(o[u])&&o.hasOwnProperty(u)&&(o[u]=f(o[u]));return o}var d=function(){function t(t){void 0===t&&(t={}),this.options=t,this.lastValue=0,this.valuePool=[]}return t.prototype.stableFix=function(t){var e=this.options.stableRange||3;return Math.abs(t)<e?0:t>e?t-e:t+e},t.prototype.changeLimit=function(t){var e=this.lastValue,n=t;return Math.abs(t-e)>5&&(n=e<t?e+5:e-5),Math.abs(t-e)<1&&(n=e),this.lastValue=n,n},t.prototype.linearRegressionMedian=function(t){var e,n,o;return this.valuePool.push(t),this.valuePool.length>=5?(n=this.valuePool,o=function(t){var e=[],n=[];t.forEach((function(t,o){e.push(o),n.push(t)}));var o=function(t,e){for(var n={},o=e.length,r=0,i=0,a=0,s=0,c=0,l=0;l<e.length;l++)r+=t[l],i+=e[l],a+=t[l]*e[l],s+=t[l]*t[l],c+=e[l]*e[l];var u=r/o,h=i/o;return n.a=(a-o*u*h)/(s-o*u*u),n.b=h-n.a*u,n.miss=Math.pow((o*a-r*i)/Math.sqrt((o*s-r*r)*(o*c-i*i)),2),n}(e,n);return function(t){return o.a*t+o.b}}(n),n=n.map((function(t,e){return o(e)})),e=o(n.length/2),this.valuePool.shift()):e=this.lastValue,e},t}();var m,v=((m=navigator.userAgent.toLowerCase().match(/cpu (iphone )?os (.*?) like mac os/))?parseInt(m[2],10):0)&&void 0!==window.AlipayJSBridge,g=void 0!==window.WindVane,y={X:!0,Y:!0,interval:Math.floor(1e3/30),useRequestAnimationFrame:!0,relativeBeta:!1,relativeGamma:!1,validRange:{alpha:[-60,60],beta:[-60,180],gamma:[-89,89]},stableRange:3},b=function(){function t(t){void 0===t&&(t={}),this.lastX=0,this.lastY=0,this.prevAcceler={x:0,y:0,z:0},this.stoped=!1,this.options=f(y,t);var e=this.options.stableRange;this.filterX=new d({stableRange:e}),this.filterY=new d({stableRange:e})}return t.prototype.watch=function(t){var e=this;if("function"==typeof t&&!this.watchListener){var n,o,r,i,a,s,c,l=0,u=0,h=0,f=0,d=function(l){e.stoped||(n=l.alpha,o=l.beta,r=l.gamma,f||(f=o||0),h||(h=r||0),p.call(e,{alpha:n,beta:o,gamma:r},e.options.validRange)&&(e.options.X?(i=r-h,s=e.options.relativeGamma?i:r,s=e.filterX.stableFix(s),s=e.filterX.changeLimit(s),s=e.filterX.linearRegressionMedian(+s)):s=0,e.options.Y?(a=o-f,c=e.options.relativeBeta?a:o,c=e.filterY.stableFix(c),c=e.filterY.changeLimit(c),c=e.filterY.linearRegressionMedian(+c)):c=0,e.isValid(s,c)&&(e.options.useRequestAnimationFrame?window.requestAnimationFrame((function(){t(s,c,{alpha:n,beta:o,gamma:r})})):t(s,c,{alpha:n,beta:o,gamma:r}),e.lastX=s,e.lastY=c)))};this.stoped=!1,g?(M(!0,this.options.interval),this.watchListener=function(t){if("param"in t){var n=t.param,o=n.x,r=n.y,i=n.z;if(o===e.prevAcceler.x&&r===e.prevAcceler.y&&i===e.prevAcceler.z)return;e.prevAcceler={x:o,y:r,z:i},d({alpha:180*+i,beta:-90*+r,gamma:90*+o})}},document.addEventListener("motion.gyro",this.watchListener,!1)):v?(w(!0,this.options.interval/1e3),this.watchListener=function(t){if(t&&"data"in t){var e=t.data,n=e.x,o=e.y,r=e.z;d({alpha:180*r,beta:-90*o,gamma:90*n})}},document.addEventListener("accelerometerChange",this.watchListener,!1)):(this.watchListener=function(t){(u=(new Date).getTime())-l>=e.options.interval&&(l=u,d(t))},window.addEventListener("deviceorientation",this.watchListener,!1))}},t.prototype.unWatch=function(){e.assertExist(this.watchListener),g?(M(!1),document.removeEventListener("motion.gyro",this.watchListener)):v?(w(!1),document.removeEventListener("accelerometerChange",this.watchListener)):window.removeEventListener("deviceorientation",this.watchListener),this.stoped=!0,this.watchListener=void 0},t.prototype.pause=function(){this.stoped=!0,v&&w(!1)},t.prototype.continue=function(){this.stoped=!1,v&&w(!0,this.options.interval/1e3)},t.prototype.isValid=function(t,e){return this.lastX!==t||this.lastY!==e},t}();function w(t,e){window.AlipayJSBridge.call("watchShake",{monitorGyroscope:!1,monitorAccelerometer:!!t,interval:t?parseFloat(e.toFixed(3)):10},(function(){}))}function M(t,e){var n={on:t,frequency:e};window.WindVane.call("WVMotion","listenGyro",n,(function(t){console.info("call WVMotion success")}),(function(t){console.error("call WVMotion failed:"+JSON.stringify(t))}))}var R,x=function(){function t(){this.transformers=[],this.connected=!1,this.accelerMotion=null,this.validRange={alpha:[-60,60],beta:[-80,80],gamma:[-89,89]}}return t.prototype.connect=function(){var t=this;this.connected||(this.accelerMotion=new b({X:!0,Y:!0,interval:Math.floor(1e3/60),useRequestAnimationFrame:!0,relativeBeta:!1,relativeGamma:!1,validRange:this.validRange,stableRange:3}),this.accelerMotion.watch((function(e,n){var o={x:e,y:n};t.dispatchMotion(o)}))),this.connected=!0},t.prototype.disconnect=function(){this.accelerMotion&&this.accelerMotion.unWatch(),this.connected=!1},t.prototype.dispatchMotion=function(t){this.transformers.forEach((function(e){return e.update(t)}))},t.prototype.addTransformer=function(t){this.transformers.includes(t)||this.transformers.push(t)},t.prototype.removeTransformer=function(t){var e=this.transformers.indexOf(t);return e>-1&&this.transformers.splice(e,1),0===this.transformers.length},t}();var A=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.order=90,e.adapter=null,e.handleConnect=function(){var t;L||null===(t=e.adapter)||void 0===t||t.connect()},e.handleDisconnect=function(){var t;null===(t=e.adapter)||void 0===t||t.disconnect()},e}return o(e,t),e.prototype.onCompositionConstructed=function(){var t;this.adapter=O(),null===(t=this.adapter)||void 0===t||t.connect(),this.bindAccelerDocumentEvent()},e.prototype.onCompositionReset=function(t){var e,n=t.loaderData.deviceTransformer=new c(t);null===(e=this.adapter)||void 0===e||e.addTransformer(n)},e.prototype.onCompositionUpdate=function(t){var e=t.loaderData.deviceTransformer;e&&e.updateOrientation()},e.prototype.onCompositionDestroyed=function(t){var e,n;(null===(e=this.adapter)||void 0===e?void 0:e.removeTransformer(t.loaderData.deviceTransformer))&&(null===(n=this.adapter)||void 0===n||n.disconnect())},e.prototype.bindAccelerDocumentEvent=function(){this.unbindAccelerDocumentEvent(),document.addEventListener("resume",this.handleConnect,!1),document.addEventListener("pause",this.handleDisconnect,!1),document.addEventListener("back",this.handleDisconnect,!1)},e.prototype.unbindAccelerDocumentEvent=function(){document.removeEventListener("resume",this.handleConnect),document.removeEventListener("pause",this.handleDisconnect),document.removeEventListener("back",this.handleDisconnect)},e.prototype.dispose=function(){O().disconnect(),this.unbindAccelerDocumentEvent()},e}(e.AbstractPlugin),L=!1;function O(){return R||(R=new x),R}e.registerPlugin("orientation-transformer",A,s);var E="1.4.0";e.logger.info("plugin orientation transformer version: "+E),t.OrientationAdapterAcceler=x,t.closeDeviceMotion=function(){L=!0,O().disconnect()},t.getAdapter=O,t.openDeviceMotion=function(){L=!1,O().connect()},t.version=E,Object.defineProperty(t,"__esModule",{value:!0})}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("@galacean/effects")):"function"==typeof define&&define.amd?define(["exports","@galacean/effects"],e):e(((t="undefined"!=typeof globalThis?globalThis:t||self).ge=t.ge||{},t.ge.orientationTransformerPlugin={}),t.ge)}(this,(function(t,e){"use strict";var n=function(t,e){return n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])},n(t,e)};function o(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function o(){this.constructor=t}n(t,e),t.prototype=null===e?Object.create(e):(o.prototype=e.prototype,new o)}var a=function(){return a=Object.assign||function(t){for(var e,n=1,o=arguments.length;n<o;n++)for(var a in e=arguments[n])Object.prototype.hasOwnProperty.call(e,a)&&(t[a]=e[a]);return t},a.apply(this,arguments)};function r(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator];if(!n)return t;var o,a,r=n.call(t),i=[];try{for(;(void 0===e||e-- >0)&&!(o=r.next()).done;)i.push(o.value)}catch(t){a={error:t}}finally{try{o&&!o.done&&(n=r.return)&&n.call(r)}finally{if(a)throw a.error}}return i}function i(t,e,n){if(n||2===arguments.length)for(var o,a=0,r=e.length;a<r;a++)!o&&a in e||(o||(o=Array.prototype.slice.call(e,0,a)),o[a]=e[a]);return t.concat(o||Array.prototype.slice.call(e))}"function"==typeof SuppressedError&&SuppressedError;var s=function(){function t(t){this.composition=t,this.targets={},this.records={},this.currentPos={},this.currentRot={},this.gammaRange=[-89,89],this.betaRange=[-89,89]}return t.prototype.update=function(t){var e=t.x,n=t.y,o=t.beta,a=t.gamma;this.currentEvent={x:e,y:n,beta:o,gamma:a}},t.prototype.updateOrientation=function(){var t=this,e=this.currentEvent;e&&Object.getOwnPropertyNames(this.targets).forEach((function(n){t.moveLayer(n,e)}))},t.prototype.initComposition=function(){for(var t=this.composition.items,e=0;e<t.length;e++){var n=t[e];if(this.targets[n.name]){var o=n.transform.position.toArray(),a=n.transform.rotation.toArray(),r=this.currentPos[n.name],i=this.currentRot[n.name];this.records[n.name]={item:n,position:o,rotation:a},r&&n.transform.setPosition(r[0],r[1],r[2]),i&&n.transform.setRotation(i[0],i[1],i[2])}}},t.prototype.addTarget=function(t){this.targets[t.name]=t},t.prototype.removeTarget=function(t){delete this.targets[t],delete this.records[t]},t.prototype.moveLayer=function(t,e){var n,o,a,s=e.x,h=e.y,p=e.beta,f=e.gamma,m=null===(a=this.records[t])||void 0===a?void 0:a.item;if(m){var d=this.records[t].position,v=this.records[t].rotation,g=this.targets[t],y=c(s,this.betaRange),b=c(h,this.gammaRange);if(g){var w=[d[0]+1.2*l(u(y,this.gammaRange[0],this.gammaRange[1]),g.xMin,g.xMax),d[1]+1.2*l(u(b,this.betaRange[0],this.betaRange[1]),g.yMin,g.yMax),d[2]],M=u(c(.8*f,this.gammaRange),this.gammaRange[0],this.gammaRange[1]),x=u(c(.8*p,this.betaRange),this.betaRange[0],this.betaRange[1]),R=[v[0]+l(x,g.hMin,g.hMax),v[1]+l(M,g.vMin,g.vMax),v[2]];(n=m.transform).setPosition.apply(n,i([],r(w),!1)),(o=m.transform).setRotation.apply(o,i([],r(R),!1)),this.currentPos[t]=w.slice(),this.currentRot[t]=R.slice()}}},t}();function c(t,e){return t<e[0]?e[0]:t>e[1]?e[1]:t}function l(t,e,n){return e+(n-e)*t}function u(t,e,n){return(t-e)/(n-e)}function h(t){return Object.prototype.toString.call(t)}function p(t,e){var n=!0,o=!0,a=!0;if("[object Array]"===h(e.alpha)&&e.alpha.length>=2){var r=t.alpha+e.alpha[0],i=t.alpha+e.alpha[1];n=(r=r<0?r+360:r)<(i=i>360?i-360:i)?t.alpha>r&&t.alpha<i:t.alpha>r||t.alpha<i}return"[object Array]"===h(e.beta)&&e.beta.length>=2&&(o=t.beta>=e.beta[0]&&t.beta<=e.beta[1]),"[object Array]"===h(e.gamma)&&e.gamma.length>=2&&(a=t.gamma>=e.gamma[0]&&t.gamma<=e.gamma[1]),n&&o&&a}function f(t,n){if(!e.isObject(t)&&!e.isArray(t))return t;for(var o=e.isArray(t)?i([],r(t),!1):a({},t),s=arguments.length,c=1;c<s;c++){var l=arguments[c]||{};if(e.isObject(l)){var u=void 0;for(u in l)l.hasOwnProperty(u)&&(e.isObject(o[u])&&e.isObject(l[u])?o[u]=f(o[u],l[u]):e.isObject(l[u])||e.isArray(l[u])?o[u]=f(l[u]):o[u]=l[u]);for(u in o)e.isObject(o[u])&&o.hasOwnProperty(u)&&!l.hasOwnProperty(u)&&(o[u]=f(o[u]))}}if(1===s)for(var u in o)e.isObject(o[u])&&o.hasOwnProperty(u)&&(o[u]=f(o[u]));return o}var m=function(){function t(t){void 0===t&&(t={}),this.options=t,this.lastValue=0,this.valuePool=[]}return t.prototype.stableFix=function(t){var e=this.options.stableRange||3;return Math.abs(t)<e?0:t>e?t-e:t+e},t.prototype.changeLimit=function(t){var e=this.lastValue,n=t;return Math.abs(t-e)>5&&(n=e<t?e+5:e-5),Math.abs(t-e)<1&&(n=e),this.lastValue=n,n},t.prototype.linearRegressionMedian=function(t){var e,n,o;return this.valuePool.push(t),this.valuePool.length>=5?(n=this.valuePool,o=function(t){var e=[],n=[];t.forEach((function(t,o){e.push(o),n.push(t)}));var o=function(t,e){for(var n={},o=e.length,a=0,r=0,i=0,s=0,c=0,l=0;l<e.length;l++)a+=t[l],r+=e[l],i+=t[l]*e[l],s+=t[l]*t[l],c+=e[l]*e[l];var u=a/o,h=r/o;return n.a=(i-o*u*h)/(s-o*u*u),n.b=h-n.a*u,n.miss=Math.pow((o*i-a*r)/Math.sqrt((o*s-a*a)*(o*c-r*r)),2),n}(e,n);return function(t){return o.a*t+o.b}}(n),n=n.map((function(t,e){return o(e)})),e=o(n.length/2),this.valuePool.shift()):e=this.lastValue,e},t}();var d,v=((d=navigator.userAgent.toLowerCase().match(/cpu (iphone )?os (.*?) like mac os/))?parseInt(d[2],10):0)&&void 0!==window.AlipayJSBridge,g=void 0!==window.WindVane,y={X:!0,Y:!0,interval:Math.floor(1e3/30),useRequestAnimationFrame:!0,relativeBeta:!1,relativeGamma:!1,validRange:{alpha:[-60,60],beta:[-60,180],gamma:[-89,89]},stableRange:3},b=function(){function t(t){void 0===t&&(t={}),this.lastX=0,this.lastY=0,this.prevAcceler={x:0,y:0,z:0},this.stoped=!1,this.options=f(y,t);var e=this.options.stableRange;this.filterX=new m({stableRange:e}),this.filterY=new m({stableRange:e})}return t.prototype.watch=function(t){var e=this;if("function"==typeof t&&!this.watchListener){var n,o,a,r,i,s,c=0,l=0,u=NaN,h=NaN,f=function(c){e.stoped||(n=c.alpha,o=c.beta,a=c.gamma,r=p.call(e,{alpha:n,beta:o,gamma:a},e.options.validRange),isNaN(u)&&(u=a,e.filterX.lastValue=a),isNaN(h)&&(h=o,e.filterY.lastValue=o),r&&(e.options.X?(i=e.options.relativeGamma?a-u:a,i=e.filterX.stableFix(i),i=e.filterX.changeLimit(i),i=e.filterX.linearRegressionMedian(+i)):i=0,e.options.Y?(s=e.options.relativeBeta?o-h:o,s=e.filterY.stableFix(s),s=e.filterY.changeLimit(s),s=e.filterY.linearRegressionMedian(+s)):s=0,e.isValid(i,s)&&(e.options.useRequestAnimationFrame?window.requestAnimationFrame((function(){t(i,s,{alpha:n,beta:s-h,gamma:i-u})})):t(i,s,{alpha:n,beta:s-h,gamma:i-u}),e.lastX=i,e.lastY=s)))};this.stoped=!1,g?(M(!0,this.options.interval),this.watchListener=function(t){if("param"in t){var n=t.param,o=n.x,a=n.y,r=n.z;if(o===e.prevAcceler.x&&a===e.prevAcceler.y&&r===e.prevAcceler.z)return;e.prevAcceler={x:o,y:a,z:r},f({alpha:180*+r,beta:-90*+a,gamma:90*+o})}},document.addEventListener("motion.gyro",this.watchListener,!1)):v?(w(!0,this.options.interval/1e3),this.watchListener=function(t){if(t&&"data"in t){var e=t.data,n=e.x,o=e.y,a=e.z;f({alpha:180*a,beta:-90*o,gamma:90*n})}},document.addEventListener("accelerometerChange",this.watchListener,!1)):(this.watchListener=function(t){(l=(new Date).getTime())-c>=e.options.interval&&(c=l,f(t))},window.addEventListener("deviceorientation",this.watchListener,!1))}},t.prototype.unWatch=function(){e.assertExist(this.watchListener),g?(M(!1),document.removeEventListener("motion.gyro",this.watchListener)):v?(w(!1),document.removeEventListener("accelerometerChange",this.watchListener)):window.removeEventListener("deviceorientation",this.watchListener),this.stoped=!0,this.watchListener=void 0},t.prototype.pause=function(){this.stoped=!0,v&&w(!1)},t.prototype.continue=function(){this.stoped=!1,v&&w(!0,this.options.interval/1e3)},t.prototype.isValid=function(t,e){return this.lastX!==t||this.lastY!==e},t}();function w(t,e){window.AlipayJSBridge.call("watchShake",{monitorGyroscope:!1,monitorAccelerometer:!!t,interval:t?parseFloat(e.toFixed(3)):10},(function(){}))}function M(t,e){var n={on:t,frequency:e};window.WindVane.call("WVMotion","listenGyro",n,(function(t){console.info("call WVMotion success")}),(function(t){console.error("call WVMotion failed:"+JSON.stringify(t))}))}var x,R=function(){function t(){this.transformers=[],this.connected=!1,this.accelerMotion=null,this.validRange={alpha:[-60,60],beta:[-80,80],gamma:[-89,89]}}return t.prototype.connect=function(){var t=this;this.connected||(this.accelerMotion=new b({X:!0,Y:!0,interval:Math.floor(1e3/60),useRequestAnimationFrame:!0,relativeBeta:!1,relativeGamma:!1,validRange:this.validRange,stableRange:3}),this.accelerMotion.watch((function(e,n,o){var a={x:e,y:n,beta:o.beta,gamma:o.gamma};t.dispatchMotion(a)}))),this.connected=!0},t.prototype.disconnect=function(){this.accelerMotion&&this.accelerMotion.unWatch(),this.connected=!1},t.prototype.dispatchMotion=function(t){this.transformers.forEach((function(e){return e.update(t)}))},t.prototype.addTransformer=function(t){this.transformers.includes(t)||this.transformers.push(t)},t.prototype.removeTransformer=function(t){var e=this.transformers.indexOf(t);return e>-1&&this.transformers.splice(e,1),0===this.transformers.length},t}();var A=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.order=90,e.adapter=null,e.handleConnect=function(){var t;L||null===(t=e.adapter)||void 0===t||t.connect()},e.handleDisconnect=function(){var t;null===(t=e.adapter)||void 0===t||t.disconnect()},e}return o(e,t),e.prototype.onCompositionConstructed=function(){var t;this.adapter=O(),null===(t=this.adapter)||void 0===t||t.connect(),this.bindAccelerDocumentEvent()},e.prototype.onCompositionReset=function(t){var e,n=t.loaderData.deviceTransformer=new s(t);null===(e=this.adapter)||void 0===e||e.addTransformer(n)},e.prototype.onCompositionUpdate=function(t){var e=t.loaderData.deviceTransformer;e&&e.updateOrientation()},e.prototype.onCompositionDestroyed=function(t){var e,n;(null===(e=this.adapter)||void 0===e?void 0:e.removeTransformer(t.loaderData.deviceTransformer))&&(null===(n=this.adapter)||void 0===n||n.disconnect())},e.prototype.bindAccelerDocumentEvent=function(){this.unbindAccelerDocumentEvent(),document.addEventListener("resume",this.handleConnect,!1),document.addEventListener("pause",this.handleDisconnect,!1),document.addEventListener("back",this.handleDisconnect,!1)},e.prototype.unbindAccelerDocumentEvent=function(){document.removeEventListener("resume",this.handleConnect),document.removeEventListener("pause",this.handleDisconnect),document.removeEventListener("back",this.handleDisconnect)},e.prototype.dispose=function(){O().disconnect(),this.unbindAccelerDocumentEvent()},e}(e.AbstractPlugin),L=!1;function O(){return x||(x=new R),x}var E=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return o(e,t),Object.defineProperty(e.prototype,"type",{get:function(){return"orientation-transformer"},enumerable:!1,configurable:!0}),e.prototype.onConstructed=function(t){var e=t.content.options.targets;e&&(this.targets=e.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}})))},e.prototype.onItemRemoved=function(t){var e;null===(e=this.targets)||void 0===e||e.forEach((function(e){var n;return null===(n=t.loaderData.deviceTransformer)||void 0===n?void 0:n.removeTarget(e.name)}))},e.prototype.doCreateContent=function(t){var e,n=t.loaderData.deviceTransformer;return n&&(null===(e=this.targets)||void 0===e||e.forEach((function(t){return n.addTarget(t)})),n.initComposition()),{}},e}(e.VFXItem);e.registerPlugin("orientation-transformer",A,E);var P="1.4.2";e.logger.info("plugin orientation transformer version: "+P),t.OrientationAdapterAcceler=R,t.closeDeviceMotion=function(){L=!0,O().disconnect()},t.getAdapter=O,t.openDeviceMotion=function(){L=!1,O().connect()},t.version=P,Object.defineProperty(t,"__esModule",{value:!0})}));
 //# sourceMappingURL=index.min.js.map

package/dist/index.mjs

@@ -3,10 +3,10 @@
  * Description: Galacean Effects player orientation transformer plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,意绮
- * Version: v1.4.0
+ * Version: v1.4.2
  */
 
-import { VFXItem, isObject, isArray, assertExist, AbstractPlugin, registerPlugin, logger } from '@galacean/effects';
+import { isObject, isArray, assertExist, AbstractPlugin, VFXItem, registerPlugin, logger } from '@galacean/effects';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -82,55 +82,6 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-/**
- * 水平旋转变化起始角（手机处于改角度时无变化）
- * 待调试
- */
-var VERTICAL_INIT_DEGREE = 45;
-var TransformVFXItem = /** @class */ (function (_super) {
-    __extends(TransformVFXItem, _super);
-    function TransformVFXItem() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Object.defineProperty(TransformVFXItem.prototype, "type", {
-        get: function () {
-            return 'orientation-transformer';
-        },
-        enumerable: false,
-        configurable: true
-    });
-    TransformVFXItem.prototype.onConstructed = function (options) {
-        var targets = options.content.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,
-                vMin: +t.vMin || 0,
-                hMin: +t.hMin || 0,
-                vMax: +t.vMax || 0,
-                hMax: +t.hMax || 0,
-            }); });
-        }
-    };
-    TransformVFXItem.prototype.onItemRemoved = function (composition) {
-        var _a;
-        (_a = this.targets) === null || _a === void 0 ? void 0 : _a.forEach(function (target) { var _a; return (_a = composition.loaderData.deviceTransformer) === null || _a === void 0 ? void 0 : _a.removeTarget(target.name); });
-    };
-    TransformVFXItem.prototype.doCreateContent = function (composition) {
-        var _a;
-        var transformer = composition.loaderData.deviceTransformer;
-        if (transformer) {
-            (_a = this.targets) === null || _a === void 0 ? void 0 : _a.forEach(function (target) { return transformer.addTarget(target); });
-            transformer.initComposition();
-        }
-        return {};
-    };
-    return TransformVFXItem;
-}(VFXItem));
-
 var CompositionTransformerAcceler = /** @class */ (function () {
     function CompositionTransformerAcceler(composition) {
         this.composition = composition;
@@ -142,8 +93,8 @@ var CompositionTransformerAcceler = /** @class */ (function () {
         this.betaRange = [-89, 89];
     }
     CompositionTransformerAcceler.prototype.update = function (_a) {
-        var x = _a.x, y = _a.y;
-        this.currentEvent = { x: x, y: y };
+        var x = _a.x, y = _a.y, beta = _a.beta, gamma = _a.gamma;
+        this.currentEvent = { x: x, y: y, beta: beta, gamma: gamma };
     };
     CompositionTransformerAcceler.prototype.updateOrientation = function () {
         var _this = this;
@@ -188,7 +139,7 @@ var CompositionTransformerAcceler = /** @class */ (function () {
     CompositionTransformerAcceler.prototype.moveLayer = function (name, _a) {
         var _b, _c;
         var _d;
-        var x = _a.x, y = _a.y;
+        var x = _a.x, y = _a.y, b = _a.beta, g = _a.gamma;
         var layer = (_d = this.records[name]) === null || _d === void 0 ? void 0 : _d.item;
         if (layer) {
             var initPosition = this.records[name].position;
@@ -197,17 +148,18 @@ var CompositionTransformerAcceler = /** @class */ (function () {
             var beta = clamp(x, this.betaRange), gamma = clamp(y, this.gammaRange);
             if (target) {
                 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[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],
                 ];
-                var br = (clamp(x * 2, this.betaRange) - this.betaRange[0]) / (this.betaRange[1] - this.betaRange[0]);
-                var gr = (clamp(y * 2 - VERTICAL_INIT_DEGREE, this.gammaRange) - this.gammaRange[0]) / (this.gammaRange[1] - this.gammaRange[0]);
+                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],
                 ];
+                // console.log(y, initY, y - initY);
                 (_b = layer.transform).setPosition.apply(_b, __spreadArray([], __read(position), false));
                 (_c = layer.transform).setRotation.apply(_c, __spreadArray([], __read(rotation), false));
                 this.currentPos[name] = position.slice();
@@ -229,6 +181,9 @@ 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 getObjectType(obj) {
     return Object.prototype.toString.call(obj);
@@ -480,13 +435,11 @@ 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
@@ -497,23 +450,23 @@ var DeviceOrientation = /** @class */ (function () {
             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,
             }, _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);
@@ -522,9 +475,7 @@ var DeviceOrientation = /** @class */ (function () {
                     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);
@@ -535,11 +486,11 @@ var DeviceOrientation = /** @class */ (function () {
                 if (_this.isValid(x, y)) {
                     if (_this.options.useRequestAnimationFrame) {
                         window.requestAnimationFrame(function () {
-                            callback(x, y, { alpha: alpha, beta: beta, gamma: gamma });
+                            callback(x, y, { alpha: alpha, beta: y - referBeta, gamma: x - referGamma });
                         });
                     }
                     else {
-                        callback(x, y, { alpha: alpha, beta: beta, gamma: gamma });
+                        callback(x, y, { alpha: alpha, beta: y - referBeta, gamma: x - referGamma });
                     }
                     _this.lastX = x;
                     _this.lastY = y;
@@ -688,10 +639,13 @@ var OrientationAdapterAcceler = /** @class */ (function () {
                 validRange: this.validRange,
                 stableRange: 3, // 稳定区间
             });
-            this.accelerMotion.watch(function (x, y) {
+            this.accelerMotion.watch(function (x, y, _a) {
+                var beta = _a.beta, gamma = _a.gamma;
                 var motion = {
                     x: x,
                     y: y,
+                    beta: beta,
+                    gamma: gamma,
                 };
                 _this.dispatchMotion(motion);
             });
@@ -811,8 +765,52 @@ function openDeviceMotion() {
     getAdapter().connect();
 }
 
+var TransformVFXItem = /** @class */ (function (_super) {
+    __extends(TransformVFXItem, _super);
+    function TransformVFXItem() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(TransformVFXItem.prototype, "type", {
+        get: function () {
+            return 'orientation-transformer';
+        },
+        enumerable: false,
+        configurable: true
+    });
+    TransformVFXItem.prototype.onConstructed = function (options) {
+        var targets = options.content.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,
+                vMin: +t.vMin || 0,
+                hMin: +t.hMin || 0,
+                vMax: +t.vMax || 0,
+                hMax: +t.hMax || 0,
+            }); });
+        }
+    };
+    TransformVFXItem.prototype.onItemRemoved = function (composition) {
+        var _a;
+        (_a = this.targets) === null || _a === void 0 ? void 0 : _a.forEach(function (target) { var _a; return (_a = composition.loaderData.deviceTransformer) === null || _a === void 0 ? void 0 : _a.removeTarget(target.name); });
+    };
+    TransformVFXItem.prototype.doCreateContent = function (composition) {
+        var _a;
+        var transformer = composition.loaderData.deviceTransformer;
+        if (transformer) {
+            (_a = this.targets) === null || _a === void 0 ? void 0 : _a.forEach(function (target) { return transformer.addTarget(target); });
+            transformer.initComposition();
+        }
+        return {};
+    };
+    return TransformVFXItem;
+}(VFXItem));
+
 registerPlugin('orientation-transformer', OrientationPluginLoader, TransformVFXItem);
-var version = "1.4.0";
+var version = "1.4.2";
 logger.info('plugin orientation transformer version: ' + version);
 
 export { OrientationAdapterAcceler, closeDeviceMotion, getAdapter, openDeviceMotion, version };

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/orientation-adapter-acceler.d.ts

@@ -2,6 +2,8 @@ import type { CompositionTransformerAcceler } from './composition-transformer-ac
 export type AccelerMotionData = {
     x: number;
     y: number;
+    beta: number;
+    gamma: number;
 };
 /**
  *

package/dist/transform-vfx-item.d.ts

@@ -1,11 +1,6 @@
 import type { spec, Composition } from '@galacean/effects';
 import { VFXItem } from '@galacean/effects';
 import type { TransformItem } from './transform-item';
-/**
- * 水平旋转变化起始角（手机处于改角度时无变化）
- * 待调试
- */
-export declare const VERTICAL_INIT_DEGREE = 45;
 export declare class TransformVFXItem extends VFXItem<TransformItem> {
     private targets?;
     get type(): spec.ItemType;

package/dist/utils/filtering.d.ts

@@ -16,7 +16,7 @@ type FilteringOptions = {
  */
 export declare class Filtering {
     private readonly options;
-    private lastValue;
+    lastValue: number;
     private valuePool;
     constructor(options?: FilteringOptions);
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-orientation-transformer",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Galacean Effects player orientation transformer plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",
@@ -31,7 +31,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "devDependencies": {
-    "@galacean/effects": "1.4.0"
+    "@galacean/effects": "1.4.2"
   },
   "scripts": {
     "dev": "vite",