@galacean/effects-plugin-orientation-transformer 2.0.0-alpha.8 → 2.0.0-beta.0

package/dist/index.mjs

@@ -3,10 +3,11 @@
  * Description: Galacean Effects player orientation transformer plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,意绮
- * Version: v2.0.0-alpha.8
+ * Version: v2.0.0-beta.0
  */
 
-import { ItemBehaviour, VFXItem, isObject, isArray, assertExist, AbstractPlugin, registerPlugin, logger } from '@galacean/effects';
+import * as EFFECTS from '@galacean/effects';
+import { isArray, isIOSByUA, isMiniProgram, assertExist, AbstractPlugin, effectsClass, Behaviour, registerPlugin, VFXItem, logger } from '@galacean/effects';
 
 function _set_prototype_of(o, p) {
     _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
@@ -30,75 +31,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;
-}(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;
-}(VFXItem);
-
 var CompositionTransformerAcceler = /*#__PURE__*/ function() {
     function CompositionTransformerAcceler(composition) {
         this.composition = composition;
@@ -117,10 +49,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() {
@@ -164,7 +98,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) {
@@ -175,12 +109,12 @@ var CompositionTransformerAcceler = /*#__PURE__*/ function() {
             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[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),
@@ -206,9 +140,19 @@ 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);
+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);
 }
 
 /**
@@ -220,7 +164,7 @@ function getObjectType(obj) {
     var flagAlpha = true;
     var flagBeta = true;
     var flagGamma = true;
-    if (getObjectType(validRange.alpha) === "[object Array]" && validRange.alpha.length >= 2) {
+    if (isArray(validRange.alpha) && validRange.alpha.length >= 2) {
         var referAlphaA = angleObj.alpha + validRange.alpha[0];
         var referAlphaB = angleObj.alpha + validRange.alpha[1];
         referAlphaA = referAlphaA < 0 ? referAlphaA + 360 : referAlphaA;
@@ -231,72 +175,15 @@ function getObjectType(obj) {
             flagAlpha = angleObj.alpha > referAlphaA || angleObj.alpha < referAlphaB;
         }
     }
-    if (getObjectType(validRange.beta) === "[object Array]" && validRange.beta.length >= 2) {
+    if (isArray(validRange.beta) && 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 (isArray(validRange.gamma) && validRange.gamma.length >= 2) {
         flagGamma = angleObj.gamma >= validRange.gamma[0] && angleObj.gamma <= validRange.gamma[1];
     }
     return flagAlpha && flagBeta && flagGamma;
 }
 
-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 deepMerge(target, args) {
-    if (!isObject(target) && !isArray(target)) {
-        return target;
-    }
-    var result = isArray(target) ? [].concat(target) : _extends({}, target);
-    var length = arguments.length;
-    for(var index = 1; index < length; index++){
-        var source = arguments[index] || {};
-        if (isObject(source)) {
-            var prop = void 0;
-            for(prop in source){
-                if (source.hasOwnProperty(prop)) {
-                    if (isObject(result[prop]) && isObject(source[prop])) {
-                        result[prop] = deepMerge(result[prop], source[prop]);
-                    } else if (isObject(source[prop])) {
-                        result[prop] = deepMerge(source[prop]);
-                    } else if (isArray(source[prop])) {
-                        result[prop] = deepMerge(source[prop]);
-                    } else {
-                        result[prop] = source[prop];
-                    }
-                }
-            }
-            for(prop in result){
-                if (isObject(result[prop]) && result.hasOwnProperty(prop) && !source.hasOwnProperty(prop)) {
-                    result[prop] = deepMerge(result[prop]);
-                }
-            }
-        }
-    }
-    if (length === 1) {
-        for(var prop1 in result){
-            if (isObject(result[prop1]) && result.hasOwnProperty(prop1)) {
-                result[prop1] = deepMerge(result[prop1]);
-            }
-        }
-    }
-    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;
-}
-
 /**
  * 稳定区间
  */ var STABLE_RANGE = 3;
@@ -410,7 +297,7 @@ function getLinearRegressionFixedVal(valuePool) {
     return fx(valuePool.length / 2);
 }
 
-var useJSBridge = isIOS() && typeof window.AlipayJSBridge !== "undefined";
+var useJSBridge = isIOSByUA() && typeof window.AlipayJSBridge !== "undefined";
 var useWindVane = typeof window.WindVane !== "undefined";
 // 默认参数
 var defaultOptions = {
@@ -447,7 +334,11 @@ var DeviceOrientation = /*#__PURE__*/ function() {
             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
@@ -468,13 +359,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
@@ -482,26 +371,26 @@ var DeviceOrientation = /*#__PURE__*/ function() {
             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;
-            }
-            //
+            alpha = e.alpha || 0; // 垂直于屏幕的轴 0 ~ 360
+            beta = e.beta || 0; // 横向 X 轴 -180 ~ 180
+            gamma = e.gamma || 0; // 纵向 Y 轴 -90 ~ 90
             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);
@@ -509,9 +398,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);
@@ -523,15 +410,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;
@@ -564,7 +451,7 @@ var DeviceOrientation = /*#__PURE__*/ function() {
                 }
             };
             document.addEventListener("motion.gyro", this.watchListener, false);
-        } else if (useJSBridge) {
+        } else if (useJSBridge && !isMiniProgram()) {
             switchIOSEvent(true, this.options.interval / 1000);
             this.watchListener = function(e) {
                 if (e && "data" in e) {
@@ -647,9 +534,9 @@ function switchWindVane(open, interval) {
         frequency: interval
     };
     window.WindVane.call("WVMotion", "listenGyro", params, function(e) {
-        console.info("call WVMotion success");
+        console.info("Call WVMotion success.");
     }, function(e) {
-        console.error("call WVMotion failed:" + JSON.stringify(e));
+        console.error("Call WVMotion failed: " + JSON.stringify(e) + ".");
     });
 }
 
@@ -689,10 +576,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);
             });
@@ -815,9 +705,80 @@ function openDeviceMotion() {
     getAdapter().connect();
 }
 
-registerPlugin("orientation-transformer", OrientationPluginLoader, TransformVFXItem);
-var version = "2.0.0-alpha.8";
-logger.info("plugin orientation transformer version: " + version);
+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;
+};
+
+var OrientationComponent = /*#__PURE__*/ function(Behaviour) {
+    _inherits(OrientationComponent, Behaviour);
+    function OrientationComponent() {
+        return Behaviour.apply(this, arguments);
+    }
+    var _proto = OrientationComponent.prototype;
+    _proto.fromData = function fromData(data) {
+        Behaviour.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,
+                    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;
+}(Behaviour);
+OrientationComponent = __decorate([
+    effectsClass("OrientationComponent")
+], OrientationComponent);
+
+registerPlugin("orientation-transformer", OrientationPluginLoader, VFXItem);
+var version = "2.0.0-beta.0";
+logger.info("Plugin orientation transformer version: " + version + ".");
+if (version !== EFFECTS.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!");
+}
 
-export { OrientationAdapterAcceler, closeDeviceMotion, getAdapter, openDeviceMotion, version };
+export { OrientationAdapterAcceler, OrientationComponent, OrientationPluginLoader, closeDeviceMotion, getAdapter, openDeviceMotion, version };
 //# sourceMappingURL=index.mjs.map