diff --git a/nerfactory/viewer/app/.eslintrc.json b/nerfactory/viewer/app/.eslintrc.json index 8c21d1348..e6eb3ed02 100644 --- a/nerfactory/viewer/app/.eslintrc.json +++ b/nerfactory/viewer/app/.eslintrc.json @@ -1,33 +1,30 @@ { - "env": { - "browser": true, - "es2021": true + "env": { + "browser": true, + "es2021": true + }, + "extends": [ + "eslint:recommended", + "plugin:react/recommended", + "airbnb", + "prettier" + ], + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaFeatures": { + "jsx": true }, - "extends": [ - "eslint:recommended", - "plugin:react/recommended", - "airbnb", - "prettier" - ], - "parser": "@typescript-eslint/parser", - "parserOptions": { - "ecmaFeatures": { - "jsx": true - }, - "ecmaVersion": "latest", - "sourceType": "module" - }, - "plugins": [ - "react", - "@typescript-eslint" - ], - "rules": { - "arrow-body-style": "off", - "camelcase": "off", - "import/prefer-default-export": "off", - "no-alert": "off", - "no-console": "off", - "prefer-destructuring": "off", - "react/destructuring-assignment": "off" - } -} \ No newline at end of file + "ecmaVersion": "latest", + "sourceType": "module" + }, + "plugins": ["react", "@typescript-eslint"], + "rules": { + "arrow-body-style": "off", + "camelcase": "off", + "import/prefer-default-export": "off", + "no-alert": "off", + "no-console": "off", + "prefer-destructuring": "off", + "react/destructuring-assignment": "off" + } +} diff --git a/nerfactory/viewer/app/public/electron.js b/nerfactory/viewer/app/public/electron.js index 140be80b5..0cdeed626 100644 --- a/nerfactory/viewer/app/public/electron.js +++ b/nerfactory/viewer/app/public/electron.js @@ -1,7 +1,7 @@ -const path = require("path"); +const path = require('path'); -const { app, BrowserWindow } = require("electron"); -const isDev = require("electron-is-dev"); +const { app, BrowserWindow } = require('electron'); +const isDev = require('electron-is-dev'); function createWindow() { // Create the browser window. @@ -17,12 +17,12 @@ function createWindow() { // win.loadFile("index.html"); win.loadURL( isDev - ? "http://localhost:3000" - : `file://${path.join(__dirname, "../build/index.html")}` + ? 'http://localhost:3000' + : `file://${path.join(__dirname, '../build/index.html')}`, ); // Open the DevTools. if (isDev) { - win.webContents.openDevTools({ mode: "detach" }); + win.webContents.openDevTools({ mode: 'detach' }); } } @@ -34,13 +34,13 @@ app.whenReady().then(createWindow); // Quit when all windows are closed, except on macOS. There, it's common // for applications and their menu bar to stay active until the user quits // explicitly with Cmd + Q. -app.on("window-all-closed", () => { - if (process.platform !== "darwin") { +app.on('window-all-closed', () => { + if (process.platform !== 'darwin') { app.quit(); } }); -app.on("activate", () => { +app.on('activate', () => { if (BrowserWindow.getAllWindows().length === 0) { createWindow(); } diff --git a/nerfactory/viewer/app/src/index.jsx b/nerfactory/viewer/app/src/index.jsx index 924676521..7ab345c5c 100644 --- a/nerfactory/viewer/app/src/index.jsx +++ b/nerfactory/viewer/app/src/index.jsx @@ -12,4 +12,4 @@ root.render( , -); \ No newline at end of file +); diff --git a/nerfactory/viewer/app/src/modules/Scene/drawing.js b/nerfactory/viewer/app/src/modules/Scene/drawing.js index c91ade755..bf411657d 100644 --- a/nerfactory/viewer/app/src/modules/Scene/drawing.js +++ b/nerfactory/viewer/app/src/modules/Scene/drawing.js @@ -132,12 +132,17 @@ export function drawCamera(camera): THREE.Object3D { const f = camera.fx; const displayedFocalLength = height / (2.0 * (camera.cy / f)); const width = 2.0 * (camera.cx / f) * displayedFocalLength; - const cameraWireframeObject = getCameraWireframe(1.0, displayedFocalLength, width, height); + const cameraWireframeObject = getCameraWireframe( + 1.0, + displayedFocalLength, + width, + height, + ); cameraWireframeObject.translateZ(displayedFocalLength); // move the wireframe frustum back group.add(cameraWireframeObject); const cameraImagePlaneObject = drawCameraImagePlane( - width*2, - height*2, + width * 2, + height * 2, camera.image, ); group.add(cameraImagePlaneObject); diff --git a/nerfactory/viewer/app/src/modules/WebRtcWindow/WebRtcWindow.jsx b/nerfactory/viewer/app/src/modules/WebRtcWindow/WebRtcWindow.jsx index 78bab30b7..6ef8c5308 100644 --- a/nerfactory/viewer/app/src/modules/WebRtcWindow/WebRtcWindow.jsx +++ b/nerfactory/viewer/app/src/modules/WebRtcWindow/WebRtcWindow.jsx @@ -41,7 +41,7 @@ export default function WebRtcWindow() { // connect video pc.addEventListener('track', (evt) => { dispatch({ - type: "write", + type: 'write', path: 'webrtcState/isConnected', data: true, }); @@ -55,13 +55,13 @@ export default function WebRtcWindow() { pc.oniceconnectionstatechange = () => { if (pc.iceConnectionState === 'connected') { dispatch({ - type: "write", + type: 'write', path: 'webrtcState/isConnected', data: true, }); } else if (pc.iceConnectionState === 'disconnected') { dispatch({ - type: "write", + type: 'write', path: 'webrtcState/isConnected', data: false, }); diff --git a/nerfactory/viewer/app/src/modules/WebSocket/WebSocket.jsx b/nerfactory/viewer/app/src/modules/WebSocket/WebSocket.jsx index ab3668eac..545dc559d 100644 --- a/nerfactory/viewer/app/src/modules/WebSocket/WebSocket.jsx +++ b/nerfactory/viewer/app/src/modules/WebSocket/WebSocket.jsx @@ -27,7 +27,6 @@ function getWebsocketEndpointFromUrl(url: string) { } export default function WebSocketContextFunction({ children }) { - const dispatch = useDispatch(); let socket; diff --git a/nerfactory/viewer/app/src/reducer.js b/nerfactory/viewer/app/src/reducer.js index 6475e9488..d9d2745aa 100644 --- a/nerfactory/viewer/app/src/reducer.js +++ b/nerfactory/viewer/app/src/reducer.js @@ -17,7 +17,7 @@ const initialState = { output_choice: 'rgb', // the selected output minResolution: 50, maxResolution: 512, - field_of_view: 80 + field_of_view: 80, }, // the scene state sceneState: { diff --git a/nerfactory/viewer/app/src/setupTests.js b/nerfactory/viewer/app/src/setupTests.js index 5fdf00169..74b1a275a 100644 --- a/nerfactory/viewer/app/src/setupTests.js +++ b/nerfactory/viewer/app/src/setupTests.js @@ -2,4 +2,4 @@ // allows you to do things like: // expect(element).toHaveTextContent(/react/i) // learn more: https://github.com/testing-library/jest-dom -import "@testing-library/jest-dom/extend-expect"; +import '@testing-library/jest-dom/extend-expect'; diff --git a/nerfactory/viewer/app/src/subscriber.js b/nerfactory/viewer/app/src/subscriber.js index 3bc35562e..5af1a946c 100644 --- a/nerfactory/viewer/app/src/subscriber.js +++ b/nerfactory/viewer/app/src/subscriber.js @@ -12,7 +12,7 @@ export function subscribe_to_changes(selector_fn, fn) { const previous = current; current = selector_fn(store.getState()); if (previous !== current) { - fn(previous, current); + fn(previous, current); } }; store.subscribe(handleChange); diff --git a/nerfactory/viewer/app/src/utils.js b/nerfactory/viewer/app/src/utils.js index 98fd4938b..b63d54361 100644 --- a/nerfactory/viewer/app/src/utils.js +++ b/nerfactory/viewer/app/src/utils.js @@ -1,3 +1,3 @@ export function split_path(path_str) { - return path_str.split("/").filter((x) => x.length > 0); + return path_str.split('/').filter((x) => x.length > 0); }