abstract-3d 2.0.3 → 2.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/renderers/react/react-camera.js +14 -19
- package/lib/renderers/react/react-camera.js.map +1 -1
- package/lib/renderers/react/react-dimension.js +5 -5
- package/lib/renderers/react/react-dimension.js.map +1 -1
- package/lib/renderers/react/react-group.js +3 -5
- package/lib/renderers/react/react-group.js.map +1 -1
- package/lib/renderers/react/react-hotspot.js +21 -28
- package/lib/renderers/react/react-hotspot.js.map +1 -1
- package/lib/renderers/react/react-material.js +8 -7
- package/lib/renderers/react/react-material.js.map +1 -1
- package/lib/renderers/react/react-mesh.d.ts.map +1 -1
- package/lib/renderers/react/react-mesh.js +20 -39
- package/lib/renderers/react/react-mesh.js.map +1 -1
- package/lib/renderers/react/react-scene.js +11 -14
- package/lib/renderers/react/react-scene.js.map +1 -1
- package/lib/renderers/react/react.js +22 -32
- package/lib/renderers/react/react.js.map +1 -1
- package/lib/renderers/step/step-geometries/step-box.d.ts.map +1 -1
- package/lib/renderers/step/step-geometries/step-box.js +3 -20
- package/lib/renderers/step/step-geometries/step-box.js.map +1 -1
- package/lib/renderers/step/step-geometries/step-cylinder.d.ts.map +1 -1
- package/lib/renderers/step/step-geometries/step-cylinder.js +8 -24
- package/lib/renderers/step/step-geometries/step-cylinder.js.map +1 -1
- package/package.json +3 -3
- package/src/renderers/react/react-mesh.tsx +13 -14
- package/src/renderers/step/step-geometries/step-box.ts +3 -20
- package/src/renderers/step/step-geometries/step-cylinder.ts +8 -28
- package/lib/renderers/shared.d.ts +0 -27
- package/lib/renderers/shared.d.ts.map +0 -1
- package/lib/renderers/shared.js +0 -131
- package/lib/renderers/shared.js.map +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
1
2
|
import React from "react";
|
|
2
3
|
import { ReactHotSpots } from "./react-hotspot.js";
|
|
3
4
|
import { ReactDimensions } from "./react-dimension.js";
|
|
@@ -5,7 +6,7 @@ import { ReactGroup } from "./react-group.js";
|
|
|
5
6
|
import { Html } from "@react-three/drei";
|
|
6
7
|
export function ReactScene({ scene, selectedIds, hoveredIdExternal, activeHotSpots, activeComponents, hotSpotTexts, showHotSpotTexts, showDimensions, useAlphaTest, materialStateImages, reactPopovers, onClickGroup, onHoverGroup, onContextMenuGroup, onClickHotSpot, createGroupKey, createGroupId, }) {
|
|
7
8
|
const [hoveredId, setHoveredId] = React.useState(undefined);
|
|
8
|
-
return (
|
|
9
|
+
return (_jsxs("group", { rotation: [
|
|
9
10
|
scene.rotation_deprecated?.x ?? 0,
|
|
10
11
|
scene.rotation_deprecated?.y ?? 0,
|
|
11
12
|
scene.rotation_deprecated?.z ?? 0,
|
|
@@ -13,18 +14,14 @@ export function ReactScene({ scene, selectedIds, hoveredIdExternal, activeHotSpo
|
|
|
13
14
|
-(scene.center_deprecated?.x ?? 0),
|
|
14
15
|
-(scene.center_deprecated?.y ?? 0),
|
|
15
16
|
-(scene.center_deprecated?.z ?? 0),
|
|
16
|
-
]
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
}),
|
|
26
|
-
React.createElement(ReactDimensions, { dimensions: scene.dimensions_deprecated, showDimensions: showDimensions, sceneRotation: scene.rotation_deprecated, sceneCenter: scene.center_deprecated }),
|
|
27
|
-
React.createElement(ReactHotSpots, { hotSpots: scene.hotSpots_deprecated, hotSpotZAdjPos: scene.size_deprecated.z / 2, activeHotSpots: activeHotSpots, hotSpotTexts: hotSpotTexts, hoveredId: hoveredId, onClickHotSpot: onClickHotSpot, setHoveredId: setHoveredId, showHotSpotTexts: showHotSpotTexts }),
|
|
28
|
-
reactPopovers?.map((p) => (React.createElement(Html, { key: p.id, position: [p.pos.x, p.pos.y, p.pos.z], center: true, pointerEvents: "none" }, p.content)))));
|
|
17
|
+
], children: [scene.groups.map((g, i) => {
|
|
18
|
+
const id = createGroupId ? createGroupId(g) : "";
|
|
19
|
+
return (_jsx(ReactGroup, { g: g, selectedIds: selectedIds, hotSpotsActive: activeHotSpots !== undefined, activeComponents: activeComponents, materialStateImages: materialStateImages, hoveredId: hoveredId, hoveredIdExternal: hoveredIdExternal, onClickGroup: onClickGroup, onHoverGroup: (id, rootData, data, e) => {
|
|
20
|
+
setHoveredId(id);
|
|
21
|
+
if (onHoverGroup) {
|
|
22
|
+
onHoverGroup(id, rootData, data, e);
|
|
23
|
+
}
|
|
24
|
+
}, onContextMenuGroup: onContextMenuGroup, createGroupKey: createGroupKey, id: id, useAlphaTest: useAlphaTest, rootData: g.data }, createGroupKey ? createGroupKey(g, 0, g.data, id) : i));
|
|
25
|
+
}), _jsx(ReactDimensions, { dimensions: scene.dimensions_deprecated, showDimensions: showDimensions, sceneRotation: scene.rotation_deprecated, sceneCenter: scene.center_deprecated }), _jsx(ReactHotSpots, { hotSpots: scene.hotSpots_deprecated, hotSpotZAdjPos: scene.size_deprecated.z / 2, activeHotSpots: activeHotSpots, hotSpotTexts: hotSpotTexts, hoveredId: hoveredId, onClickHotSpot: onClickHotSpot, setHoveredId: setHoveredId, showHotSpotTexts: showHotSpotTexts }), reactPopovers?.map((p) => (_jsx(Html, { position: [p.pos.x, p.pos.y, p.pos.z], center: true, pointerEvents: "none", children: p.content }, p.id)))] }));
|
|
29
26
|
}
|
|
30
27
|
//# sourceMappingURL=react-scene.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-scene.js","sourceRoot":"","sources":["../../../src/renderers/react/react-scene.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAe,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAUzC,MAAM,UAAU,UAAU,CAAC,EACzB,KAAK,EACL,WAAW,EACX,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,aAAa,GAoCd;IACC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAqB,SAAS,CAAC,CAAC;IAChF,OAAO,CACL
|
|
1
|
+
{"version":3,"file":"react-scene.js","sourceRoot":"","sources":["../../../src/renderers/react/react-scene.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
1
2
|
import React, { memo } from "react";
|
|
2
3
|
import { Canvas } from "@react-three/fiber";
|
|
3
4
|
import { Html } from "@react-three/drei";
|
|
@@ -6,37 +7,26 @@ import { ReactScene } from "./react-scene.js";
|
|
|
6
7
|
import { ReactCamera } from "./react-camera.js";
|
|
7
8
|
export const render = memo(({ scene, selectedIds, useOldMode, activeHotSpots, activeComponents, hoveredIdExternal, hotSpotTexts, popovers: reactPopovers, showHotSpotTexts = false, showDimensions = true, useAnimations = false, camera = { type: "Perspective" }, view = "front", controlsHelper, canvasProps, orbitContolsProps, materialStateImages, sceneFallback, useAlphaTest = true, onClickGroup, onHoverGroup, onContextMenuGroup, onClickHotSpot, createGroupKey, createGroupId, }) => {
|
|
8
9
|
const intensity = useOldMode ? 2 : 0.4;
|
|
9
|
-
return scene ? (
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
-(scene.center_deprecated?.y ?? 0),
|
|
31
|
-
-(scene.center_deprecated?.z ?? 0),
|
|
32
|
-
], intensity: 0.4 }),
|
|
33
|
-
React.createElement("directionalLight", { position: [
|
|
34
|
-
-(scene.center_deprecated?.x ?? 0) + 1.5 * scene.size_deprecated.x,
|
|
35
|
-
-(scene.center_deprecated?.y ?? 0),
|
|
36
|
-
-(scene.center_deprecated?.z ?? 0),
|
|
37
|
-
], intensity: 0.4 }),
|
|
38
|
-
React.createElement(ReactScene, { scene: scene, selectedIds: selectedIds, activeHotSpots: activeHotSpots, activeComponents: activeComponents, showDimensions: showDimensions, showHotSpotTexts: showHotSpotTexts, hoveredIdExternal: hoveredIdExternal, hotSpotTexts: hotSpotTexts, reactPopovers: reactPopovers, materialStateImages: materialStateImages, onClickGroup: onClickGroup, onHoverGroup: onHoverGroup, onContextMenuGroup: onContextMenuGroup, onClickHotSpot: onClickHotSpot, createGroupKey: createGroupKey, createGroupId: createGroupId, useAlphaTest: useAlphaTest }),
|
|
39
|
-
!useOldMode && (React.createElement(EffectComposer, { multisampling: 8 },
|
|
40
|
-
React.createElement(N8AO, { aoRadius: 40, denoiseSamples: 4, distanceFalloff: 0.2, intensity: 2, screenSpaceRadius: true, halfRes: true })))))) : (sceneFallback ?? React.createElement(React.Fragment, null));
|
|
10
|
+
return scene ? (_jsx(Canvas, { dpr: [1, window.devicePixelRatio], frameloop: "demand", ...canvasProps, children: _jsxs(React.Suspense, { fallback: _jsx(Html, { center: true, children: sceneFallback ?? _jsx(_Fragment, {}) }), children: [_jsx(ReactCamera, { scene: scene, useAnimations: useAnimations, camera: camera, view: view, controlsHelper: controlsHelper, orbitContolsProps: orbitContolsProps }), _jsx("ambientLight", { intensity: 3.5 }), _jsx("directionalLight", { position: [
|
|
11
|
+
-(scene.center_deprecated?.x ?? 0) - 1.5 * scene.size_deprecated.x,
|
|
12
|
+
-(scene.center_deprecated?.y ?? 0) + 1.5 * scene.size_deprecated.y,
|
|
13
|
+
-(scene.center_deprecated?.z ?? 0),
|
|
14
|
+
], intensity: intensity }), _jsx("directionalLight", { position: [
|
|
15
|
+
-(scene.center_deprecated?.x ?? 0),
|
|
16
|
+
-(scene.center_deprecated?.y ?? 0) + 1 * scene.size_deprecated.y,
|
|
17
|
+
-(scene.center_deprecated?.z ?? 0) + 1.5 * scene.size_deprecated.z,
|
|
18
|
+
], intensity: intensity }), _jsx("directionalLight", { position: [
|
|
19
|
+
-(scene.center_deprecated?.x ?? 0) + 2 * scene.size_deprecated.x,
|
|
20
|
+
-(scene.center_deprecated?.y ?? 0),
|
|
21
|
+
-(scene.center_deprecated?.z ?? 0) + 1.5 * scene.size_deprecated.z,
|
|
22
|
+
], intensity: intensity }), _jsx("directionalLight", { position: [
|
|
23
|
+
-(scene.center_deprecated?.x ?? 0) - 1.5 * scene.size_deprecated.x,
|
|
24
|
+
-(scene.center_deprecated?.y ?? 0),
|
|
25
|
+
-(scene.center_deprecated?.z ?? 0),
|
|
26
|
+
], intensity: 0.4 }), _jsx("directionalLight", { position: [
|
|
27
|
+
-(scene.center_deprecated?.x ?? 0) + 1.5 * scene.size_deprecated.x,
|
|
28
|
+
-(scene.center_deprecated?.y ?? 0),
|
|
29
|
+
-(scene.center_deprecated?.z ?? 0),
|
|
30
|
+
], intensity: 0.4 }), _jsx(ReactScene, { scene: scene, selectedIds: selectedIds, activeHotSpots: activeHotSpots, activeComponents: activeComponents, showDimensions: showDimensions, showHotSpotTexts: showHotSpotTexts, hoveredIdExternal: hoveredIdExternal, hotSpotTexts: hotSpotTexts, reactPopovers: reactPopovers, materialStateImages: materialStateImages, onClickGroup: onClickGroup, onHoverGroup: onHoverGroup, onContextMenuGroup: onContextMenuGroup, onClickHotSpot: onClickHotSpot, createGroupKey: createGroupKey, createGroupId: createGroupId, useAlphaTest: useAlphaTest }), !useOldMode && (_jsx(EffectComposer, { multisampling: 8, children: _jsx(N8AO, { aoRadius: 40, denoiseSamples: 4, distanceFalloff: 0.2, intensity: 2, screenSpaceRadius: true, halfRes: true }) }))] }) })) : (sceneFallback ?? _jsx(_Fragment, {}));
|
|
41
31
|
});
|
|
42
32
|
//# sourceMappingURL=react.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react.js","sourceRoot":"","sources":["../../../src/renderers/react/react.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,MAAM,EAAqC,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,IAAI,EAAkC,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAgB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,EAAE,WAAW,EAA0B,MAAM,mBAAmB,CAAC;AAiDxE,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,CACxB,CAAC,EACC,KAAK,EACL,WAAW,EACX,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,EACZ,QAAQ,EAAE,aAAa,EACvB,gBAAgB,GAAG,KAAK,EACxB,cAAc,GAAG,IAAI,EACrB,aAAa,GAAG,KAAK,EACrB,MAAM,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,EAChC,IAAI,GAAG,OAAO,EACd,cAAc,EACd,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,YAAY,GAAG,IAAI,EACnB,YAAY,EACZ,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,aAAa,GACF,EAAqB,EAAE;IAClC,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACvC,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,
|
|
1
|
+
{"version":3,"file":"react.js","sourceRoot":"","sources":["../../../src/renderers/react/react.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-box.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-box.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"step-box.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-box.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,QAAQ,EACR,IAAI,EAUL,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAoBL,WAAW,EAiBZ,MAAM,qBAAqB,CAAC;AAE7B,wBAAgB,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,GAAG,IAAI,CA2GrG"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { vec3Scale, vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3Normalize, vec3Sub, vec3Add, } from "../../../abstract-3d.js";
|
|
1
|
+
import { vec3Scale, vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3Normalize, vec3Sub, vec3Add, vec3Rot, } from "../../../abstract-3d.js";
|
|
3
2
|
import { parseRgb } from "../../../utils.js";
|
|
4
3
|
import { ADVANCED_BREP_SHAPE_REPRESENTATION, ADVANCED_FACE, APPLICATION_CONTEXT, AXIS2_PLACEMENT_3D, CARTESIAN_POINT, CLOSED_SHELL, COLOUR_RGB, CURVE_STYLE, DIRECTION, DRAUGHTING_PRE_DEFINED_CURVE_FONT, EDGE_CURVE, EDGE_LOOP, FACE_BOUND, FILL_AREA_STYLE, FILL_AREA_STYLE_COLOUR, LINE, MANIFOLD_SOLID_BREP, MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION, ORIENTED_EDGE, PLANE, PRESENTATION_STYLE_ASSIGNMENT, PRODUCT, PRODUCT_CONTEXT, PRODUCT_DEFINITION, PRODUCT_DEFINITION_CONTEXT, PRODUCT_DEFINITION_FORMATION, PRODUCT_DEFINITION_SHAPE, SHAPE_DEFINITION_REPRESENTATION, STYLED_ITEM, SURFACE_SIDE_STYLE, SURFACE_STYLE_FILL_AREA, SURFACE_STYLE_USAGE, VECTOR, VERTEX_POINT, } from "../step-encoding.js";
|
|
5
4
|
export function stepBox(b, mat, parentPos, parentRot, m) {
|
|
@@ -8,10 +7,7 @@ export function stepBox(b, mat, parentPos, parentRot, m) {
|
|
|
8
7
|
const pos = vec3TransRot(b.pos, parentPos, parentRot);
|
|
9
8
|
const rotation = vec3RotCombine(parentRot, b.rot ?? vec3Zero);
|
|
10
9
|
const color = parseRgb(mat.normal);
|
|
11
|
-
const
|
|
12
|
-
const euler = new Euler();
|
|
13
|
-
euler.set(rotation.x, rotation.y, rotation.z);
|
|
14
|
-
rotationMatrix.makeRotationFromEuler(euler);
|
|
10
|
+
const rotate = (v) => vec3Rot(v, vec3Zero, rotation);
|
|
15
11
|
const corners = [
|
|
16
12
|
vec3(0, 0, 0),
|
|
17
13
|
vec3(0, 0, size.z),
|
|
@@ -21,20 +17,7 @@ export function stepBox(b, mat, parentPos, parentRot, m) {
|
|
|
21
17
|
vec3(size.x, 0, size.z),
|
|
22
18
|
vec3(size.x, size.y, 0),
|
|
23
19
|
vec3(size.x, size.y, size.z),
|
|
24
|
-
].map((v) =>
|
|
25
|
-
const localCorner = vec3Sub(v, half);
|
|
26
|
-
const vec = new Vector3();
|
|
27
|
-
vec.set(localCorner.x, localCorner.y, localCorner.z);
|
|
28
|
-
vec.applyMatrix4(rotationMatrix);
|
|
29
|
-
const corner = vec3Add(vec3(vec.x, vec.y, vec.z), pos);
|
|
30
|
-
return corner;
|
|
31
|
-
});
|
|
32
|
-
const rotate = (original) => {
|
|
33
|
-
const vec = new Vector3();
|
|
34
|
-
vec.set(original.x, original.y, original.z);
|
|
35
|
-
vec.applyMatrix4(rotationMatrix);
|
|
36
|
-
return vec3(vec.x, vec.y, vec.z);
|
|
37
|
-
};
|
|
20
|
+
].map((v) => vec3Add(rotate(vec3Sub(v, half)), pos));
|
|
38
21
|
const normFrontGlobal = vec3(0, 0, 1);
|
|
39
22
|
const normRightGlobal = vec3(1, 0, 0);
|
|
40
23
|
const normFront = rotate(normFrontGlobal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-box.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-box.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"step-box.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-box.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-cylinder.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"step-cylinder.d.ts","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,IAAI,EAKJ,QAAQ,EAGT,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAqBL,WAAW,EAiBZ,MAAM,qBAAqB,CAAC;AAI7B,wBAAgB,YAAY,CAC1B,CAAC,EAAE,QAAQ,EACX,GAAG,EAAE,QAAQ,EACb,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,EACf,CAAC,EAAE,WAAW,EACd,MAAM,CAAC,EAAE,MAAM,GACd,IAAI,CA6JN"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3Add, } from "../../../abstract-3d.js";
|
|
1
|
+
import { vec3TransRot, vec3RotCombine, vec3Zero, vec3, vec3Add, vec3Rot, } from "../../../abstract-3d.js";
|
|
3
2
|
import { parseRgb } from "../../../utils.js";
|
|
4
3
|
import { ADVANCED_BREP_SHAPE_REPRESENTATION, ADVANCED_FACE, APPLICATION_CONTEXT, APPLICATION_PROTOCOL_DEFINITION, AXIS2_PLACEMENT_3D, CARTESIAN_POINT, CIRCLE, CLOSED_SHELL, COLOUR_RGB, CURVE_STYLE, CYLINDRICAL_SURFACE, DIRECTION, DRAUGHTING_PRE_DEFINED_CURVE_FONT, EDGE_CURVE, EDGE_LOOP, FACE_BOUND, FILL_AREA_STYLE_COLOUR, LINE, MANIFOLD_SOLID_BREP, MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION, ORIENTED_EDGE, PLANE, PRESENTATION_STYLE_ASSIGNMENT, PRODUCT, PRODUCT_CONTEXT, PRODUCT_DEFINITION, PRODUCT_DEFINITION_CONTEXT, PRODUCT_DEFINITION_FORMATION, PRODUCT_DEFINITION_SHAPE, SHAPE_DEFINITION_REPRESENTATION, STYLED_ITEM, SURFACE_SIDE_STYLE, SURFACE_STYLE_FILL_AREA, SURFACE_STYLE_USAGE, VECTOR, VERTEX_POINT, } from "../step-encoding.js";
|
|
5
4
|
const SMALLEST_RADIUS = 1e-4;
|
|
@@ -9,28 +8,13 @@ export function stepCylinder(c, mat, parentPos, parentRot, m, rSmall) {
|
|
|
9
8
|
const h = c.length;
|
|
10
9
|
const pos = vec3TransRot(c.pos, parentPos, parentRot);
|
|
11
10
|
const rotation = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
downNormal.set(0, -1, 0);
|
|
20
|
-
upNormal.applyMatrix4(rotationMatrix);
|
|
21
|
-
downNormal.applyMatrix4(rotationMatrix);
|
|
22
|
-
const circleTop = new Vector3();
|
|
23
|
-
circleTop.set(0, h / 2, 0);
|
|
24
|
-
circleTop.applyMatrix4(rotationMatrix);
|
|
25
|
-
const circleBot = new Vector3();
|
|
26
|
-
circleBot.set(0, -h / 2, 0);
|
|
27
|
-
circleBot.applyMatrix4(rotationMatrix);
|
|
28
|
-
const v1 = new Vector3();
|
|
29
|
-
const v2 = new Vector3();
|
|
30
|
-
v1.set(r2, h / 2, 0);
|
|
31
|
-
v2.set(r, -h / 2, 0);
|
|
32
|
-
v1.applyMatrix4(rotationMatrix);
|
|
33
|
-
v2.applyMatrix4(rotationMatrix);
|
|
11
|
+
const rot = (v) => vec3Rot(v, vec3Zero, rotation);
|
|
12
|
+
const upNormal = rot(vec3(0, 1, 0));
|
|
13
|
+
const downNormal = rot(vec3(0, -1, 0));
|
|
14
|
+
const circleTop = rot(vec3(0, h / 2, 0));
|
|
15
|
+
const circleBot = rot(vec3(0, -h / 2, 0));
|
|
16
|
+
const v1 = rot(vec3(r2, h / 2, 0));
|
|
17
|
+
const v2 = rot(vec3(r, -h / 2, 0));
|
|
34
18
|
const applicationContext = APPLICATION_CONTEXT(m);
|
|
35
19
|
APPLICATION_PROTOCOL_DEFINITION(applicationContext, m);
|
|
36
20
|
const ecurve0 = EDGE_CURVE(VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v2), m), m), VERTEX_POINT(CARTESIAN_POINT(vec3Add(pos, v1), m), m), LINE(CARTESIAN_POINT(vec3Add(pos, v2), m), VECTOR(DIRECTION(upNormal, m), m), m), m, "T");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"step-cylinder.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"step-cylinder.js","sourceRoot":"","sources":["../../../../src/renderers/step/step-geometries/step-cylinder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "abstract-3d",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.4",
|
|
4
4
|
"description": "Abstract 3D",
|
|
5
5
|
"author": "Divid AB <info@divid.se>",
|
|
6
6
|
"repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-3d",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@react-three/drei": "^10.7.6",
|
|
46
46
|
"@react-three/fiber": "^9.4.0",
|
|
47
47
|
"@react-three/postprocessing": "3.0.4",
|
|
48
|
-
"abstract-image": "^13.0.
|
|
48
|
+
"abstract-image": "^13.0.36",
|
|
49
49
|
"suspend-react": "^0.1.3",
|
|
50
50
|
"three": "^0.180.0",
|
|
51
51
|
"ts-exhaustive-check": "^1.0.0"
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"@types/three": "^0.180.0",
|
|
60
60
|
"react": "^19.0.0"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "3623aaced6027a67d5214ffba3792a66310a2c37"
|
|
63
63
|
}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
/* eslint-disable functional/no-class */
|
|
2
|
-
/* eslint-disable functional/no-this-expression */
|
|
3
|
-
/* eslint-disable functional/prefer-readonly-type */
|
|
4
1
|
import React from "react";
|
|
5
2
|
import { extend } from "@react-three/fiber";
|
|
6
3
|
import { Text, Line } from "@react-three/drei";
|
|
@@ -190,16 +187,18 @@ export function ReactMesh({
|
|
|
190
187
|
}
|
|
191
188
|
case "Image": {
|
|
192
189
|
const { pos, size, rot } = mesh.geometry;
|
|
193
|
-
return
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
190
|
+
return (
|
|
191
|
+
<mesh
|
|
192
|
+
geometry={planeGeometry}
|
|
193
|
+
scale={[size.x, size.y, 1]}
|
|
194
|
+
position={[pos.x, pos.y, pos.z]}
|
|
195
|
+
rotation={[rot?.x ?? 0, rot?.y ?? 0, rot?.z ?? 0]}
|
|
196
|
+
castShadow
|
|
197
|
+
receiveShadow
|
|
198
|
+
>
|
|
199
|
+
{children}
|
|
200
|
+
</mesh>
|
|
201
|
+
);
|
|
203
202
|
}
|
|
204
203
|
case "Plane": {
|
|
205
204
|
const { pos, size, rot, holes } = mesh.geometry;
|
|
@@ -504,7 +503,7 @@ class CircleCurve extends Curve<Vector3> {
|
|
|
504
503
|
this.angleLength = circleCurve.angleLength;
|
|
505
504
|
}
|
|
506
505
|
|
|
507
|
-
getPoint(t: number, optionalTarget = new Vector3()): Vector3 {
|
|
506
|
+
override getPoint(t: number, optionalTarget = new Vector3()): Vector3 {
|
|
508
507
|
return optionalTarget.set(
|
|
509
508
|
-this.radius * Math.sin(this.startAngle + this.angleLength * t),
|
|
510
509
|
-this.radius * Math.cos(this.startAngle + this.angleLength * t),
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Euler, Matrix4, Vector3 } from "three";
|
|
2
1
|
import {
|
|
3
2
|
Box,
|
|
4
3
|
Material,
|
|
@@ -11,6 +10,7 @@ import {
|
|
|
11
10
|
vec3Normalize,
|
|
12
11
|
vec3Sub,
|
|
13
12
|
vec3Add,
|
|
13
|
+
vec3Rot,
|
|
14
14
|
} from "../../../abstract-3d.js";
|
|
15
15
|
import { parseRgb } from "../../../utils.js";
|
|
16
16
|
import {
|
|
@@ -58,10 +58,7 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
|
|
|
58
58
|
const pos = vec3TransRot(b.pos, parentPos, parentRot);
|
|
59
59
|
const rotation = vec3RotCombine(parentRot, b.rot ?? vec3Zero);
|
|
60
60
|
const color = parseRgb(mat.normal);
|
|
61
|
-
const
|
|
62
|
-
const euler = new Euler();
|
|
63
|
-
euler.set(rotation.x, rotation.y, rotation.z);
|
|
64
|
-
rotationMatrix.makeRotationFromEuler(euler);
|
|
61
|
+
const rotate = (v: Vec3): Vec3 => vec3Rot(v, vec3Zero, rotation);
|
|
65
62
|
|
|
66
63
|
const corners = [
|
|
67
64
|
vec3(0, 0, 0),
|
|
@@ -72,21 +69,7 @@ export function stepBox(b: Box, mat: Material, parentPos: Vec3, parentRot: Vec3,
|
|
|
72
69
|
vec3(size.x, 0, size.z),
|
|
73
70
|
vec3(size.x, size.y, 0),
|
|
74
71
|
vec3(size.x, size.y, size.z),
|
|
75
|
-
].map((v) =>
|
|
76
|
-
const localCorner = vec3Sub(v, half);
|
|
77
|
-
const vec = new Vector3();
|
|
78
|
-
vec.set(localCorner.x, localCorner.y, localCorner.z);
|
|
79
|
-
vec.applyMatrix4(rotationMatrix);
|
|
80
|
-
const corner = vec3Add(vec3(vec.x, vec.y, vec.z), pos);
|
|
81
|
-
return corner;
|
|
82
|
-
});
|
|
83
|
-
|
|
84
|
-
const rotate = (original: Vec3): Vec3 => {
|
|
85
|
-
const vec = new Vector3();
|
|
86
|
-
vec.set(original.x, original.y, original.z);
|
|
87
|
-
vec.applyMatrix4(rotationMatrix);
|
|
88
|
-
return vec3(vec.x, vec.y, vec.z);
|
|
89
|
-
};
|
|
72
|
+
].map((v) => vec3Add(rotate(vec3Sub(v, half)), pos));
|
|
90
73
|
|
|
91
74
|
const normFrontGlobal = vec3(0, 0, 1);
|
|
92
75
|
const normRightGlobal = vec3(1, 0, 0);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Euler, Matrix4, Vector3 } from "three";
|
|
2
1
|
import {
|
|
3
2
|
Material,
|
|
4
3
|
Vec3,
|
|
@@ -8,6 +7,7 @@ import {
|
|
|
8
7
|
vec3,
|
|
9
8
|
Cylinder,
|
|
10
9
|
vec3Add,
|
|
10
|
+
vec3Rot,
|
|
11
11
|
} from "../../../abstract-3d.js";
|
|
12
12
|
import { parseRgb } from "../../../utils.js";
|
|
13
13
|
import {
|
|
@@ -66,33 +66,13 @@ export function stepCylinder(
|
|
|
66
66
|
const pos = vec3TransRot(c.pos, parentPos, parentRot);
|
|
67
67
|
const rotation = vec3RotCombine(parentRot, c.rot ?? vec3Zero);
|
|
68
68
|
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
const
|
|
75
|
-
const
|
|
76
|
-
upNormal.set(0, 1, 0);
|
|
77
|
-
downNormal.set(0, -1, 0);
|
|
78
|
-
|
|
79
|
-
upNormal.applyMatrix4(rotationMatrix);
|
|
80
|
-
downNormal.applyMatrix4(rotationMatrix);
|
|
81
|
-
|
|
82
|
-
const circleTop = new Vector3();
|
|
83
|
-
circleTop.set(0, h / 2, 0);
|
|
84
|
-
circleTop.applyMatrix4(rotationMatrix);
|
|
85
|
-
|
|
86
|
-
const circleBot = new Vector3();
|
|
87
|
-
circleBot.set(0, -h / 2, 0);
|
|
88
|
-
circleBot.applyMatrix4(rotationMatrix);
|
|
89
|
-
|
|
90
|
-
const v1 = new Vector3();
|
|
91
|
-
const v2 = new Vector3();
|
|
92
|
-
v1.set(r2, h / 2, 0);
|
|
93
|
-
v2.set(r, -h / 2, 0);
|
|
94
|
-
v1.applyMatrix4(rotationMatrix);
|
|
95
|
-
v2.applyMatrix4(rotationMatrix);
|
|
69
|
+
const rot = (v: Vec3): Vec3 => vec3Rot(v, vec3Zero, rotation);
|
|
70
|
+
const upNormal = rot(vec3(0, 1, 0));
|
|
71
|
+
const downNormal = rot(vec3(0, -1, 0));
|
|
72
|
+
const circleTop = rot(vec3(0, h / 2, 0));
|
|
73
|
+
const circleBot = rot(vec3(0, -h / 2, 0));
|
|
74
|
+
const v1 = rot(vec3(r2, h / 2, 0));
|
|
75
|
+
const v2 = rot(vec3(r, -h / 2, 0));
|
|
96
76
|
|
|
97
77
|
const applicationContext = APPLICATION_CONTEXT(m);
|
|
98
78
|
APPLICATION_PROTOCOL_DEFINITION(applicationContext, m);
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
export declare function parseRgb(color: string): {
|
|
2
|
-
readonly r: number;
|
|
3
|
-
readonly g: number;
|
|
4
|
-
readonly b: number;
|
|
5
|
-
};
|
|
6
|
-
export declare function parseColorString(s: string): {
|
|
7
|
-
readonly r: number;
|
|
8
|
-
readonly g: number;
|
|
9
|
-
readonly b: number;
|
|
10
|
-
};
|
|
11
|
-
export declare function rgbGrayScale(color: string): string;
|
|
12
|
-
/**
|
|
13
|
-
* This will take a HEX or RGB web color. pSBC can shade it darker or lighter,
|
|
14
|
-
* or blend it with a second color, and can also pass it right thru but convert
|
|
15
|
-
* from Hex to RGB (Hex2RGB) or RGB to Hex (RGB2Hex).
|
|
16
|
-
* All without you even knowing what color format you are using.
|
|
17
|
-
*
|
|
18
|
-
* @param {number} p - From 0 to 1 Percentage float (Required).
|
|
19
|
-
* @param {string} from - The starting color in HEX or RGB format.
|
|
20
|
-
* @param {string} [to] - The ending color in HEX or RGB format, optional.
|
|
21
|
-
* @returns {string|null} Either Hex or RGB color. Null if invalid color or percentage number.
|
|
22
|
-
*/
|
|
23
|
-
export declare function shade(p: number, from: string, to?: string): string | undefined;
|
|
24
|
-
export type Optional<T> = {
|
|
25
|
-
readonly [K in keyof T]?: T[K];
|
|
26
|
-
};
|
|
27
|
-
//# sourceMappingURL=shared.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/renderers/shared.ts"],"names":[],"mappings":"AAEA,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAItG;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAuB1G;AAKD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIlD;AAED;;;;;;;;;;GAUG;AAEH,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA8F9E;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;IAAE,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC"}
|