Skip to content

Commit 1095364

Browse files
matas-bitbybit-devmatas-bitbybit-dev
committed
added some new base types, cleaned up dimensions service
1 parent 6b7f66f commit 1095364

File tree

8 files changed

+20
-19
lines changed

8 files changed

+20
-19
lines changed

‎packages/dev/babylonjs/lib/api/inputs/base-inputs.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ export namespace Base {
2020
export type Vector2 = [number, number];
2121
export type Point3 = [number, number, number];
2222
export type Vector3 = [number, number, number];
23+
export type Axis3 = {origin: Base.Point3, direction: Base.Vector3};
24+
export type Axis2 = {origin: Base.Point2, direction: Base.Vector2};
25+
export type Plane3 = { origin: Base.Point3, normal: Base.Vector3, direction: Base.Vector3 };
2326
export type BoundingBox = { min: Base.Point3, max: Base.Point3, center?: Base.Point3, width?: number, height?: number, length?: number };
2427
export type Line2 = { start: Base.Point2, end: Base.Point2 };
2528
export type Line3 = { start: Base.Point3, end: Base.Point3 };

‎packages/dev/base/lib/api/inputs/base-inputs.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ export namespace Base {
77
export type Vector2 = [number, number];
88
export type Point3 = [number, number, number];
99
export type Vector3 = [number, number, number];
10+
export type Axis3 = {origin: Base.Point3, direction: Base.Vector3};
11+
export type Axis2 = {origin: Base.Point2, direction: Base.Vector2};
12+
export type Plane3 = { origin: Base.Point3, normal: Base.Vector3, direction: Base.Vector3 };
1013
export type BoundingBox = { min: Base.Point3, max: Base.Point3, center?: Base.Point3, width?: number, height?: number, length?: number };
1114
export type Line2 = { start: Base.Point2, end: Base.Point2 };
1215
export type Line3 = { start: Base.Point3, end: Base.Point3 };

‎packages/dev/core/lib/api/inputs/base-inputs.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ export namespace Base {
1919
export type Vector2 = [number, number];
2020
export type Point3 = [number, number, number];
2121
export type Vector3 = [number, number, number];
22+
export type Axis3 = {origin: Base.Point3, direction: Base.Vector3};
23+
export type Axis2 = {origin: Base.Point2, direction: Base.Vector2};
24+
export type Plane3 = { origin: Base.Point3, normal: Base.Vector3, direction: Base.Vector3 };
2225
export type BoundingBox = { min: Base.Point3, max: Base.Point3, center?: Base.Point3, width?: number, height?: number, length?: number };
2326
export type Line2 = { start: Base.Point2, end: Base.Point2 };
2427
export type Line3 = { start: Base.Point3, end: Base.Point3 };

‎packages/dev/jscad/lib/api/inputs/base-inputs.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ export namespace Base {
66
export type Vector2 = [number, number];
77
export type Point3 = [number, number, number];
88
export type Vector3 = [number, number, number];
9+
export type Axis3 = {origin: Base.Point3, direction: Base.Vector3};
10+
export type Axis2 = {origin: Base.Point2, direction: Base.Vector2};
11+
export type Plane3 = { origin: Base.Point3, normal: Base.Vector3, direction: Base.Vector3 };
912
export type BoundingBox = { min: Base.Point3, max: Base.Point3, center?: Base.Point3, width?: number, height?: number, length?: number };
1013
export type Line2 = { start: Base.Point2, end: Base.Point2 };
1114
export type Line3 = { start: Base.Point3, end: Base.Point3 };

‎packages/dev/manifold/lib/api/inputs/base-inputs.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ export namespace Base {
66
export type Vector2 = [number, number];
77
export type Point3 = [number, number, number];
88
export type Vector3 = [number, number, number];
9+
export type Axis3 = {origin: Base.Point3, direction: Base.Vector3};
10+
export type Axis2 = {origin: Base.Point2, direction: Base.Vector2};
11+
export type Plane3 = { origin: Base.Point3, normal: Base.Vector3, direction: Base.Vector3 };
912
export type BoundingBox = { min: Base.Point3, max: Base.Point3, center?: Base.Point3, width?: number, height?: number, length?: number };
1013
export type Line2 = { start: Base.Point2, end: Base.Point2 };
1114
export type Line3 = { start: Base.Point3, end: Base.Point3 };

‎packages/dev/occt/lib/occ-helper.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ export class OccHelper {
8484
this.wiresService = new WiresService(occ, this.occRefReturns, this.vector, this.shapesHelperService, this.shapeGettersService, this.transformsService,
8585
this.enumService, this.entitiesService, this.converterService, this.geomService, this.edgesService, this.textService, this.operationsService);
8686

87-
this.dimensionsService = new DimensionsService(occ, this.occRefReturns, this.vector, this.point, this.shapesHelperService, this.shapeGettersService, this.transformsService,
88-
this.enumService, this.entitiesService, this.converterService, this.geomService, this.edgesService, this.wiresService);
87+
this.dimensionsService = new DimensionsService(this.vector, this.point, this.transformsService,
88+
this.converterService, this.wiresService);
8989

9090
this.verticesService.wiresService = this.wiresService;
9191

‎packages/dev/occt/lib/services/base/dimensions.service.ts‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,20 @@
11
import {
2-
OpenCascadeInstance,
32
TopoDS_Compound,
43
} from "../../../bitbybit-dev-occt/bitbybit-dev-occt";
54
import * as Inputs from "../../api/inputs/inputs";
6-
import { ShapesHelperService } from "../../api/shapes-helper.service";
7-
import { OCCReferencedReturns } from "../../occ-referenced-returns";
8-
import { EdgesService } from "./edges.service";
9-
import { ShapeGettersService } from "./shape-getters";
10-
import { EntitiesService } from "./entities.service";
11-
import { GeomService } from "./geom.service";
125
import { TransformsService } from "./transforms.service";
136
import { ConverterService } from "./converter.service";
14-
import { EnumService } from "./enum.service";
157
import { WiresService } from "./wires.service";
168
import { Point, Vector } from "@bitbybit-dev/base";
179

1810
export class DimensionsService {
1911

2012
constructor(
21-
private readonly occ: OpenCascadeInstance,
22-
private readonly occRefReturns: OCCReferencedReturns,
2313
private readonly vector: Vector,
2414
private readonly point: Point,
25-
private readonly shapesHelperService: ShapesHelperService,
26-
private readonly shapeGettersService: ShapeGettersService,
2715
private readonly transformsService: TransformsService,
28-
private readonly enumService: EnumService,
29-
private readonly entitiesService: EntitiesService,
3016
private readonly converterService: ConverterService,
31-
private readonly geomService: GeomService,
32-
private readonly edgesService: EdgesService,
3317
private readonly wiresService: WiresService
34-
3518
) { }
3619

3720
simpleLinearLengthDimension(inputs: Inputs.OCCT.SimpleLinearLengthDimensionDto): TopoDS_Compound {

‎packages/dev/threejs/lib/api/inputs/base-inputs.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ export namespace Base {
77
export type Vector2 = [number, number];
88
export type Point3 = [number, number, number];
99
export type Vector3 = [number, number, number];
10+
export type Axis3 = {origin: Base.Point3, direction: Base.Vector3};
11+
export type Axis2 = {origin: Base.Point2, direction: Base.Vector2};
12+
export type Plane3 = { origin: Base.Point3, normal: Base.Vector3, direction: Base.Vector3 };
1013
export type BoundingBox = { min: Base.Point3, max: Base.Point3, center?: Base.Point3, width?: number, height?: number, length?: number };
1114
export type Line2 = { start: Base.Point2, end: Base.Point2 };
1215
export type Line3 = { start: Base.Point3, end: Base.Point3 };

0 commit comments

Comments
 (0)