refactor: apply review

benmccann · Nov 9, 2020 · f48be9b · f48be9b
1 parent 3bfd6c3
commit f48be9b
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 68 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -28,9 +28,9 @@ module.exports = config => {
 
     webpack: {
       devtool: "inline-source-map",
-			resolve: {
+      resolve: {
         extensions: [".ts", ".js"]
-			},
+      },
       mode: "none",
       module: {
         rules: [
@@ -50,20 +50,20 @@ module.exports = config => {
               ],
               "plugins": [
                 "@babel/plugin-transform-modules-commonjs",
-								["@babel/plugin-proposal-class-properties", {"loose": true}],
+                ["@babel/plugin-proposal-class-properties", {"loose": true}],
               ]
             }
           },
           {
-						test: /\.ts$/,
-						exclude: /node_modules/,
-						use: {
-							loader: "ts-loader",
-							options: {
-								transpileOnly: true,
-								compilerOptions: {
-									module: "es5",
-								},
+            test: /\.ts$/,
+            exclude: /node_modules/,
+            use: {
+              loader: "ts-loader",
+              options: {
+                transpileOnly: true,
+                compilerOptions: {
+                  module: "es5",
+                },
               }
             }
           }
@@ -102,18 +102,18 @@ module.exports = config => {
   karmaConfig.browsers.push(config.chrome ? "Chrome" : "ChromeHeadlessGL");
 
   if (config.coverage) {
-		karmaConfig.reporters.push("coverage-istanbul");
-		karmaConfig.coverageIstanbulReporter = {
-			reports: ["text-summary", "html", "lcovonly"],
-			dir: "./coverage"
-		};
-		karmaConfig.webpack.module.rules.unshift({
-			test: /\.js$/,
-			exclude: /(node_modules|test)/,
-			loader: "istanbul-instrumenter-loader"
-		});
-		karmaConfig.singleRun = true;
-	}
+    karmaConfig.reporters.push("coverage-istanbul");
+    karmaConfig.coverageIstanbulReporter = {
+      reports: ["text-summary", "html", "lcovonly"],
+      dir: "./coverage"
+    };
+    karmaConfig.webpack.module.rules.unshift({
+      test: /\.js$/,
+      exclude: /(node_modules|test)/,
+      loader: "istanbul-instrumenter-loader"
+    });
+    karmaConfig.singleRun = true;
+  }
 
   config.set(karmaConfig);
 };
diff --git a/src/PanoImageRenderer/WebGLUtils.ts b/src/PanoImageRenderer/WebGLUtils.ts
@@ -24,10 +24,11 @@ export default class WebGLUtils {
 
     if (success) {
       return shader;
-    } else {
-      // eslint-disable-next-line
-      console.error(gl.getShaderInfoLog(shader));
     }
+
+    // eslint-disable-next-line
+    console.error(gl.getShaderInfoLog(shader));
+
     return null;
   }
 

diff --git a/src/PanoImageRenderer/renderer/CubeRenderer.ts b/src/PanoImageRenderer/renderer/CubeRenderer.ts
@@ -1,4 +1,4 @@
-import Agent from "@egjs/agent";
+import agent from "@egjs/agent";
 import Renderer from "./Renderer";
 import WebGLUtils from "../WebGLUtils";
 import { util as mathUtil } from "../../utils/math-util";
@@ -217,11 +217,11 @@ void main(void) {
   }
 
   public getMaxCubeMapTextureSize(gl: WebGLRenderingContext, image: HTMLImageElement | HTMLVideoElement) {
-    const agent = Agent();
+    const agentInfo = agent();
     const maxCubeMapTextureSize = gl.getParameter(gl.MAX_CUBE_MAP_TEXTURE_SIZE);
     let _imageWidth = this.getSourceTileSize(image);
 
-    if (agent.browser.name === "ie" && agent.browser.majorVersion === 11) {
+    if (agentInfo.browser.name === "ie" && agentInfo.browser.majorVersion === 11) {
       if (!mathUtil.isPowerOfTwo(_imageWidth)) {
         for (let i = 1; i < maxCubeMapTextureSize; i *= 2) {
           if (i < _imageWidth) {
@@ -233,8 +233,8 @@ void main(void) {
         }
       }
     }
-    if (agent.os.name === "ios") {
-      const majorVersion = agent.os.majorVersion;
+    if (agentInfo.os.name === "ios") {
+      const majorVersion = agentInfo.os.majorVersion;
 
       // ios 9 의 경우 텍스쳐 최대사이즈는 1024 이다.
       if (majorVersion === 9) {

diff --git a/src/PanoImageRenderer/renderer/Renderer.ts b/src/PanoImageRenderer/renderer/Renderer.ts
@@ -1,10 +1,10 @@
 import Component from "@egjs/component";
-import Agent from "@egjs/agent";
+import agent from "@egjs/agent";
 import { mat4 } from "gl-matrix";
 import { CubemapConfig, TileConfig } from "../../types";
 
-const agent = Agent();
-const isIE11 = agent.browser.name === "ie" && agent.browser.majorVersion === 11;
+const agentInfo = agent();
+const isIE11 = agentInfo.browser.name === "ie" && agentInfo.browser.majorVersion === 11;
 
 const EVENTS: {
   ERROR: "error",

diff --git a/src/PanoImageRenderer/vr/VRManager.ts b/src/PanoImageRenderer/vr/VRManager.ts
@@ -89,29 +89,24 @@ class VRManager {
   }
 
   public requestPresent(canvas: HTMLCanvasElement) {
-    return new Promise((resolve, reject) => {
-      navigator.getVRDisplays().then(displays => {
-        const vrDisplay = displays.length && displays[0];
-
-        if (!vrDisplay) {
-          reject(new Error("No displays available."));
-          return;
-        }
-        if (!vrDisplay.capabilities.canPresent) {
-          reject(new Error("Display lacking capability to present."));
-          return;
-        }
-
-        vrDisplay.requestPresent([{source: canvas}]).then(() => {
-          const leftEye = vrDisplay.getEyeParameters(EYES.LEFT);
-          const rightEye = vrDisplay.getEyeParameters(EYES.RIGHT);
-
-          canvas.width = Math.max(leftEye.renderWidth, rightEye.renderWidth) * 2;
-          canvas.height = Math.max(leftEye.renderHeight, rightEye.renderHeight);
-
-          this._setDisplay(vrDisplay);
-          resolve();
-        });
+    return navigator.getVRDisplays().then(displays => {
+      const vrDisplay = displays.length && displays[0];
+
+      if (!vrDisplay) {
+        return Promise.reject(new Error("No displays available."));
+      }
+      if (!vrDisplay.capabilities.canPresent) {
+        return Promise.reject(new Error("Display lacking capability to present."));
+      }
+
+      vrDisplay.requestPresent([{source: canvas}]).then(() => {
+        const leftEye = vrDisplay.getEyeParameters(EYES.LEFT);
+        const rightEye = vrDisplay.getEyeParameters(EYES.RIGHT);
+
+        canvas.width = Math.max(leftEye.renderWidth, rightEye.renderWidth) * 2;
+        canvas.height = Math.max(leftEye.renderHeight, rightEye.renderHeight);
+
+        this._setDisplay(vrDisplay);
       });
     });
   }

diff --git a/src/PanoImageRenderer/vr/XRManager.ts b/src/PanoImageRenderer/vr/XRManager.ts
@@ -87,19 +87,11 @@ class XRManager {
   }
 
   public addEndCallback(callback: (evt?: Event) => any) {
-    const session = this._xrSession;
-
-    if (!session) return;
-
-    session.addEventListener("end", callback);
+    this._xrSession?.addEventListener("end", callback);
   }
 
   public removeEndCallback(callback: (evt?: Event) => any) {
-    const session = this._xrSession;
-
-    if (!session) return;
-
-    session.removeEventListener("end", callback);
+    this._xrSession?.removeEventListener("end", callback);
   }
 
   public requestPresent(canvas: HTMLCanvasElement, gl: WebGLRenderingContext) {