Skip to content

Commit f48be9b

Browse files
WoodNeckWoodNeck
committed
refactor: apply review
1 parent 3bfd6c3 commit f48be9b

File tree

6 files changed

+56
-68
lines changed

6 files changed

+56
-68
lines changed

‎karma.conf.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ module.exports = config => {
2828

2929
webpack: {
3030
devtool: "inline-source-map",
31-
resolve: {
31+
resolve: {
3232
extensions: [".ts", ".js"]
33-
},
33+
},
3434
mode: "none",
3535
module: {
3636
rules: [
@@ -50,20 +50,20 @@ module.exports = config => {
5050
],
5151
"plugins": [
5252
"@babel/plugin-transform-modules-commonjs",
53-
["@babel/plugin-proposal-class-properties", {"loose": true}],
53+
["@babel/plugin-proposal-class-properties", {"loose": true}],
5454
]
5555
}
5656
},
5757
{
58-
test: /\.ts$/,
59-
exclude: /node_modules/,
60-
use: {
61-
loader: "ts-loader",
62-
options: {
63-
transpileOnly: true,
64-
compilerOptions: {
65-
module: "es5",
66-
},
58+
test: /\.ts$/,
59+
exclude: /node_modules/,
60+
use: {
61+
loader: "ts-loader",
62+
options: {
63+
transpileOnly: true,
64+
compilerOptions: {
65+
module: "es5",
66+
},
6767
}
6868
}
6969
}
@@ -102,18 +102,18 @@ module.exports = config => {
102102
karmaConfig.browsers.push(config.chrome ? "Chrome" : "ChromeHeadlessGL");
103103

104104
if (config.coverage) {
105-
karmaConfig.reporters.push("coverage-istanbul");
106-
karmaConfig.coverageIstanbulReporter = {
107-
reports: ["text-summary", "html", "lcovonly"],
108-
dir: "./coverage"
109-
};
110-
karmaConfig.webpack.module.rules.unshift({
111-
test: /\.js$/,
112-
exclude: /(node_modules|test)/,
113-
loader: "istanbul-instrumenter-loader"
114-
});
115-
karmaConfig.singleRun = true;
116-
}
105+
karmaConfig.reporters.push("coverage-istanbul");
106+
karmaConfig.coverageIstanbulReporter = {
107+
reports: ["text-summary", "html", "lcovonly"],
108+
dir: "./coverage"
109+
};
110+
karmaConfig.webpack.module.rules.unshift({
111+
test: /\.js$/,
112+
exclude: /(node_modules|test)/,
113+
loader: "istanbul-instrumenter-loader"
114+
});
115+
karmaConfig.singleRun = true;
116+
}
117117

118118
config.set(karmaConfig);
119119
};

‎src/PanoImageRenderer/WebGLUtils.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ export default class WebGLUtils {
2424

2525
if (success) {
2626
return shader;
27-
} else {
28-
// eslint-disable-next-line
29-
console.error(gl.getShaderInfoLog(shader));
3027
}
28+
29+
// eslint-disable-next-line
30+
console.error(gl.getShaderInfoLog(shader));
31+
3132
return null;
3233
}
3334

‎src/PanoImageRenderer/renderer/CubeRenderer.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Agent from "@egjs/agent";
1+
import agent from "@egjs/agent";
22
import Renderer from "./Renderer";
33
import WebGLUtils from "../WebGLUtils";
44
import { util as mathUtil } from "../../utils/math-util";
@@ -217,11 +217,11 @@ void main(void) {
217217
}
218218

219219
public getMaxCubeMapTextureSize(gl: WebGLRenderingContext, image: HTMLImageElement | HTMLVideoElement) {
220-
const agent = Agent();
220+
const agentInfo = agent();
221221
const maxCubeMapTextureSize = gl.getParameter(gl.MAX_CUBE_MAP_TEXTURE_SIZE);
222222
let _imageWidth = this.getSourceTileSize(image);
223223

224-
if (agent.browser.name === "ie" && agent.browser.majorVersion === 11) {
224+
if (agentInfo.browser.name === "ie" && agentInfo.browser.majorVersion === 11) {
225225
if (!mathUtil.isPowerOfTwo(_imageWidth)) {
226226
for (let i = 1; i < maxCubeMapTextureSize; i *= 2) {
227227
if (i < _imageWidth) {
@@ -233,8 +233,8 @@ void main(void) {
233233
}
234234
}
235235
}
236-
if (agent.os.name === "ios") {
237-
const majorVersion = agent.os.majorVersion;
236+
if (agentInfo.os.name === "ios") {
237+
const majorVersion = agentInfo.os.majorVersion;
238238

239239
// ios 9 의 경우 텍스쳐 최대사이즈는 1024 이다.
240240
if (majorVersion === 9) {

‎src/PanoImageRenderer/renderer/Renderer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import Component from "@egjs/component";
2-
import Agent from "@egjs/agent";
2+
import agent from "@egjs/agent";
33
import { mat4 } from "gl-matrix";
44
import { CubemapConfig, TileConfig } from "../../types";
55

6-
const agent = Agent();
7-
const isIE11 = agent.browser.name === "ie" && agent.browser.majorVersion === 11;
6+
const agentInfo = agent();
7+
const isIE11 = agentInfo.browser.name === "ie" && agentInfo.browser.majorVersion === 11;
88

99
const EVENTS: {
1010
ERROR: "error",

‎src/PanoImageRenderer/vr/VRManager.ts

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -89,29 +89,24 @@ class VRManager {
8989
}
9090

9191
public requestPresent(canvas: HTMLCanvasElement) {
92-
return new Promise((resolve, reject) => {
93-
navigator.getVRDisplays().then(displays => {
94-
const vrDisplay = displays.length && displays[0];
95-
96-
if (!vrDisplay) {
97-
reject(new Error("No displays available."));
98-
return;
99-
}
100-
if (!vrDisplay.capabilities.canPresent) {
101-
reject(new Error("Display lacking capability to present."));
102-
return;
103-
}
104-
105-
vrDisplay.requestPresent([{source: canvas}]).then(() => {
106-
const leftEye = vrDisplay.getEyeParameters(EYES.LEFT);
107-
const rightEye = vrDisplay.getEyeParameters(EYES.RIGHT);
108-
109-
canvas.width = Math.max(leftEye.renderWidth, rightEye.renderWidth) * 2;
110-
canvas.height = Math.max(leftEye.renderHeight, rightEye.renderHeight);
111-
112-
this._setDisplay(vrDisplay);
113-
resolve();
114-
});
92+
return navigator.getVRDisplays().then(displays => {
93+
const vrDisplay = displays.length && displays[0];
94+
95+
if (!vrDisplay) {
96+
return Promise.reject(new Error("No displays available."));
97+
}
98+
if (!vrDisplay.capabilities.canPresent) {
99+
return Promise.reject(new Error("Display lacking capability to present."));
100+
}
101+
102+
vrDisplay.requestPresent([{source: canvas}]).then(() => {
103+
const leftEye = vrDisplay.getEyeParameters(EYES.LEFT);
104+
const rightEye = vrDisplay.getEyeParameters(EYES.RIGHT);
105+
106+
canvas.width = Math.max(leftEye.renderWidth, rightEye.renderWidth) * 2;
107+
canvas.height = Math.max(leftEye.renderHeight, rightEye.renderHeight);
108+
109+
this._setDisplay(vrDisplay);
115110
});
116111
});
117112
}

‎src/PanoImageRenderer/vr/XRManager.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,11 @@ class XRManager {
8787
}
8888

8989
public addEndCallback(callback: (evt?: Event) => any) {
90-
const session = this._xrSession;
91-
92-
if (!session) return;
93-
94-
session.addEventListener("end", callback);
90+
this._xrSession?.addEventListener("end", callback);
9591
}
9692

9793
public removeEndCallback(callback: (evt?: Event) => any) {
98-
const session = this._xrSession;
99-
100-
if (!session) return;
101-
102-
session.removeEventListener("end", callback);
94+
this._xrSession?.removeEventListener("end", callback);
10395
}
10496

10597
public requestPresent(canvas: HTMLCanvasElement, gl: WebGLRenderingContext) {

0 commit comments

Comments
 (0)