@netless/slide 0.2.1 → 0.2.5

package/lib/PlayerController.js

@@ -17,7 +17,8 @@ var PlayerController = /** @class */ (function () {
         var _this = this;
         this.stateId = setInterval(function () {
             if (_this.player.view) {
-                _this.controller.runTimeFps.setValue(_this.player.runtime.fps);
+                _this.controller.runTimeFps.setValue(_this.player.fps.value);
+                _this.controller.drawCall.setValue(_this.player.runtime.drawCall);
                 _this.controller.runTimeResolution.setValue(_this.player.view.width + "*" + _this.player.view.height);
             }
         }, 500);
@@ -30,21 +31,28 @@ var PlayerController = /** @class */ (function () {
         });
         gui.domElement.style.opacity = ".6";
         gui.domElement.style.transformOrigin = "100% 0";
-        gui.domElement.style.transform = "scale(1.4)";
+        gui.domElement.style.transform = "scale(1)";
         this.target.appendChild(gui.domElement);
         gui.domElement.style.position = "absolute";
         gui.domElement.style.right = "0";
         gui.domElement.style.top = "0";
         gui.domElement.style.zIndex = "2";
+        var runTimeFps = gui.add({ "FPS": 0 }, "FPS", 0);
+        var drawCall = gui.add({ "drawCall": 0 }, "drawCall", 0);
+        var runTimeResolution = gui.add({ "分辨率": "" }, "分辨率", "");
+        var moreCalculation = gui.add({ "额外计算": 0 }, "额外计算", 0, 200);
+        var renderOptions = gui.addFolder("renderOptions");
         this.controller = {
-            runTimeFps: gui.add({ "FPS": 0 }, "FPS", 0),
-            runTimeResolution: gui.add({ "分辨率": "" }, "分辨率", ""),
-            autoResolution: gui.add({ "自动分辨率": (_a = this.data.autoResolution) !== null && _a !== void 0 ? _a : false }, "自动分辨率", true),
-            autoFps: gui.add({ "自动fps": (_b = this.data.autoFPS) !== null && _b !== void 0 ? _b : true }, "自动fps", true),
-            moreCalculation: gui.add({ "额外计算": 0 }, "额外计算", 0, 100),
-            minFPS: gui.add({ "最低fps": (_c = this.data.minFPS) !== null && _c !== void 0 ? _c : 40 }, "最低fps", 0, 60),
-            maxFPS: gui.add({ "最高fps": (_d = this.data.maxFPS) !== null && _d !== void 0 ? _d : 50 }, "最高fps", 0, 60),
-            resolution: gui.add({ "目标分辨倍率": (_e = this.data.resolution) !== null && _e !== void 0 ? _e : window.devicePixelRatio }, "目标分辨倍率", 0.5, 4),
+            runTimeResolution: runTimeResolution,
+            runTimeFps: runTimeFps,
+            drawCall: drawCall,
+            moreCalculation: moreCalculation,
+            minFPS: renderOptions.add({ "最低fps": (_a = this.data.minFPS) !== null && _a !== void 0 ? _a : 40 }, "最低fps", 0, 60),
+            maxFPS: renderOptions.add({ "最高fps": (_b = this.data.maxFPS) !== null && _b !== void 0 ? _b : 50 }, "最高fps", 0, 60),
+            resolution: renderOptions.add({ "目标分辨倍率": (_c = this.data.resolution) !== null && _c !== void 0 ? _c : window.devicePixelRatio }, "目标分辨倍率", 0.5, 6),
+            autoResolution: renderOptions.add({ "自动分辨率": (_d = this.data.autoResolution) !== null && _d !== void 0 ? _d : false }, "自动分辨率", true),
+            autoFps: renderOptions.add({ "自动fps": (_e = this.data.autoFPS) !== null && _e !== void 0 ? _e : true }, "自动fps", true),
+            transactionBgColor: renderOptions.addColor({ "切页背景色": this.data.transactionBgColor }, "切页背景色"),
         };
         this.controller.runTimeFps.disabled = true;
         this.controller.runTimeResolution.disabled = true;
@@ -72,6 +80,10 @@ var PlayerController = /** @class */ (function () {
             _this.data.resolution = value;
             _this.player.updateConfig(_this.data);
         });
+        this.controller.transactionBgColor.onChange(function (value) {
+            _this.data.transactionBgColor = value;
+            _this.player.updateConfig(_this.data);
+        });
         var md5Value;
         this.controller.moreCalculation.onChange(function (value) {
             var calc = function () {

package/lib/Slide.d.ts

@@ -29,8 +29,6 @@ export interface ISlideRenderOptions {
     maxFPS?: number;
     /** 渲染分辨倍率, 整数,  默认为 window.devicePixelRatio */
     resolution?: number;
-    /** 最小分辨倍率, 默认为 1 */
-    minResolution?: number;
     /** 是否根据 fps, 自动调整分辨率, 默认为 false */
     autoResolution?: boolean;
     /** 是否自动降低渲染 fps */
@@ -59,6 +57,12 @@ export interface ISlideConfig {
      * "local" 本地模式, 不会触发任意同步事件
      */
     mode: "interactive" | "sync" | "local";
+    /**
+     * 是否启用全局点击, 开启后, 只要点击到 ppt 视口范围,
+     * 并且没有触发 ppt 内部可互动元素, 就会触发下一步动作.
+     * 默认为 false
+     */
+    enableGlobalClick?: boolean;
 }
 interface MediaState {
     type: "pause" | "play";
@@ -164,6 +168,8 @@ export declare class Slide extends Slide_base {
     private needClearCacheImage;
     private version?;
     private __slideState;
+    private userInputTime;
+    private isSyncingSlideState;
     private resize;
     private isAnimating;
     private renderingTaskManager;
@@ -178,6 +184,7 @@ export declare class Slide extends Slide_base {
     private frameResizeObserver;
     private timestamp;
     private mode;
+    private enableGlobalClick;
     private log;
     private logId;
     private lastEmitedState;
@@ -190,11 +197,17 @@ export declare class Slide extends Slide_base {
     private config;
     private isFrowning;
     private isReleasing;
+    private isTouchStart;
+    private touchStartId;
     private designWidth;
     private designHeight;
     private _slideCount;
     constructor(config: ISlideConfig);
     private initPlayer;
+    private userInputHandle;
+    private handleViewClick;
+    private handleViewTouchStart;
+    private handleViewTouchEnd;
     private createController;
     private persistLog;
     private handleSlideRef;