From aef3994e5c631b57e17586140e88eb11eebc0783 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Mon, 17 Jan 2022 18:12:17 +0100 Subject: [PATCH] Fix some LGTM issues. --- package.json | 9 +++++++-- source/engine/geometry/octree.js | 4 ++-- source/engine/import/importerobj.js | 1 - source/engine/import/importerthree.js | 2 +- source/engine/viewer/viewer.js | 4 ++-- source/website/utils.js | 2 +- tools/updatelibs.py | 3 --- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 83d7a51..885ba97 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "docdash": "^1.2.0", "esbuild": "^0.14.11", "eslint": "^8.5.0", + "eslint-plugin-unused-imports": "^2.0.0", "fantasticon": "^1.2.2", "http-server": "^14.0.0", "jsdoc": "^3.6.7", @@ -61,6 +62,9 @@ "ecmaVersion": 12, "sourceType": "module" }, + "plugins": [ + "unused-imports" + ], "rules": { "semi": "error", "no-var": "error", @@ -76,7 +80,7 @@ "comma-spacing": "error", "prefer-arrow-callback": "error", "quotes": [ - "error", + "error", "single" ], "block-scoped-var": "error", @@ -84,7 +88,8 @@ "no-extend-native": "error", "eqeqeq": "error", "no-unused-vars": "off", - "no-use-before-define": "off" + "no-use-before-define": "off", + "unused-imports/no-unused-imports": "error" } } } diff --git a/source/engine/geometry/octree.js b/source/engine/geometry/octree.js index 384d906..3d1258b 100644 --- a/source/engine/geometry/octree.js +++ b/source/engine/geometry/octree.js @@ -97,7 +97,7 @@ export class OctreeNode new Coord3D (minX, minY, minZ), new Coord3D (minX + sizeX, minY + sizeY, minZ + sizeZ) ); - node.childNodes.push (new OctreeNode (box, node.level + 1, node.options)); + node.childNodes.push (new OctreeNode (box, node.level + 1)); } let min = this.boundingBox.min; @@ -145,7 +145,7 @@ export class Octree this.options.maxTreeDepth = options.maxTreeDepth; } } - this.rootNode = new OctreeNode (boundingBox, 0, this.options); + this.rootNode = new OctreeNode (boundingBox, 0); } AddPoint (point, data) diff --git a/source/engine/import/importerobj.js b/source/engine/import/importerobj.js index a5690c1..3bdf891 100644 --- a/source/engine/import/importerobj.js +++ b/source/engine/import/importerobj.js @@ -1,4 +1,3 @@ -import { VertexColors } from 'three'; import { Coord2D } from '../geometry/coord2d.js'; import { Coord3D } from '../geometry/coord3d.js'; import { Direction } from '../geometry/geometry.js'; diff --git a/source/engine/import/importerthree.js b/source/engine/import/importerthree.js index 472895e..049dd38 100644 --- a/source/engine/import/importerthree.js +++ b/source/engine/import/importerthree.js @@ -186,7 +186,7 @@ export class ImporterThreeBase extends ImporterBase } for (let i = 0; i < threeMesh.geometry.groups.length; i++) { let group = threeMesh.geometry.groups[i]; - let groupEnd = group.start; + let groupEnd = null; if (group.count === Infinity) { groupEnd = mesh.TriangleCount (); } else { diff --git a/source/engine/viewer/viewer.js b/source/engine/viewer/viewer.js index 441b3d4..d0da17f 100644 --- a/source/engine/viewer/viewer.js +++ b/source/engine/viewer/viewer.js @@ -3,13 +3,13 @@ import { Direction } from '../geometry/geometry.js'; import { ColorToHexString } from '../model/color.js'; import { ShadingType } from '../threejs/threeutils.js'; import { GetDomElementInnerDimensions } from './domutils.js'; -import { Camera, CameraIsEqual3D, Navigation } from './navigation.js'; +import { Camera, Navigation } from './navigation.js'; import { ViewerExtraGeometry, ViewerGeometry } from './viewergeometry.js'; export function GetDefaultCamera (direction) { if (direction === Direction.X) { - return new CameraIsEqual3D ( + return new Camera ( new Coord3D (2.0, -3.0, 1.5), new Coord3D (0.0, 0.0, 0.0), new Coord3D (1.0, 0.0, 0.0) diff --git a/source/website/utils.js b/source/website/utils.js index 41919df..7d72219 100644 --- a/source/website/utils.js +++ b/source/website/utils.js @@ -1,6 +1,6 @@ import { Color, ColorToHexString } from '../engine/model/color.js'; import { CreateObjectUrl } from '../engine/io/bufferutils.js'; -import { AddDiv, CreateDiv, AddDomElement, CreateDomElement, GetDomElementOuterWidth, SetDomElementOuterWidth } from '../engine/viewer/domutils.js'; +import { AddDiv, CreateDiv, AddDomElement, GetDomElementOuterWidth, SetDomElementOuterWidth } from '../engine/viewer/domutils.js'; import { CreateVerticalSplitter } from './splitter.js'; export function GetNameOrDefault (originalName, defaultName) diff --git a/tools/updatelibs.py b/tools/updatelibs.py index 2654056..bdcb58e 100644 --- a/tools/updatelibs.py +++ b/tools/updatelibs.py @@ -1,10 +1,7 @@ import os import sys -import re import shutil -from lib import tools_lib as Tools - pickrFileMap = [ [os.path.join ('@simonwep', 'pickr', 'LICENSE'), os.path.join ('pickr.license.md')], [os.path.join ('@simonwep', 'pickr', 'dist', 'pickr.es5.min.js'), os.path.join ('pickr.es5.min.js')],