更新:同步代码变更,修复iaop问题

This commit is contained in:
FishOrBear
2021-04-25 10:38:47 +08:00
parent 91bae565fd
commit e19f64a55d
139 changed files with 572 additions and 418 deletions

View File

@@ -1,4 +1,4 @@
import { Box3, Material, Matrix3, Matrix4, Object3D, Vector2, Vector3 } from "three";
import { Material, Matrix3, Matrix4, Object3D, Vector2, Vector3 } from "three";
import { ObjectSnapMode } from "../../Editor/ObjectSnapMode";
import { RenderType } from "../../GraphicsSystem/RenderType";
import { CADFiler } from "../CADFiler";
@@ -15,15 +15,14 @@ interface DefaultValue {
* @class AlignedDimension
*/
export declare class AlignedDimension extends Entity {
protected m_FootP1: Vector3;
protected m_FootP2: Vector3;
protected m_ArmP1: Vector3;
protected m_ArmP2: Vector3;
protected m_TextRotation: number;
protected m_LeadOutVisible: boolean;
protected _FootP1: Vector3;
protected _FootP2: Vector3;
protected _ArmP1: Vector3;
protected _ArmP2: Vector3;
protected _TextRotation: number;
protected _LeadOutVisible: boolean;
private _Text;
private _TextString;
private _TextBoundingBox;
private _LeadOutLine;
private _LeadOutOffsetY;
private _LeadOutOffsetX;
@@ -31,7 +30,7 @@ export declare class AlignedDimension extends Entity {
private _LeadOutPts;
private _LeadOutIsFlipped;
private isDragLeadOutPt;
constructor(m_FootP1?: Vector3, m_FootP2?: Vector3, m_ArmP1?: Vector3, m_ArmP2?: Vector3, m_TextRotation?: number, m_LeadOutVisible?: boolean);
constructor(_FootP1?: Vector3, _FootP2?: Vector3, _ArmP1?: Vector3, _ArmP2?: Vector3, _TextRotation?: number, _LeadOutVisible?: boolean);
set FootP1(v: Vector3);
get FootP1(): Vector3;
set FootP2(v: Vector3);
@@ -48,8 +47,7 @@ export declare class AlignedDimension extends Entity {
set TextAligen(al: TextAligen);
get Text(): Text;
set TextString(txt: string);
get TextBoundingBox(): Box3;
set TextBoundingBox(box: Box3);
get BoundingBox(): import("../../Geometry/Box").Box3Ext;
set LeadOutVisible(visible: boolean);
set LeadOutFlipped(isFlipped: boolean);
get LeadOutFlipped(): boolean;
@@ -78,6 +76,7 @@ export declare class AlignedDimension extends Entity {
UpdateLeadOutLine(): Vector3;
UpdateText(pos?: Vector3): void;
GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform?: Matrix3): Vector3[];
private SetDataToTempPolyline;
UpdateDrawObjectMaterial(renderType: RenderType, obj: Object3D, material?: Material): void;
GetGripPoints(): Array<Vector3>;
MoveGripPoints(indexList: number[], vec: Vector3): void;

View File

@@ -1 +1 @@
{"version":3,"file":"AlignedDimension.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Dimension/AlignedDimension.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"AlignedDimension.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Dimension/AlignedDimension.ts"],"names":[],"mappings":"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"}

View File

@@ -1,7 +1,7 @@
import { Vector3 } from "three";
import { AlignedDimension } from "./AlignedDimension";
export declare class LinearDimension extends AlignedDimension {
private m_DimDir;
private _DimDir;
get TextPosition(): Vector3;
set TextPosition(p: Vector3);
ChangeFootPt(): void;

View File

@@ -1 +1 @@
{"version":3,"file":"LinearDimension.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Dimension/LinearDimension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAgBtD,qBACa,eAAgB,SAAQ,gBAAgB;IAEjD,OAAO,CAAC,QAAQ,CAAY;IAE5B,IAAI,YAAY,IAII,OAAO,CAD1B;IACD,IAAI,YAAY,CAAC,CAAC,EAAE,OAAO,EAyB1B;IACD,YAAY;CAcf"}
{"version":3,"file":"LinearDimension.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Dimension/LinearDimension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAKhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AActD,qBACa,eAAgB,SAAQ,gBAAgB;IAEjD,OAAO,CAAC,OAAO,CAAY;IAE3B,IAAI,YAAY,IAII,OAAO,CAD1B;IACD,IAAI,YAAY,CAAC,CAAC,EAAE,OAAO,EAyB1B;IACD,YAAY;CAcf"}