@galacean/effects-plugin-orientation-transformer 2.0.0-alpha.10 → 2.0.0-alpha.12

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: v2.0.0-alpha.10
+ * Version: v2.0.0-alpha.12
  */
 
 'use strict';
@@ -34,75 +34,6 @@ function _inherits(subClass, superClass) {
     if (superClass) _set_prototype_of(subClass, superClass);
 }
 
-var OrientationComponent = /*#__PURE__*/ function(ItemBehaviour) {
-    _inherits(OrientationComponent, ItemBehaviour);
-    function OrientationComponent() {
-        return ItemBehaviour.apply(this, arguments);
-    }
-    var _proto = OrientationComponent.prototype;
-    _proto.fromData = function fromData(data) {
-        ItemBehaviour.prototype.fromData.call(this, data);
-        var targets = data.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
-                };
-            });
-        }
-    };
-    _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) {
-            var _this_targets;
-            (_this_targets = this.targets) == null ? void 0 : _this_targets.forEach(function(target) {
-                return transformer.addTarget(target);
-            });
-            transformer.initComposition();
-        }
-    };
-    _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();
-        }
-    };
-    _proto.onDestroy = function onDestroy() {
-        var _this = this;
-        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);
-
-/**
- * 水平旋转变化起始角（手机处于改角度时无变化）
- */ var VERTICAL_INIT_DEGREE = 45;
-var TransformVFXItem = /*#__PURE__*/ function(VFXItem) {
-    _inherits(TransformVFXItem, VFXItem);
-    function TransformVFXItem(engine, props) {
-        var _this;
-        _this = VFXItem.call(this, engine, props) || this;
-        var component = _this.addComponent(OrientationComponent);
-        component.fromData(props);
-        return _this;
-    }
-    return TransformVFXItem;
-}(effects.VFXItem);
-
 var CompositionTransformerAcceler = /*#__PURE__*/ function() {
     function CompositionTransformerAcceler(composition) {
         this.composition = composition;
@@ -121,10 +52,12 @@ var CompositionTransformerAcceler = /*#__PURE__*/ function() {
     }
     var _proto = CompositionTransformerAcceler.prototype;
     _proto.update = function update(param) {
-        var x = param.x, y = param.y;
+        var x = param.x, y = param.y, beta = param.beta, gamma = param.gamma;
         this.currentEvent = {
             x: x,
-            y: y
+            y: y,
+            beta: beta,
+            gamma: gamma
         };
     };
     _proto.updateOrientation = function updateOrientation() {
@@ -168,7 +101,7 @@ var CompositionTransformerAcceler = /*#__PURE__*/ function() {
         delete this.records[name];
     };
     _proto.moveLayer = function moveLayer(name, param) {
-        var x = param.x, y = param.y;
+        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) {
@@ -177,14 +110,15 @@ var CompositionTransformerAcceler = /*#__PURE__*/ function() {
             var target = this.targets[name];
             var beta = clamp(x, this.betaRange), gamma = clamp(y, this.gammaRange);
             if (target) {
-                var _layer_transform, _layer_transform1;
+                var // console.log(y, initY, y - initY);
+                _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[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),
@@ -210,6 +144,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);
@@ -472,13 +409,11 @@ var DeviceOrientation = /*#__PURE__*/ 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
@@ -489,23 +424,23 @@ var DeviceOrientation = /*#__PURE__*/ 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);
@@ -513,9 +448,7 @@ var DeviceOrientation = /*#__PURE__*/ 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);
@@ -527,15 +460,15 @@ var DeviceOrientation = /*#__PURE__*/ function() {
                         window.requestAnimationFrame(function() {
                             callback(x, y, {
                                 alpha: alpha,
-                                beta: beta,
-                                gamma: gamma
+                                beta: y - referBeta,
+                                gamma: x - referGamma
                             });
                         });
                     } else {
                         callback(x, y, {
                             alpha: alpha,
-                            beta: beta,
-                            gamma: gamma
+                            beta: y - referBeta,
+                            gamma: x - referGamma
                         });
                     }
                     _this.lastX = x;
@@ -693,10 +626,13 @@ function switchWindVane(open, interval) {
                 validRange: this.validRange,
                 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
+                    y: y,
+                    beta: beta,
+                    gamma: gamma
                 };
                 _this.dispatchMotion(motion);
             });
@@ -819,8 +755,74 @@ function openDeviceMotion() {
     getAdapter().connect();
 }
 
+var OrientationComponent = /*#__PURE__*/ function(ItemBehaviour) {
+    _inherits(OrientationComponent, ItemBehaviour);
+    function OrientationComponent() {
+        return ItemBehaviour.apply(this, arguments);
+    }
+    var _proto = OrientationComponent.prototype;
+    _proto.fromData = function fromData(data) {
+        ItemBehaviour.prototype.fromData.call(this, data);
+        var targets = data.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
+                };
+            });
+        }
+    };
+    _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) {
+            var _this_targets;
+            (_this_targets = this.targets) == null ? void 0 : _this_targets.forEach(function(target) {
+                return transformer.addTarget(target);
+            });
+            transformer.initComposition();
+        }
+    };
+    _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();
+        }
+    };
+    _proto.onDestroy = function onDestroy() {
+        var _this = this;
+        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);
+
+var TransformVFXItem = /*#__PURE__*/ function(VFXItem) {
+    _inherits(TransformVFXItem, VFXItem);
+    function TransformVFXItem(engine, props) {
+        var _this;
+        _this = VFXItem.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.10";
+var version = "2.0.0-alpha.12";
 effects.logger.info("plugin orientation transformer version: " + version);
 
 exports.OrientationAdapterAcceler = OrientationAdapterAcceler;