From 1c6423b80797d12571c9cb656282a0bb0dea05b1 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Mon, 10 Jan 2022 18:34:31 +0100 Subject: [PATCH] Remove unused class and function exports. --- package.json | 2 +- source/engine/import/importer3ds.js | 6 ++--- source/engine/import/importergltf.js | 16 ++++++------- source/engine/import/importerobj.js | 2 +- source/engine/import/importerply.js | 6 ++--- source/engine/main.js | 29 +++++------------------- source/engine/model/modelfinalization.js | 2 +- source/engine/model/node.js | 14 ++++++------ 8 files changed, 30 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 4eb9fe6..7bc80a1 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "updatelibs": "npm install && node tools/run_python.js tools/updatelibs.py", "generate_icon_font": "node tools/run_python.js tools/generate_icon_font.py", "update_engine_exports": "node tools/run_python.js tools/update_engine_exports.py", - "create_dist": "npm run lint && npm run test && npm run create_package", + "create_dist": "npm run create_package && npm run lint && npm run test", "create_package": "npm run build_engine_prod && npm run build_website_prod && npm run build_css_prod && node tools/run_python.js tools/create_package.py", "build_dev": "npm run build_engine_dev && npm run build_website_dev", "build_css_prod": "cleancss -o build/o3dv.website.min.css website/css/*", diff --git a/source/engine/import/importer3ds.js b/source/engine/import/importer3ds.js index 18b6451..9885471 100644 --- a/source/engine/import/importer3ds.js +++ b/source/engine/import/importer3ds.js @@ -14,7 +14,7 @@ import { Triangle } from '../model/triangle.js'; import { ImporterBase } from './importerbase.js'; import { UpdateMaterialTransparency } from './importerutils.js'; -export const CHUNK3DS = +const CHUNK3DS = { MAIN3DS : 0x4D4D, EDIT3DS : 0x3D3D, @@ -60,7 +60,7 @@ export const CHUNK3DS = OBJECT_ID : 0xB030 }; -export class Importer3dsNode +class Importer3dsNode { constructor () { @@ -76,7 +76,7 @@ export class Importer3dsNode } } -export class Importer3dsNodeList +class Importer3dsNodeList { constructor () { diff --git a/source/engine/import/importergltf.js b/source/engine/import/importergltf.js index ea12ff7..eb8248b 100644 --- a/source/engine/import/importergltf.js +++ b/source/engine/import/importergltf.js @@ -16,7 +16,7 @@ import { Property, PropertyGroup, PropertyType } from '../model/property.js'; import { Triangle } from '../model/triangle.js'; import { ImporterBase } from './importerbase.js'; -export const GltfComponentType = +const GltfComponentType = { BYTE : 5120, UNSIGNED_BYTE : 5121, @@ -26,7 +26,7 @@ export const GltfComponentType = FLOAT : 5126 }; -export const GltfDataType = +const GltfDataType = { SCALAR : 0, VEC2 : 1, @@ -37,7 +37,7 @@ export const GltfDataType = MAT4 : 6 }; -export const GltfRenderMode = +const GltfRenderMode = { POINTS : 0, LINES : 1, @@ -48,14 +48,14 @@ export const GltfRenderMode = TRIANGLE_FAN : 6 }; -export const GltfConstants = +const GltfConstants = { GLTF_STRING : 0x46546C67, JSON_CHUNK_TYPE : 0x4E4F534A, BINARY_CHUNK_TYPE : 0x004E4942 }; -export function GetGltfColor (color) +function GetGltfColor (color) { return ColorFromFloatComponents ( LinearToSRGB (color[0]), @@ -64,7 +64,7 @@ export function GetGltfColor (color) ); } -export function GetGltfVertexColor (color, componentType) +function GetGltfVertexColor (color, componentType) { function GetColorComponent (component, componentType) { @@ -82,7 +82,7 @@ export function GetGltfVertexColor (color, componentType) ); } -export class GltfBufferReader +class GltfBufferReader { constructor (buffer) { @@ -260,7 +260,7 @@ export class GltfBufferReader } } -export class GltfExtensions +class GltfExtensions { constructor () { diff --git a/source/engine/import/importerobj.js b/source/engine/import/importerobj.js index f495cf8..da62a45 100644 --- a/source/engine/import/importerobj.js +++ b/source/engine/import/importerobj.js @@ -9,7 +9,7 @@ import { Triangle } from '../model/triangle.js'; import { ImporterBase } from './importerbase.js'; import { NameFromLine, ParametersFromLine, ReadLines, UpdateMaterialTransparency } from './importerutils.js'; -export class ObjMeshConverter +class ObjMeshConverter { constructor (mesh) { diff --git a/source/engine/import/importerply.js b/source/engine/import/importerply.js index e7a0cad..5cad401 100644 --- a/source/engine/import/importerply.js +++ b/source/engine/import/importerply.js @@ -9,7 +9,7 @@ import { Triangle } from '../model/triangle.js'; import { ImporterBase } from './importerbase.js'; import { ParametersFromLine, ReadLines, UpdateMaterialTransparency } from './importerutils.js'; -export const PlyHeaderCheckResult = +const PlyHeaderCheckResult = { Ok : 1, NoVertices : 2, @@ -17,7 +17,7 @@ export const PlyHeaderCheckResult = UnknownError : 4 }; -export class PlyHeader +class PlyHeader { constructor () { @@ -103,7 +103,7 @@ export class PlyHeader } } -export class PlyMaterialHandler +class PlyMaterialHandler { constructor (model) { diff --git a/source/engine/main.js b/source/engine/main.js index 610d4ad..ac929e6 100644 --- a/source/engine/main.js +++ b/source/engine/main.js @@ -22,14 +22,14 @@ import { BezierTweenFunction, LinearTweenFunction, ParabolicTweenFunction, Tween import { File, FileList } from './import/filelist.js'; import { ImportSettings, ImportError, ImportResult, ImporterFileAccessor, Importer, ImportErrorCode } from './import/importer.js'; import { Importer3dm } from './import/importer3dm.js'; -import { Importer3dsNode, Importer3dsNodeList, Importer3ds, CHUNK3DS } from './import/importer3ds.js'; +import { Importer3ds } from './import/importer3ds.js'; import { ImporterBase } from './import/importerbase.js'; -import { GltfBufferReader, GltfExtensions, ImporterGltf, GetGltfColor, GetGltfVertexColor, GltfComponentType, GltfDataType, GltfRenderMode, GltfConstants } from './import/importergltf.js'; +import { ImporterGltf } from './import/importergltf.js'; import { ImporterIfc } from './import/importerifc.js'; import { ImporterO3dv } from './import/importero3dv.js'; -import { ObjMeshConverter, ImporterObj } from './import/importerobj.js'; +import { ImporterObj } from './import/importerobj.js'; import { ImporterOff } from './import/importeroff.js'; -import { PlyHeader, PlyMaterialHandler, ImporterPly, PlyHeaderCheckResult } from './import/importerply.js'; +import { ImporterPly } from './import/importerply.js'; import { ImporterStl } from './import/importerstl.js'; import { ImporterThreeSvg } from './import/importersvg.js'; import { ImporterThreeBase, ImporterThreeFbx, ImporterThreeDae, ImporterThreeWrl, ImporterThree3mf } from './import/importerthree.js'; @@ -48,9 +48,9 @@ import { MeshPrimitiveBuffer, MeshBuffer, ConvertMeshToMeshBuffer } from './mode import { MeshInstanceId, MeshInstance } from './model/meshinstance.js'; import { GetMeshType, CalculateTriangleNormal, TransformMesh, FlipMeshTrianglesOrientation, MeshType } from './model/meshutils.js'; import { Model } from './model/model.js'; -import { ModelFinalizer, FinalizeModel, CheckModel } from './model/modelfinalization.js'; +import { FinalizeModel, CheckModel } from './model/modelfinalization.js'; import { IsModelEmpty, GetBoundingBox, GetTopology, IsSolid, HasDefaultMaterial, ReplaceDefaultMaterialColor } from './model/modelutils.js'; -import { NodeIdGenerator, Node, NodeType } from './model/node.js'; +import { Node, NodeType } from './model/node.js'; import { Object3D, ModelObject3D } from './model/object.js'; import { Property, PropertyGroup, PropertyType } from './model/property.js'; import { GetTriangleArea, GetTetrahedronSignedVolume, CalculateVolume, CalculateSurfaceArea } from './model/quantities.js'; @@ -141,29 +141,14 @@ export { Importer, ImportErrorCode, Importer3dm, - Importer3dsNode, - Importer3dsNodeList, Importer3ds, - CHUNK3DS, ImporterBase, - GltfBufferReader, - GltfExtensions, ImporterGltf, - GetGltfColor, - GetGltfVertexColor, - GltfComponentType, - GltfDataType, - GltfRenderMode, - GltfConstants, ImporterIfc, ImporterO3dv, - ObjMeshConverter, ImporterObj, ImporterOff, - PlyHeader, - PlyMaterialHandler, ImporterPly, - PlyHeaderCheckResult, ImporterStl, ImporterThreeSvg, ImporterThreeBase, @@ -235,7 +220,6 @@ export { FlipMeshTrianglesOrientation, MeshType, Model, - ModelFinalizer, FinalizeModel, CheckModel, IsModelEmpty, @@ -244,7 +228,6 @@ export { IsSolid, HasDefaultMaterial, ReplaceDefaultMaterialColor, - NodeIdGenerator, Node, NodeType, Object3D, diff --git a/source/engine/model/modelfinalization.js b/source/engine/model/modelfinalization.js index 09431ba..ea7c58a 100644 --- a/source/engine/model/modelfinalization.js +++ b/source/engine/model/modelfinalization.js @@ -4,7 +4,7 @@ import { Color } from './color.js'; import { PhongMaterial } from './material.js'; import { CalculateTriangleNormal, GetMeshType, MeshType } from './meshutils.js'; -export class ModelFinalizer +class ModelFinalizer { constructor (params) { diff --git a/source/engine/model/node.js b/source/engine/model/node.js index 7570910..48c29f4 100644 --- a/source/engine/model/node.js +++ b/source/engine/model/node.js @@ -1,12 +1,6 @@ import { Transformation } from '../geometry/transformation.js'; -export const NodeType = -{ - GroupNode : 0, - MeshNode : 1 -}; - -export class NodeIdGenerator +class NodeIdGenerator { constructor () { @@ -21,6 +15,12 @@ export class NodeIdGenerator } } +export const NodeType = +{ + GroupNode : 0, + MeshNode : 1 +}; + export class Node { constructor ()