From 3dfd08cdd5ee6a785acd4a9e77148895da65d3dd Mon Sep 17 00:00:00 2001 From: ChenX Date: Tue, 8 Mar 2022 11:42:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91:=E6=B8=85=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __test__/Polyline/Intersect.test.ts | 2 +- __test__/Polyline/split.test.ts | 2 +- src/Add-on/Batch/FindModeingKnifes.tsx | 2 +- src/Add-on/CheckModeling.ts | 5 +-- src/Add-on/DrawFloor.ts | 2 - src/Add-on/DrawPoint.ts | 2 +- .../DrawWineRack/DrawUprightWineRackTool.ts | 5 +-- src/Add-on/Entsel.ts | 2 +- src/Add-on/Erp/Models/CadBlockInfo.ts | 1 - src/Add-on/ExplosionMap.ts | 9 ++--- src/Add-on/Exports/ExportSTL.ts | 1 - src/Add-on/Wblock.ts | 3 +- src/Add-on/testEntity/BoxLine.ts | 38 +++++++++++++++++++ src/Add-on/testEntity/TestBoundaryBox.ts | 37 +----------------- src/Add-on/testEntity/testCollision.ts | 4 +- .../HostApplicationServices.ts | 18 +++++++++ src/Common/Deving.ts | 4 ++ .../Dimension/2LineAngularDimension.ts | 6 +-- .../Dimension/AlignedDimension.ts | 8 ++-- .../Dimension/DiameterDimension.ts | 4 +- src/DatabaseServices/Dimension/Dimension.ts | 6 +-- .../Dimension/RadiusDimension.ts | 6 +-- src/DatabaseServices/Entity/Ellipse.ts | 6 +-- src/DatabaseServices/Entity/EntityRef.ts | 5 ++- src/DatabaseServices/FaceEntity.ts | 2 +- src/DatabaseServices/ViewportEntity.ts | 3 ++ .../ViewportEntity/ViewportEntity2.ts | 4 +- src/Editor/ICursorConfig.ts | 9 +++++ src/Editor/PointPick.ts | 4 +- src/Editor/SelectFilter.ts | 2 +- src/Editor/UserConfig.ts | 8 +--- src/GraphicsSystem/CameraUpdate.ts | 6 +-- src/Nest/Test/TestData.ts | 1 - src/Nest/Test/TestHull.ts | 1 - src/Nest/Test/TestPlace.ts | 1 - src/UI/Components/Board/BoardFindCommon.tsx | 2 +- src/UI/Components/Board/Door/DoorModal.tsx | 4 +- src/UI/Components/Board/SpecialBoardModal.tsx | 2 +- .../Modal/OptionModal/SystemConfig.tsx | 3 +- .../RightPanel/Modeling/KnifeList.tsx | 2 +- .../RightPanel/ModelingComponent.tsx | 2 +- src/UI/Components/SimpleDialog.tsx | 4 +- src/UI/Components/SourceManage/ImgList.tsx | 2 +- src/UI/Components/SourceManage/SoucePanel.tsx | 2 - src/UI/Components/Template/ToplineList.tsx | 18 ++++----- src/UI/MaterialEditor/GoodsList.tsx | 2 +- src/UI/Store/KuGanStore.ts | 12 +++--- src/UI/Store/RightPanelStore/HardwareStore.ts | 8 ++-- src/webview.ts | 4 +- 49 files changed, 153 insertions(+), 133 deletions(-) create mode 100644 src/Add-on/testEntity/BoxLine.ts create mode 100644 src/Editor/ICursorConfig.ts diff --git a/__test__/Polyline/Intersect.test.ts b/__test__/Polyline/Intersect.test.ts index 507a1ecf0..edd5d2fc1 100644 --- a/__test__/Polyline/Intersect.test.ts +++ b/__test__/Polyline/Intersect.test.ts @@ -1,5 +1,5 @@ import { Polyline } from "../../src/DatabaseServices/Entity/Polyline"; -import { Vector2, Vector3 } from "three"; +import { Vector2 } from "three"; import { IntersectOption } from "../../src/GraphicsSystem/IntersectWith"; describe("相交", () => { diff --git a/__test__/Polyline/split.test.ts b/__test__/Polyline/split.test.ts index a39bab0bc..b9572efc8 100644 --- a/__test__/Polyline/split.test.ts +++ b/__test__/Polyline/split.test.ts @@ -1,5 +1,5 @@ import { Polyline } from "../../src/DatabaseServices/Entity/Polyline"; -import { Vector2, Vector3 } from "three"; +import { Vector2 } from "three"; //构造测试的多段线 diff --git a/src/Add-on/Batch/FindModeingKnifes.tsx b/src/Add-on/Batch/FindModeingKnifes.tsx index 2b8c508ab..095a58aa9 100644 --- a/src/Add-on/Batch/FindModeingKnifes.tsx +++ b/src/Add-on/Batch/FindModeingKnifes.tsx @@ -1,4 +1,4 @@ -import { Button, Card, Classes, H5, Intent } from '@blueprintjs/core'; +import { Button, Card, Classes, Intent } from '@blueprintjs/core'; import { observable } from 'mobx'; import { observer } from 'mobx-react'; import React from 'react'; diff --git a/src/Add-on/CheckModeling.ts b/src/Add-on/CheckModeling.ts index 14e42016e..597d66f29 100644 --- a/src/Add-on/CheckModeling.ts +++ b/src/Add-on/CheckModeling.ts @@ -1,14 +1,13 @@ +import { Intent } from "@blueprintjs/core"; import { app } from "../ApplicationServices/Application"; +import { ExtrudeHole } from "../DatabaseServices/3DSolid/ExtrudeHole"; import { Board } from "../DatabaseServices/Entity/Board"; import { ExtrudeSolid } from "../DatabaseServices/Entity/Extrude"; import { Command } from "../Editor/CommandMachine"; import { JigUtils } from "../Editor/JigUtils"; import { PromptStatus } from "../Editor/PromptResult"; import { FeedingToolPath } from "../GraphicsSystem/ToolPath/FeedingToolPath"; -import { ExtrudeHole } from "../DatabaseServices/3DSolid/ExtrudeHole"; import { AppToaster } from "../UI/Components/Toaster"; -import { Intent } from "@blueprintjs/core"; -import { Production } from "../Production/Product"; export class CheckModeling implements Command { diff --git a/src/Add-on/DrawFloor.ts b/src/Add-on/DrawFloor.ts index c001f3369..d1c8c1bd2 100644 --- a/src/Add-on/DrawFloor.ts +++ b/src/Add-on/DrawFloor.ts @@ -1,7 +1,5 @@ -import * as path from 'path'; import * as THREE from 'three'; import { begin } from 'xaop'; - import { app } from '../ApplicationServices/Application'; import { Command } from '../Editor/CommandMachine'; diff --git a/src/Add-on/DrawPoint.ts b/src/Add-on/DrawPoint.ts index 27550b6b6..61928c3e1 100644 --- a/src/Add-on/DrawPoint.ts +++ b/src/Add-on/DrawPoint.ts @@ -1,7 +1,7 @@ import { app } from '../ApplicationServices/Application'; import { Point } from '../DatabaseServices/Entity/Point'; import { Command } from '../Editor/CommandMachine'; -import { PromptStatus, PromptEntityResult } from '../Editor/PromptResult'; +import { PromptStatus } from '../Editor/PromptResult'; export class CMD_DrawPoint implements Command diff --git a/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts b/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts index c72fc6c95..c0edc988e 100644 --- a/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts +++ b/src/Add-on/DrawWineRack/DrawUprightWineRackTool.ts @@ -1,12 +1,11 @@ import { Vector3 } from "three"; import { Board } from "../../DatabaseServices/Entity/Board"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; -import { MoveMatrix, AsVector2 } from "../../Geometry/GeUtils"; +import { AsVector2, MoveMatrix } from "../../Geometry/GeUtils"; import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse"; +import { BoardType } from "../../UI/Store/BoardInterface"; import { EWRackArrayType, IWineRackOption } from "../../UI/Store/WineRackInterface"; import { DrawWineRackTool } from "./DrawWinRackTool"; -import { BoardType } from "../../UI/Store/BoardInterface"; -import { clamp } from "../../Common/Utils"; /** * 正酒格 diff --git a/src/Add-on/Entsel.ts b/src/Add-on/Entsel.ts index e42a1a081..b998993c0 100644 --- a/src/Add-on/Entsel.ts +++ b/src/Add-on/Entsel.ts @@ -10,7 +10,7 @@ import { PromptStatus } from '../Editor/PromptResult'; import { VisualSpaceBox } from '../Editor/VisualSpaceBox'; import { DynamicInputManage } from '../UI/DynamicPrompt/DynamicInputManage'; import { PromptBlock } from '../UI/DynamicPrompt/PromptBlock'; -import { BoxLine } from './testEntity/TestBoundaryBox'; +import { BoxLine } from "./testEntity/BoxLine"; //演示了如何单选图形 diff --git a/src/Add-on/Erp/Models/CadBlockInfo.ts b/src/Add-on/Erp/Models/CadBlockInfo.ts index 882b14ec6..71918eb25 100644 --- a/src/Add-on/Erp/Models/CadBlockInfo.ts +++ b/src/Add-on/Erp/Models/CadBlockInfo.ts @@ -1,4 +1,3 @@ -import { Vector3 } from "three"; import { IOriginModelingData } from "../../../Production/Product"; export class CadBlockPoint diff --git a/src/Add-on/ExplosionMap.ts b/src/Add-on/ExplosionMap.ts index b675d30c3..a96353981 100644 --- a/src/Add-on/ExplosionMap.ts +++ b/src/Add-on/ExplosionMap.ts @@ -1,10 +1,9 @@ -import { Command } from "../Editor/CommandMachine"; -import { GetBox, GetBoxArr } from "../Geometry/GeUtils"; +import { Object3D, Vector3 } from "three"; import { app } from "../ApplicationServices/Application"; -import { Vector3, Object3D } from "three"; -import { Board } from "../DatabaseServices/Entity/Board"; -import { PromptStatus } from "../Editor/PromptResult"; import { Entity } from "../DatabaseServices/Entity/Entity"; +import { Command } from "../Editor/CommandMachine"; +import { PromptStatus } from "../Editor/PromptResult"; +import { GetBox, GetBoxArr } from "../Geometry/GeUtils"; const MOVEDIS = 10; const MOVECOUNT = 300; diff --git a/src/Add-on/Exports/ExportSTL.ts b/src/Add-on/Exports/ExportSTL.ts index 76c9e85e7..0590b4563 100644 --- a/src/Add-on/Exports/ExportSTL.ts +++ b/src/Add-on/Exports/ExportSTL.ts @@ -1,6 +1,5 @@ import { Box3, Group, Object3D } from 'three'; import { STLExporter } from 'three/examples/jsm/exporters/STLExporter.js'; -import { ColladaExporter } from 'three/examples/jsm/exporters/ColladaExporter'; import { app } from '../../ApplicationServices/Application'; import { FileSystem } from '../../Common/FileSystem'; import { Entity } from '../../DatabaseServices/Entity/Entity'; diff --git a/src/Add-on/Wblock.ts b/src/Add-on/Wblock.ts index f05117c8f..1b4a4edee 100644 --- a/src/Add-on/Wblock.ts +++ b/src/Add-on/Wblock.ts @@ -1,12 +1,11 @@ import { app } from "../ApplicationServices/Application"; -import { formateDate } from "../Common/Utils"; +import { deflate } from "../Common/SerializeMaterial"; import { Database } from "../DatabaseServices/Database"; import { Entity } from "../DatabaseServices/Entity/Entity"; import { FileServer } from "../DatabaseServices/FileServer"; import { Command } from "../Editor/CommandMachine"; import { PromptStatus } from "../Editor/PromptResult"; import { MoveMatrix } from "../Geometry/GeUtils"; -import { deflate } from "../Common/SerializeMaterial"; export class Command_Wblock implements Command { diff --git a/src/Add-on/testEntity/BoxLine.ts b/src/Add-on/testEntity/BoxLine.ts new file mode 100644 index 000000000..6cdfa6672 --- /dev/null +++ b/src/Add-on/testEntity/BoxLine.ts @@ -0,0 +1,38 @@ +import { Box3, Vector3 } from "three"; +import { Line } from "../../DatabaseServices/Entity/Line"; +import { equalv3 } from "../../Geometry/GeUtils"; + + +export function BoxLine(box: Box3): Line[] +{ + if (box.isEmpty()) + return []; + let pts = [ + new Vector3(box.min.x, box.min.y, box.min.z), + new Vector3(box.min.x, box.min.y, box.max.z), + new Vector3(box.min.x, box.max.y, box.min.z), + new Vector3(box.min.x, box.max.y, box.max.z), + + new Vector3(box.max.x, box.min.y, box.min.z), + new Vector3(box.max.x, box.min.y, box.max.z), + new Vector3(box.max.x, box.max.y, box.min.z), + new Vector3(box.max.x, box.max.y, box.max.z), + ]; + + let lines: Line[] = []; + for (let line of [ + [0, 1], [2, 3], [0, 2], [1, 3], + [4, 5], [6, 7], [4, 6], [5, 7], + + [0, 4], [2, 6], + + [1, 5], [3, 7], + ]) + { + let p1 = pts[line[0]]; + let p2 = pts[line[1]]; + if (!equalv3(p1, p2)) + lines.push(new Line(p1, p2)); + } + return lines; +} diff --git a/src/Add-on/testEntity/TestBoundaryBox.ts b/src/Add-on/testEntity/TestBoundaryBox.ts index 5507de353..5f0ee6c5f 100644 --- a/src/Add-on/testEntity/TestBoundaryBox.ts +++ b/src/Add-on/testEntity/TestBoundaryBox.ts @@ -1,10 +1,8 @@ -import { Box3, Vector3 } from "three"; import { app } from "../../ApplicationServices/Application"; -import { Line } from "../../DatabaseServices/Entity/Line"; import { Command } from "../../Editor/CommandMachine"; import { PromptStatus } from "../../Editor/PromptResult"; -import { equalv3 } from "../../Geometry/GeUtils"; import { TestDraw } from "../test/TestUtil"; +import { BoxLine } from "./BoxLine"; export class Command_TestBoundaryBox implements Command { @@ -21,36 +19,3 @@ export class Command_TestBoundaryBox implements Command } } } - -export function BoxLine(box: Box3): Line[] -{ - if (box.isEmpty()) return []; - let pts = [ - new Vector3(box.min.x, box.min.y, box.min.z), - new Vector3(box.min.x, box.min.y, box.max.z), - new Vector3(box.min.x, box.max.y, box.min.z), - new Vector3(box.min.x, box.max.y, box.max.z), - - new Vector3(box.max.x, box.min.y, box.min.z),//4 - new Vector3(box.max.x, box.min.y, box.max.z), - new Vector3(box.max.x, box.max.y, box.min.z), - new Vector3(box.max.x, box.max.y, box.max.z), - ]; - - let lines: Line[] = []; - for (let line of [ - [0, 1], [2, 3], [0, 2], [1, 3],//左右 - [4, 5], [6, 7], [4, 6], [5, 7], - - [0, 4], [2, 6], - - [1, 5], [3, 7], - ]) - { - let p1 = pts[line[0]]; - let p2 = pts[line[1]]; - if (!equalv3(p1, p2)) - lines.push(new Line(p1, p2)); - } - return lines; -} diff --git a/src/Add-on/testEntity/testCollision.ts b/src/Add-on/testEntity/testCollision.ts index 0e7bcfb64..0e5beb26c 100644 --- a/src/Add-on/testEntity/testCollision.ts +++ b/src/Add-on/testEntity/testCollision.ts @@ -1,4 +1,4 @@ -import { Vector3, Box3 } from "three"; +import { Vector3 } from "three"; import { app } from "../../ApplicationServices/Application"; import { Board } from "../../DatabaseServices/Entity/Board"; import { Line } from "../../DatabaseServices/Entity/Line"; @@ -20,7 +20,7 @@ export class TestCollision implements Command let checkRes = new CollisionDetection(boardCus); - if (boardCus.length >= 2) + if (boardCus.length >= 2) { let checkRes = new CollisionDetection(boardCus); diff --git a/src/ApplicationServices/HostApplicationServices.ts b/src/ApplicationServices/HostApplicationServices.ts index 75fa7955e..8704e4755 100644 --- a/src/ApplicationServices/HostApplicationServices.ts +++ b/src/ApplicationServices/HostApplicationServices.ts @@ -1,4 +1,6 @@ import { MeshBasicMaterial, MeshStandardMaterial, Texture } from 'three'; +import { FractionDigitsType } from '../Common/SystemEnum'; +import { ICursorConfig } from '../Editor/ICursorConfig'; import { RenderType } from '../GraphicsSystem/RenderType'; import { DrillingOption } from '../UI/Store/drillInterface'; @@ -63,6 +65,22 @@ export class IHostApplicationServices statSt: false,//统计双头排钻 }; + @ProxyValue viewSize = { + minViewHeight: 1e-3, + maxViewHeight: 3e6, + zoomSpeed: 0.6 + }; + + @ProxyValue cursorSize: ICursorConfig = { + D2: 1000, + D3: 100, + SquareSize: 10, + }; + + @ProxyValue dimTextHeight = 60; + @ProxyValue lineWidth = 2; //打印线框 + @ProxyValue fractionDigitsType: FractionDigitsType = FractionDigitsType.two; + private constructor() { }; private static _SingleInstance: IHostApplicationServices; diff --git a/src/Common/Deving.ts b/src/Common/Deving.ts index 227dab2fb..c65f68511 100644 --- a/src/Common/Deving.ts +++ b/src/Common/Deving.ts @@ -1,10 +1,14 @@ export function IsDev() { + //del_exp_start return window.location.hostname === "localhost"; + //del_exp_end return false } export function IsTest() { + //del_exp_start return window.location.hostname === "localhost" || window.location.hostname === "t.cfcad.cn"; + //del_exp_end return false } diff --git a/src/DatabaseServices/Dimension/2LineAngularDimension.ts b/src/DatabaseServices/Dimension/2LineAngularDimension.ts index ea66d8865..5e33ce085 100644 --- a/src/DatabaseServices/Dimension/2LineAngularDimension.ts +++ b/src/DatabaseServices/Dimension/2LineAngularDimension.ts @@ -1,12 +1,12 @@ import { BufferGeometry, Line as TLine, Material, MathUtils, Matrix3, Matrix4, Mesh, Object3D, Vector3 } from "three"; import { Line2 } from "three/examples/jsm/lines/Line2"; +import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices"; import { AddEntityDrawObject } from "../../Common/AddEntityDrawObject"; import { arrayRemoveDuplicateBySort, arraySortByNumber } from "../../Common/ArrayExt"; import { ColorMaterial } from "../../Common/ColorPalette"; import { reviseMirrorMatrix } from "../../Common/Matrix4Utils"; import { FixedNotZero, FixIndex } from "../../Common/Utils"; import { ObjectSnapMode } from "../../Editor/ObjectSnapMode"; -import { userConfig } from "../../Editor/UserConfig"; import { BufferGeometryUtils } from "../../Geometry/BufferGeometryUtils"; import { angle, equaln, equalv3 } from "../../Geometry/GeUtils"; import { IntersectOption } from "../../GraphicsSystem/IntersectWith"; @@ -37,7 +37,7 @@ export class LineAngularDimension extends Dimension super(); // this._Arc.ColorIndex = 3; this._Text.TextAligen = TextAligen.Down; - this._Text.Height = userConfig.dimTextHeight; + this._Text.Height = HostApplicationServices.dimTextHeight; } protected GetString() @@ -189,7 +189,7 @@ export class LineAngularDimension extends Dimension { l = new Line2(undefined, ColorMaterial.PrintLineMatrial); l2 = new Line2(undefined, ColorMaterial.PrintLineMatrial); - arrowSize *= userConfig.lineWidth * 0.5; + arrowSize *= HostApplicationServices.lineWidth * 0.5; } else { diff --git a/src/DatabaseServices/Dimension/AlignedDimension.ts b/src/DatabaseServices/Dimension/AlignedDimension.ts index d3a7d765c..02b928d2e 100644 --- a/src/DatabaseServices/Dimension/AlignedDimension.ts +++ b/src/DatabaseServices/Dimension/AlignedDimension.ts @@ -1,6 +1,7 @@ import { BufferGeometry, Line as TLine, Material, Matrix3, Matrix4, Mesh, Object3D, Vector2, Vector3 } from "three"; import { Line2 } from "three/examples/jsm/lines/Line2"; import { LineGeometry } from "three/examples/jsm/lines/LineGeometry"; +import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices"; import { AddEntityDrawObject } from "../../Common/AddEntityDrawObject"; import { ColorMaterial } from "../../Common/ColorPalette"; import { safeEval } from "../../Common/eval"; @@ -8,7 +9,6 @@ import { reviseMirrorMatrix } from "../../Common/Matrix4Utils"; import { UpdateDraw } from "../../Common/Status"; import { FixedNotZero } from "../../Common/Utils"; import { ObjectSnapMode } from "../../Editor/ObjectSnapMode"; -import { userConfig } from "../../Editor/UserConfig"; import { BufferGeometryUtils } from "../../Geometry/BufferGeometryUtils"; import { angle, angleAndX, AsVector2, equaln, equalv3, midPoint, ZAxis } from "../../Geometry/GeUtils"; import { RenderType } from "../../GraphicsSystem/RenderType"; @@ -65,7 +65,7 @@ export class AlignedDimension extends Dimension { super(); this._Text.TextAligen = TextAligen.Down; - this._Text.Height = userConfig.dimTextHeight; + this._Text.Height = HostApplicationServices.dimTextHeight; } set Material(materialId: ObjectId) { } @@ -354,7 +354,7 @@ export class AlignedDimension extends Dimension let arrowSize = 10; if (renderType === RenderType.WireframePrint) { - arrowSize *= userConfig.lineWidth * 0.5; + arrowSize *= HostApplicationServices.lineWidth * 0.5; const geometry = (line).geometry; let nums: number[] = []; for (let p of [this._FootP1, this._ArmP1, this._ArmP2, this._FootP2]) @@ -615,7 +615,7 @@ export class AlignedDimension extends Dimension this._LeadOutOffsetX = file.Read(); } if (ver > 4) this._TextSize = file.Read(); - if (ver > 5) this._FractionDigits = file.Read() ?? userConfig.fractionDigitsType ?? 2; + if (ver > 5) this._FractionDigits = file.Read() ?? HostApplicationServices.fractionDigitsType ?? 2; } //对象将自身数据写入到文件. diff --git a/src/DatabaseServices/Dimension/DiameterDimension.ts b/src/DatabaseServices/Dimension/DiameterDimension.ts index b2744eee8..411904c53 100644 --- a/src/DatabaseServices/Dimension/DiameterDimension.ts +++ b/src/DatabaseServices/Dimension/DiameterDimension.ts @@ -1,9 +1,9 @@ import { BufferGeometry, Line as TLine, Material, Mesh, Object3D, Vector3 } from "three"; import { Line2 } from "three/examples/jsm/lines/Line2"; +import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices"; import { AddEntityDrawObject } from "../../Common/AddEntityDrawObject"; import { ColorMaterial } from "../../Common/ColorPalette"; import { DisposeThreeObj } from "../../Common/Dispose"; -import { userConfig } from "../../Editor/UserConfig"; import { BufferGeometryUtils } from "../../Geometry/BufferGeometryUtils"; import { angle, midPoint } from "../../Geometry/GeUtils"; import { RenderType } from "../../GraphicsSystem/RenderType"; @@ -60,7 +60,7 @@ export class DiameterDimension extends RadiusDimension if (renderType === RenderType.WireframePrint) { - arrowSize *= userConfig.lineWidth * 0.5; + arrowSize *= HostApplicationServices.lineWidth * 0.5; let geo = (line as Line2).geometry; geo.setPositions([...sp.toArray(), ...this.center.toArray(), ...this.endPt.toArray()]); } diff --git a/src/DatabaseServices/Dimension/Dimension.ts b/src/DatabaseServices/Dimension/Dimension.ts index 07c8fcf86..693a262e3 100644 --- a/src/DatabaseServices/Dimension/Dimension.ts +++ b/src/DatabaseServices/Dimension/Dimension.ts @@ -1,4 +1,4 @@ -import { userConfig } from "../../Editor/UserConfig"; +import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices"; import { Factory } from "../CADFactory"; import { Entity } from "../Entity/Entity"; import { Text } from "../Text/Text"; @@ -8,9 +8,9 @@ export abstract class Dimension extends Entity { OnlyRenderType = true; protected _TextString: string; - protected _TextSize: number = userConfig.dimTextHeight; + protected _TextSize: number = HostApplicationServices.dimTextHeight; protected _Text = new Text(undefined, undefined, "yahei"); - protected _FractionDigits: number = userConfig.fractionDigitsType; + protected _FractionDigits: number = HostApplicationServices.fractionDigitsType; set TextString(txt: string) { let str = this.GetString(); diff --git a/src/DatabaseServices/Dimension/RadiusDimension.ts b/src/DatabaseServices/Dimension/RadiusDimension.ts index 5972ce158..033a7b726 100644 --- a/src/DatabaseServices/Dimension/RadiusDimension.ts +++ b/src/DatabaseServices/Dimension/RadiusDimension.ts @@ -1,12 +1,12 @@ import { BufferGeometry, Line as TLine, Material, Matrix3, Matrix4, Mesh, Object3D, Vector3 } from "three"; import { Line2 } from "three/examples/jsm/lines/Line2"; +import { HostApplicationServices } from "../../ApplicationServices/HostApplicationServices"; import { AddEntityDrawObject } from "../../Common/AddEntityDrawObject"; import { ColorMaterial } from "../../Common/ColorPalette"; import { DisposeThreeObj } from "../../Common/Dispose"; import { reviseMirrorMatrix } from "../../Common/Matrix4Utils"; import { FixedNotZero } from "../../Common/Utils"; import { ObjectSnapMode } from "../../Editor/ObjectSnapMode"; -import { userConfig } from "../../Editor/UserConfig"; import { BufferGeometryUtils } from "../../Geometry/BufferGeometryUtils"; import { angle, angleAndX, MoveMatrix } from "../../Geometry/GeUtils"; import { RenderType } from "../../GraphicsSystem/RenderType"; @@ -32,7 +32,7 @@ export class RadiusDimension extends Dimension ) { super(); - this._Text.Height = userConfig.dimTextHeight; + this._Text.Height = HostApplicationServices.dimTextHeight; } get Text() @@ -138,7 +138,7 @@ export class RadiusDimension extends Dimension if (renderType === RenderType.WireframePrint) { - arrowSize *= userConfig.lineWidth * 0.5; + arrowSize *= HostApplicationServices.lineWidth * 0.5; let geo = (line as Line2).geometry; geo.setPositions([...this.startPt.toArray(), ...this.center.toArray(), ...this.endPt.toArray()]); } diff --git a/src/DatabaseServices/Entity/Ellipse.ts b/src/DatabaseServices/Entity/Ellipse.ts index a8f7b441a..11399c503 100644 --- a/src/DatabaseServices/Entity/Ellipse.ts +++ b/src/DatabaseServices/Entity/Ellipse.ts @@ -1,12 +1,10 @@ -import { Box3, BufferGeometry, Matrix3, Matrix4, Object3D, Shape, Vector3, Line as TLine, MathUtils } from 'three'; +import { Matrix3, Matrix4, Shape, Vector3, MathUtils } from 'three'; import { arrayLast, arrayRemoveDuplicateBySort } from '../../Common/ArrayExt'; -import { ColorMaterial } from '../../Common/ColorPalette'; import { getDeterminantFor2V, getArcOrCirNearPts, getTanPtsOnEllipse, Pts2Polyline } from '../../Common/CurveUtils'; import { Status } from '../../Common/Status'; import { ObjectSnapMode } from '../../Editor/ObjectSnapMode'; -import { angle, equaln, equalv3, MoveMatrix, rotatePoint, angleTo, AsVector2, AsVector3 } from '../../Geometry/GeUtils'; +import { angle, equaln, equalv3, MoveMatrix, rotatePoint, angleTo, AsVector2 } from '../../Geometry/GeUtils'; import { IntersectEllipse, IntersectEllipseAndCircleOrArc, IntersectEllipseAndLine, IntersectOption, IntersectPolylineAndCurve, reverseIntersectOption } from '../../GraphicsSystem/IntersectWith'; -import { RenderType } from '../../GraphicsSystem/RenderType'; import { Arc } from './Arc'; import { Factory } from '../CADFactory'; import { CADFiler } from '../CADFiler'; diff --git a/src/DatabaseServices/Entity/EntityRef.ts b/src/DatabaseServices/Entity/EntityRef.ts index e3e36e82b..3e9699d41 100644 --- a/src/DatabaseServices/Entity/EntityRef.ts +++ b/src/DatabaseServices/Entity/EntityRef.ts @@ -1,6 +1,6 @@ import { Box3, Matrix3, Matrix4, Mesh, MeshPhongMaterial, MeshPhysicalMaterial, Object3D, Vector3 } from "three"; +import { BoxLine } from "../../Add-on/testEntity/BoxLine"; import { ConverMaterial2, ParseBoxUrl, ParseFBXUrl, UE_FBX_LOADER } from "../../Add-on/testEntity/ParseMaterialImage"; -import { BoxLine } from "../../Add-on/testEntity/TestBoundaryBox"; import { ColorMaterial } from "../../Common/ColorPalette"; import { DisposeThreeObj, Object3DRemoveAll } from "../../Common/Dispose"; import { UpdateDraw } from "../../Common/Status"; @@ -119,6 +119,7 @@ export class EntityRef extends Entity // // return new Box3(this._Center.clone().sub(size2), size2.add(this._Center)); // // } + //del_exp_start //#region Draw InitDrawObject(renderType: RenderType = RenderType.Wireframe) { @@ -272,6 +273,8 @@ export class EntityRef extends Entity newObject.updateMatrixWorld(false);//保证更新位置 } + //del_exp_end + GetObjectSnapPoints( snapMode: ObjectSnapMode, pickPoint: Vector3, diff --git a/src/DatabaseServices/FaceEntity.ts b/src/DatabaseServices/FaceEntity.ts index afa257530..a322cb967 100644 --- a/src/DatabaseServices/FaceEntity.ts +++ b/src/DatabaseServices/FaceEntity.ts @@ -1,4 +1,4 @@ -import { Face3, Geometry, Mesh, Object3D, Vector3, Line } from "three"; +import { Face3, Geometry, Object3D, Vector3, Line } from "three"; import { RenderType } from "../GraphicsSystem/RenderType"; import { CADFiler } from "./CADFiler"; import { Entity } from "./Entity/Entity"; diff --git a/src/DatabaseServices/ViewportEntity.ts b/src/DatabaseServices/ViewportEntity.ts index f06bf63ac..84e79fc0d 100644 --- a/src/DatabaseServices/ViewportEntity.ts +++ b/src/DatabaseServices/ViewportEntity.ts @@ -190,6 +190,8 @@ export class ViewportEntity extends Entity new Vector3(0, this._height, z), ]; } + + //del_exp_start NeedUpdateTexture = true; InitDrawObject(type: RenderType) { @@ -249,6 +251,7 @@ export class ViewportEntity extends Entity } this.NeedUpdateTexture = false; } + //del_exp_end UpdateByPts(p1: Vector3, p2: Vector3) { diff --git a/src/DatabaseServices/ViewportEntity/ViewportEntity2.ts b/src/DatabaseServices/ViewportEntity/ViewportEntity2.ts index b225d97e9..d3c4a1bc9 100644 --- a/src/DatabaseServices/ViewportEntity/ViewportEntity2.ts +++ b/src/DatabaseServices/ViewportEntity/ViewportEntity2.ts @@ -1,4 +1,4 @@ -import { Geometry, Mesh, MeshBasicMaterial, Object3D, Scene, ShapeGeometry, Vector2, Vector3, WebGLRenderer, WebGLRenderTarget } from "three"; +import { Geometry, Mesh, MeshBasicMaterial, Object3D, Scene, ShapeGeometry, Vector3, WebGLRenderer, WebGLRenderTarget } from "three"; import { CADFiler } from "../../api"; import { app } from "../../ApplicationServices/Application"; import { ColorMaterial } from "../../Common/ColorPalette"; @@ -61,6 +61,7 @@ export class ViewportEntity2 extends Entity _Target = new Vector3(0, 0, -1); + //del_exp_start private _RenderTarget: WebGLRenderTarget; private _Scene: Scene; InitDrawObject(renderType: RenderType = RenderType.Wireframe): Object3D @@ -133,6 +134,7 @@ export class ViewportEntity2 extends Entity ViewportEntity2.Renderer.setClearColor(0x000000); } } + //del_exp_end Destroy() { diff --git a/src/Editor/ICursorConfig.ts b/src/Editor/ICursorConfig.ts new file mode 100644 index 000000000..3048c4098 --- /dev/null +++ b/src/Editor/ICursorConfig.ts @@ -0,0 +1,9 @@ +import { IBaseOption } from "../UI/Store/BoardInterface"; + + +export interface ICursorConfig extends IBaseOption +{ + D2: number; + D3: number; + SquareSize: number; +} diff --git a/src/Editor/PointPick.ts b/src/Editor/PointPick.ts index 7c56e8f86..f7a06b7cf 100644 --- a/src/Editor/PointPick.ts +++ b/src/Editor/PointPick.ts @@ -1,9 +1,9 @@ import { Intersection, Object3D, OrthographicCamera, Raycaster, Vector2, Vector3 } from 'three'; +import { HostApplicationServices } from '../ApplicationServices/HostApplicationServices'; import { equaln } from '../Geometry/GeUtils'; import { IViewer } from '../GraphicsSystem/IView'; import { SelectBox, SelectType } from './SelectBox'; import { CheckFilter, Filter } from './SelectFilter'; -import { userConfig } from './UserConfig'; /** * 构造射线投射器. @@ -73,7 +73,7 @@ export function PointPickOneObject( if (!useSelectBox) return; let pCenter = new Vector2(ptVcs.x, ptVcs.y); - let selectSize = new Vector2(userConfig.cursorSize.SquareSize, userConfig.cursorSize.SquareSize); + let selectSize = new Vector2(HostApplicationServices.cursorSize.SquareSize, HostApplicationServices.cursorSize.SquareSize); let minPt = pCenter.clone().sub(selectSize); let maxPt = pCenter.clone().add(selectSize); diff --git a/src/Editor/SelectFilter.ts b/src/Editor/SelectFilter.ts index d5d9da94e..12163c847 100644 --- a/src/Editor/SelectFilter.ts +++ b/src/Editor/SelectFilter.ts @@ -1,5 +1,5 @@ import { Object3D } from "three"; -import { GetEntity, IsEntity } from "../Common/Utils"; +import { GetEntity } from "../Common/Utils"; import { Entity } from "../DatabaseServices/Entity/Entity"; import { GripScene } from "../GraphicsSystem/GripScene"; diff --git a/src/Editor/UserConfig.ts b/src/Editor/UserConfig.ts index 7f01a56e4..2b8d9bb72 100644 --- a/src/Editor/UserConfig.ts +++ b/src/Editor/UserConfig.ts @@ -7,6 +7,7 @@ import { IBaseOption, IGrooveOption } from "../UI/Store/BoardInterface"; import { IConfigStore } from "../UI/Store/BoardStore"; import { DrillingOption } from "../UI/Store/drillInterface"; import { IWineRackOption } from "../UI/Store/WineRackInterface"; +import { ICursorConfig } from "./ICursorConfig"; export interface IMaxSizeProps extends IBaseOption { @@ -24,13 +25,6 @@ export interface ISystemConfig extends IBaseOption layoutBackground: string; } -export interface ICursorConfig extends IBaseOption -{ - D2: number; - D3: number; - SquareSize: number; -} - export interface IUCSGridConfig extends IBaseOption { isShowUCSGrid: boolean, diff --git a/src/GraphicsSystem/CameraUpdate.ts b/src/GraphicsSystem/CameraUpdate.ts index c3268eeda..1943a7fb7 100644 --- a/src/GraphicsSystem/CameraUpdate.ts +++ b/src/GraphicsSystem/CameraUpdate.ts @@ -1,6 +1,6 @@ import { Box3, MathUtils, OrthographicCamera, PerspectiveCamera, Vector3 } from 'three'; +import { HostApplicationServices } from '../ApplicationServices/HostApplicationServices'; import { CADFiler } from '../DatabaseServices/CADFiler'; -import { userConfig } from '../Editor/UserConfig'; import { Orbit } from '../Geometry/Orbit'; const ViewScopeSize = 4e6; @@ -81,7 +81,7 @@ export class CameraUpdate } set ViewHeight(height) { - this._ViewHeight = MathUtils.clamp(height, userConfig.viewSize.minViewHeight, userConfig.viewSize.maxViewHeight); + this._ViewHeight = MathUtils.clamp(height, HostApplicationServices.viewSize.minViewHeight, HostApplicationServices.viewSize.maxViewHeight); this.ZoomEvent(); } @@ -189,7 +189,7 @@ export class CameraUpdate if (this.Camera instanceof OrthographicCamera) { this.ViewHeight *= scale; - if (scaleCenter && this._ViewHeight < userConfig.viewSize.maxViewHeight) + if (scaleCenter && this._ViewHeight < HostApplicationServices.viewSize.maxViewHeight) { this._Target.sub(scaleCenter); this._Target.multiplyScalar(scale); diff --git a/src/Nest/Test/TestData.ts b/src/Nest/Test/TestData.ts index 919db7234..71d467c83 100644 --- a/src/Nest/Test/TestData.ts +++ b/src/Nest/Test/TestData.ts @@ -1,5 +1,4 @@ import { Command } from "../../Editor/CommandMachine"; -import { HotCMD } from "../../Hot/HotCommand"; import { app } from "../../ApplicationServices/Application"; import { Polyline } from "../../DatabaseServices/Entity/Polyline"; import { PromptStatus } from "../../Editor/PromptResult"; diff --git a/src/Nest/Test/TestHull.ts b/src/Nest/Test/TestHull.ts index bbe051a83..5b59db190 100644 --- a/src/Nest/Test/TestHull.ts +++ b/src/Nest/Test/TestHull.ts @@ -3,7 +3,6 @@ import { Point } from "../../DatabaseServices/Entity/Point"; import { PromptStatus } from "../../Editor/PromptResult"; import { ConvexHull2D } from "../Common/ConvexHull2D"; import { Path2Polyline } from "../Converter/Path2Polyline"; -import { HotCMD } from "../../Hot/HotCommand"; export class Command_TestHull diff --git a/src/Nest/Test/TestPlace.ts b/src/Nest/Test/TestPlace.ts index 28ad4ed82..f16329df7 100644 --- a/src/Nest/Test/TestPlace.ts +++ b/src/Nest/Test/TestPlace.ts @@ -6,7 +6,6 @@ import { Polyline } from "../../DatabaseServices/Entity/Polyline"; import { Command } from "../../Editor/CommandMachine"; import { PromptStatus } from "../../Editor/PromptResult"; import { AsVector3 } from "../../Geometry/GeUtils"; -import { HotCMD } from "../../Hot/HotCommand"; import { Container } from "../Core/Container"; import { Curve2Path, Curves2Parts } from "../Converter/Curves2Parts"; import { Part } from "../Core/Part"; diff --git a/src/UI/Components/Board/BoardFindCommon.tsx b/src/UI/Components/Board/BoardFindCommon.tsx index 313c34ef2..5cda14e5f 100644 --- a/src/UI/Components/Board/BoardFindCommon.tsx +++ b/src/UI/Components/Board/BoardFindCommon.tsx @@ -1,4 +1,4 @@ -import { Button, Checkbox, Classes, HTMLSelect, Intent, IOptionProps } from '@blueprintjs/core'; +import { Button, Checkbox, Classes, HTMLSelect, Intent } from '@blueprintjs/core'; import { observer } from 'mobx-react'; import * as React from 'react'; import { safeEval } from '../../../Common/eval'; diff --git a/src/UI/Components/Board/Door/DoorModal.tsx b/src/UI/Components/Board/Door/DoorModal.tsx index 7d0b74d8f..d435285c0 100644 --- a/src/UI/Components/Board/Door/DoorModal.tsx +++ b/src/UI/Components/Board/Door/DoorModal.tsx @@ -1,6 +1,6 @@ -import { inject, observer } from 'mobx-react'; +import { observer } from 'mobx-react'; import * as React from 'react'; -import { Button, Classes, H5, Label } from '@blueprintjs/core'; +import { Button, Classes, H5 } from '@blueprintjs/core'; import { ModalState } from '../../Modal/ModalInterface'; import { DoorConfigModal } from './DoorConfigModal'; import { DoorPreviewComponent } from './DoorPreviewComponent'; diff --git a/src/UI/Components/Board/SpecialBoardModal.tsx b/src/UI/Components/Board/SpecialBoardModal.tsx index 0516d14a6..3b182d39a 100644 --- a/src/UI/Components/Board/SpecialBoardModal.tsx +++ b/src/UI/Components/Board/SpecialBoardModal.tsx @@ -1,4 +1,4 @@ -import { Button, Classes, Intent } from '@blueprintjs/core'; +import { Button, Classes } from '@blueprintjs/core'; import { observer } from 'mobx-react'; import * as React from 'react'; import { app } from '../../../ApplicationServices/Application'; diff --git a/src/UI/Components/Modal/OptionModal/SystemConfig.tsx b/src/UI/Components/Modal/OptionModal/SystemConfig.tsx index 601832b71..ef2998c75 100644 --- a/src/UI/Components/Modal/OptionModal/SystemConfig.tsx +++ b/src/UI/Components/Modal/OptionModal/SystemConfig.tsx @@ -4,7 +4,8 @@ import * as React from 'react'; import { CheckObjectType } from '../../../../Common/CheckoutVaildValue'; import { DataAdapter } from '../../../../Common/DataAdapter'; import { safeEval } from '../../../../Common/eval'; -import { ICursorConfig, ISystemConfig, userConfig } from "../../../../Editor/UserConfig"; +import { ICursorConfig } from "../../../../Editor/ICursorConfig"; +import { ISystemConfig, userConfig } from "../../../../Editor/UserConfig"; import { IUiOption } from '../../../Store/BoardInterface'; import { ToasterInput } from '../../Toaster'; diff --git a/src/UI/Components/RightPanel/Modeling/KnifeList.tsx b/src/UI/Components/RightPanel/Modeling/KnifeList.tsx index 5a5cdf41e..96993b69e 100644 --- a/src/UI/Components/RightPanel/Modeling/KnifeList.tsx +++ b/src/UI/Components/RightPanel/Modeling/KnifeList.tsx @@ -1,4 +1,4 @@ -import { Button, Card, Checkbox, Classes, ContextMenu, Intent, Menu, MenuItem, Popover, Position } from '@blueprintjs/core'; +import { Button, ContextMenu, Intent, Menu, MenuItem } from '@blueprintjs/core'; import { IObservableValue, observable } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; diff --git a/src/UI/Components/RightPanel/ModelingComponent.tsx b/src/UI/Components/RightPanel/ModelingComponent.tsx index 972fcb62b..058d34666 100644 --- a/src/UI/Components/RightPanel/ModelingComponent.tsx +++ b/src/UI/Components/RightPanel/ModelingComponent.tsx @@ -1,4 +1,4 @@ -import { Classes, HTMLSelect, Label } from '@blueprintjs/core'; +import { Classes, Label } from '@blueprintjs/core'; import { inject, observer } from 'mobx-react'; import * as React from 'react'; import { ColorMaterial } from '../../../Common/ColorPalette'; diff --git a/src/UI/Components/SimpleDialog.tsx b/src/UI/Components/SimpleDialog.tsx index ce907f28e..fa7d850aa 100644 --- a/src/UI/Components/SimpleDialog.tsx +++ b/src/UI/Components/SimpleDialog.tsx @@ -1,6 +1,6 @@ -import * as React from 'react'; -import { H5, Label, Classes, Button, Intent } from '@blueprintjs/core'; +import { Button, Classes, H5, Intent } from '@blueprintjs/core'; import { observer } from 'mobx-react'; +import * as React from 'react'; export interface ISimpleDialogProps { diff --git a/src/UI/Components/SourceManage/ImgList.tsx b/src/UI/Components/SourceManage/ImgList.tsx index e4cc72e8a..0bbe28423 100644 --- a/src/UI/Components/SourceManage/ImgList.tsx +++ b/src/UI/Components/SourceManage/ImgList.tsx @@ -1,4 +1,4 @@ -import { Button, Card, Checkbox, Classes, Intent, Popover, Position, PopoverInteractionKind } from '@blueprintjs/core'; +import { Button, Card, Checkbox, Classes, Intent, Popover, Position } from '@blueprintjs/core'; import { inject, observer } from 'mobx-react'; import * as React from 'react'; import { MaterialStore } from '../../Store/MaterialStore'; diff --git a/src/UI/Components/SourceManage/SoucePanel.tsx b/src/UI/Components/SourceManage/SoucePanel.tsx index a0126cd99..f9ed30723 100644 --- a/src/UI/Components/SourceManage/SoucePanel.tsx +++ b/src/UI/Components/SourceManage/SoucePanel.tsx @@ -17,8 +17,6 @@ export interface SoucePanelState } export const MFilePanel = "f1"; -const ModelPanel = () =>
我的模型
; - /** * 资源管理器面板 * TODO:贴图，模型面板组件，和材质组件类似 diff --git a/src/UI/Components/Template/ToplineList.tsx b/src/UI/Components/Template/ToplineList.tsx index 56a8fa82f..0b7c641ff 100644 --- a/src/UI/Components/Template/ToplineList.tsx +++ b/src/UI/Components/Template/ToplineList.tsx @@ -1,21 +1,21 @@ -import { Button, Card, Checkbox, Classes, Intent, Popover, Position, ContextMenu, Menu, MenuItem } from '@blueprintjs/core'; +import { Button, ContextMenu, Intent, Menu, MenuItem } from '@blueprintjs/core'; import { IObservableValue } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; -import { TempEditor } from '../../../Editor/TempEditor'; import { app } from '../../../ApplicationServices/Application'; -import { Polyline } from '../../../DatabaseServices/Entity/Polyline'; -import { PostJson, RequestStatus } from '../../../Common/Request'; import { ToplineUrls } from '../../../Common/HostUrl'; -import { inflate, toplineFileIn, getPolylineSVG, deflate } from '../../../Common/SerializeMaterial'; +import { PostJson, RequestStatus } from '../../../Common/Request'; +import { deflate, getPolylineSVG, inflate, toplineFileIn } from '../../../Common/SerializeMaterial'; import { CADFiler } from '../../../DatabaseServices/CADFiler'; -import { ZoomToEntity } from '../../Store/RightPanelStore/BoardEdgesEditor'; +import { Polyline } from '../../../DatabaseServices/Entity/Polyline'; import { CommandWrap } from '../../../Editor/CommandMachine'; -import { AppToaster } from '../Toaster'; -import { TopllineManage } from './ToplineManage'; +import { TempEditor } from '../../../Editor/TempEditor'; +import { ZoomToEntity } from '../../Store/RightPanelStore/BoardEdgesEditor'; +import { DataList } from '../Common/Datalist'; import { ModalPosition } from '../Modal/ModalInterface'; import { IDirectoryProps } from '../SourceManage/CommonPanel'; -import { DataList } from '../Common/Datalist'; +import { AppToaster } from '../Toaster'; +import { TopllineManage } from './ToplineManage'; export interface IToplineListProps { diff --git a/src/UI/MaterialEditor/GoodsList.tsx b/src/UI/MaterialEditor/GoodsList.tsx index 87c4227a5..1594dbc6e 100644 --- a/src/UI/MaterialEditor/GoodsList.tsx +++ b/src/UI/MaterialEditor/GoodsList.tsx @@ -1,4 +1,4 @@ -import { Card, HTMLTable, Icon, InputGroup, Tooltip } from '@blueprintjs/core'; +import { Card, HTMLTable, Icon, InputGroup } from '@blueprintjs/core'; import { IObservableValue, observable } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; diff --git a/src/UI/Store/KuGanStore.ts b/src/UI/Store/KuGanStore.ts index e05ad8f4e..0a01ce5ed 100644 --- a/src/UI/Store/KuGanStore.ts +++ b/src/UI/Store/KuGanStore.ts @@ -1,12 +1,12 @@ -import { IKuGangDrawOption } from "../Components/Template/TemplateInterface"; -import { DefaultKuGanOption } from "../../Editor/DefaultConfig"; -import { IUiOption } from "./BoardInterface"; +import { action, observable, reaction, toJS } from "mobx"; +import { appCache } from "../../Common/AppCache"; import { DataAdapter } from "../../Common/DataAdapter"; -import { observable, toJS, autorun, reaction, action } from "mobx"; import { safeEval } from "../../Common/eval"; -import { PostJson, RequestStatus } from "../../Common/Request"; import { ConfigUrls } from "../../Common/HostUrl"; -import { appCache } from "../../Common/AppCache"; +import { PostJson, RequestStatus } from "../../Common/Request"; +import { DefaultKuGanOption } from "../../Editor/DefaultConfig"; +import { IKuGangDrawOption } from "../Components/Template/TemplateInterface"; +import { IUiOption } from "./BoardInterface"; export class KuGanStore { diff --git a/src/UI/Store/RightPanelStore/HardwareStore.ts b/src/UI/Store/RightPanelStore/HardwareStore.ts index 79d4d4dd9..06b0ac702 100644 --- a/src/UI/Store/RightPanelStore/HardwareStore.ts +++ b/src/UI/Store/RightPanelStore/HardwareStore.ts @@ -1,10 +1,10 @@ import { observable, toJS } from "mobx"; -import { ICylMetalsOption, IExtMetalsOption, ICompHardwareOption, IHardwareOption, IToplineOption } from "../../Components/RightPanel/RightPanelInterface"; -import { DefaultCylinederMetalsOption, DefaultExtruderMetalsOption, DefaultCompositeMetalsOption, DefaultToplineMetalsOption } from "../../../Editor/DefaultConfig"; -import { IConfigStore } from "../BoardStore"; -import { IConfigOption } from "../../Components/Board/UserConfig"; import { HardwareCompositeEntity } from "../../../DatabaseServices/Hardware/HardwareCompositeEntity"; import { HardwareTopline } from "../../../DatabaseServices/Hardware/HardwareTopline"; +import { DefaultCompositeMetalsOption, DefaultToplineMetalsOption } from "../../../Editor/DefaultConfig"; +import { IConfigOption } from "../../Components/Board/UserConfig"; +import { ICompHardwareOption, IHardwareOption, IToplineOption } from "../../Components/RightPanel/RightPanelInterface"; +import { IConfigStore } from "../BoardStore"; export abstract class BaseHardwareStore implements IConfigStore { diff --git a/src/webview.ts b/src/webview.ts index f89a7ddda..8fc9208d8 100644 --- a/src/webview.ts +++ b/src/webview.ts @@ -1,7 +1,7 @@ import * as THREE from 'three'; +import '../../Css/switchTheme.less'; import { CameraControlState } from './Editor/CameraControls'; import './UI/Css/style.less'; -import '../../Css/switchTheme.less'; import { WebCADView } from './WebCADView/WebCADView'; function createRootElement() @@ -31,8 +31,6 @@ function createBtn(textCtx: string, parEl: HTMLElement, callback: any) return btn; } -let bulbLight: THREE.PointLight; - window.onload = async () => { let el = createRootElement();