abstract-3d 0.1.13 → 0.1.14
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/dxf/dxf.js +1 -1
- package/lib/renderers/dxf/dxf.js.map +1 -1
- package/lib/renderers/shared.d.ts +1 -1
- package/lib/renderers/shared.d.ts.map +1 -1
- package/lib/renderers/shared.js +2 -2
- package/lib/renderers/shared.js.map +1 -1
- package/lib/renderers/svg/svg.d.ts +2 -2
- package/lib/renderers/svg/svg.d.ts.map +1 -1
- package/lib/renderers/svg/svg.js +38 -15
- package/lib/renderers/svg/svg.js.map +1 -1
- package/package.json +2 -2
- package/src/renderers/dxf/dxf.ts +1 -1
- package/src/renderers/shared.ts +2 -7
- package/src/renderers/svg/svg.ts +32 -43
package/lib/renderers/dxf/dxf.js
CHANGED
|
@@ -36,7 +36,7 @@ const toDxf = (scene, view) => {
|
|
|
36
36
|
var _a, _b, _c;
|
|
37
37
|
const unitRot = A3D.vec3RotCombine((0, shared_1.rotationForCameraPos)(view), (_a = scene.rotation_deprecated) !== null && _a !== void 0 ? _a : A3D.vec3Zero);
|
|
38
38
|
const rotatedCenter = A3D.vec3Rot((_b = scene.center_deprecated) !== null && _b !== void 0 ? _b : A3D.vec3Zero, A3D.vec3Zero, (_c = scene.rotation_deprecated) !== null && _c !== void 0 ? _c : A3D.vec3Zero);
|
|
39
|
-
const [size, center] = (0, shared_1.sizeCenterForCameraPos)(scene.size_deprecated, rotatedCenter, A3D.vec3Zero
|
|
39
|
+
const [size, center] = (0, shared_1.sizeCenterForCameraPos)(scene.size_deprecated, rotatedCenter, A3D.vec3Zero);
|
|
40
40
|
return (0, dxf_encoding_1.dxfHeader)(size, center) + scene.groups.reduce((a, c) => a + dxfGroup(c, center, unitRot), "") + dxf_encoding_1.dxfFooter;
|
|
41
41
|
};
|
|
42
42
|
exports.toDxf = toDxf;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dxf.js","sourceRoot":"","sources":["../../../src/renderers/dxf/dxf.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,iDAAsD;AACtD,0DAAsD;AACtD,sDAAkD;AAClD,gEAA4D;AAC5D,wDAAoD;AACpD,8DAA0D;AAC1D,sCAAyE;AAElE,MAAM,KAAK,GAAG,CAAC,KAAgB,EAAE,IAAc,EAAU,EAAE;;IAChE,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,CAAC,IAAA,6BAAoB,EAAC,IAAI,CAAC,EAAE,MAAA,KAAK,CAAC,mBAAmB,mCAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC1G,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAC/B,MAAA,KAAK,CAAC,iBAAiB,mCAAI,GAAG,CAAC,QAAQ,EACvC,GAAG,CAAC,QAAQ,EACZ,MAAA,KAAK,CAAC,mBAAmB,mCAAI,GAAG,CAAC,QAAQ,CAC1C,CAAC;IACF,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,IAAA,+BAAsB,EAAC,KAAK,CAAC,eAAe,EAAE,aAAa,EAAE,GAAG,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"dxf.js","sourceRoot":"","sources":["../../../src/renderers/dxf/dxf.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Vec3, View } from "../abstract-3d";
|
|
2
|
-
export declare function sizeCenterForCameraPos(size: Vec3, center: Vec3, rotation: Vec3
|
|
2
|
+
export declare function sizeCenterForCameraPos(size: Vec3, center: Vec3, rotation: Vec3): readonly [Vec3, Vec3];
|
|
3
3
|
export declare function rotationForCameraPos(view: View): Vec3;
|
|
4
4
|
export declare function rgbGray(color: string): string;
|
|
5
5
|
//# sourceMappingURL=shared.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/renderers/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,IAAI,EASL,MAAM,gBAAgB,CAAC;AAExB,wBAAgB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/renderers/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,IAAI,EASL,MAAM,gBAAgB,CAAC;AAExB,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CActG;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAgBrD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAI7C"}
|
package/lib/renderers/shared.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.rgbGray = exports.rotationForCameraPos = exports.sizeCenterForCameraPos = void 0;
|
|
4
4
|
const abstract_3d_1 = require("../abstract-3d");
|
|
5
|
-
function sizeCenterForCameraPos(size, center, rotation
|
|
5
|
+
function sizeCenterForCameraPos(size, center, rotation) {
|
|
6
6
|
const half = (0, abstract_3d_1.vec3Scale)(size, 0.5);
|
|
7
7
|
const min = (0, abstract_3d_1.vec3Sub)(center, half);
|
|
8
8
|
const max = (0, abstract_3d_1.vec3Add)(center, half);
|
|
@@ -15,7 +15,7 @@ function sizeCenterForCameraPos(size, center, rotation, factor) {
|
|
|
15
15
|
const v7 = (0, abstract_3d_1.vec3Rot)((0, abstract_3d_1.vec3)(max.x, max.y, min.z), center, rotation);
|
|
16
16
|
const v8 = (0, abstract_3d_1.vec3Rot)((0, abstract_3d_1.vec3)(min.x, max.y, min.z), center, rotation);
|
|
17
17
|
const bounds = (0, abstract_3d_1.bounds3FromVec3Array)([v1, v2, v3, v4, v5, v6, v7, v8]);
|
|
18
|
-
return [(0, abstract_3d_1.
|
|
18
|
+
return [(0, abstract_3d_1.bounds3ToSize)(bounds), center];
|
|
19
19
|
}
|
|
20
20
|
exports.sizeCenterForCameraPos = sizeCenterForCameraPos;
|
|
21
21
|
function rotationForCameraPos(view) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/renderers/shared.ts"],"names":[],"mappings":";;;AAAA,gDAWwB;AAExB,SAAgB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/renderers/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
export declare function toSvg(scene: Scene, view: View, stroke: number, scale?: {
|
|
1
|
+
import * as A3D from "../../abstract-3d";
|
|
2
|
+
export declare function toSvg(scene: A3D.Scene, view: A3D.View, stroke: number, scale?: {
|
|
3
3
|
readonly size: number;
|
|
4
4
|
readonly scaleByWidth: boolean;
|
|
5
5
|
}, onlyStroke?: boolean, grayScale?: boolean, onlyStrokeFill?: string, font?: string, buffers?: Record<string, string>): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,mBAAmB,CAAC;AAazC,wBAAgB,KAAK,CACnB,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;CAAE,EACjE,UAAU,CAAC,EAAE,OAAO,EACpB,SAAS,CAAC,EAAE,OAAO,EACnB,cAAc,GAAE,MAA8B,EAC9C,IAAI,GAAE,MAAW,EACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CA2E7E"}
|
package/lib/renderers/svg/svg.js
CHANGED
|
@@ -1,8 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
26
|
exports.toSvg = void 0;
|
|
4
27
|
const ts_exhaustive_check_1 = require("ts-exhaustive-check");
|
|
5
|
-
const
|
|
28
|
+
const A3D = __importStar(require("../../abstract-3d"));
|
|
6
29
|
const svg_box_1 = require("./svg-geometries/svg-box");
|
|
7
30
|
const svg_cylinder_1 = require("./svg-geometries/svg-cylinder");
|
|
8
31
|
const svg_line_1 = require("./svg-geometries/svg-line");
|
|
@@ -25,24 +48,24 @@ function toSvg(scene, view, stroke, scale, onlyStroke, grayScale, onlyStrokeFill
|
|
|
25
48
|
? scene.size_deprecated.z
|
|
26
49
|
: scene.size_deprecated.y)
|
|
27
50
|
: 1;
|
|
28
|
-
const unitRot =
|
|
29
|
-
const unitPos =
|
|
30
|
-
const [size, center] = (0, shared_1.sizeCenterForCameraPos)(scene.size_deprecated, unitPos, unitRot
|
|
31
|
-
const
|
|
32
|
-
const centerAdj =
|
|
33
|
-
const width =
|
|
34
|
-
const height =
|
|
51
|
+
const unitRot = A3D.vec3RotCombine((0, shared_1.rotationForCameraPos)(view), (_a = scene.rotation_deprecated) !== null && _a !== void 0 ? _a : A3D.vec3Zero);
|
|
52
|
+
const unitPos = A3D.vec3Rot((_b = scene.center_deprecated) !== null && _b !== void 0 ? _b : A3D.vec3Zero, A3D.vec3Zero, (_c = scene.rotation_deprecated) !== null && _c !== void 0 ? _c : A3D.vec3Zero);
|
|
53
|
+
const [size, center] = (0, shared_1.sizeCenterForCameraPos)(scene.size_deprecated, unitPos, unitRot);
|
|
54
|
+
const sizeScaled = A3D.vec3Scale(size, factor);
|
|
55
|
+
const centerAdj = A3D.vec3(-center.x + size.x * 0.5, center.y + size.y * 0.5, center.z);
|
|
56
|
+
const width = sizeScaled.x + 1.5 * stroke;
|
|
57
|
+
const height = sizeScaled.y + 1.5 * stroke;
|
|
35
58
|
const elements = Array();
|
|
36
|
-
const point = (x, y) =>
|
|
59
|
+
const point = (x, y) => A3D.vec2(x * factor - stroke * 0.75, -y * factor + stroke * 0.75);
|
|
37
60
|
for (const g of scene.groups) {
|
|
38
|
-
elements.push(...svgGroup(g,
|
|
61
|
+
elements.push(...svgGroup(g, centerAdj, unitRot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, buffers));
|
|
39
62
|
}
|
|
40
63
|
elements.sort((a, b) => a.zOrder - b.zOrder);
|
|
41
|
-
const cameraPos =
|
|
64
|
+
const cameraPos = A3D.vec3Rot(A3D.vec3(1, 1, 1), A3D.vec3Zero, (_d = scene.rotation_deprecated) !== null && _d !== void 0 ? _d : A3D.vec3Zero);
|
|
42
65
|
for (const d of (_f = (_e = scene.dimensions_deprecated) === null || _e === void 0 ? void 0 : _e.dimensions) !== null && _f !== void 0 ? _f : []) {
|
|
43
66
|
if (flipViews(d.views[0], cameraPos) === view) {
|
|
44
|
-
const pos =
|
|
45
|
-
const rot =
|
|
67
|
+
const pos = A3D.vec3Rot(d.pos, unitPos, unitRot);
|
|
68
|
+
const rot = A3D.vec3RotCombine(unitRot, d.rot);
|
|
46
69
|
for (const m of d.meshes) {
|
|
47
70
|
elements.push(...svgMesh(m, pos, rot, point, view, factor, (_h = (_g = scene.dimensions_deprecated) === null || _g === void 0 ? void 0 : _g.material.normal) !== null && _h !== void 0 ? _h : "", false, false, onlyStrokeFill, font, stroke));
|
|
48
71
|
}
|
|
@@ -55,8 +78,8 @@ exports.toSvg = toSvg;
|
|
|
55
78
|
function svgGroup(g, parentPos, parentRot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, buffers) {
|
|
56
79
|
var _a, _b, _c, _d, _e;
|
|
57
80
|
const elements = Array();
|
|
58
|
-
const pos =
|
|
59
|
-
const rot =
|
|
81
|
+
const pos = A3D.vec3TransRot(g.pos, parentPos, parentRot);
|
|
82
|
+
const rot = A3D.vec3RotCombine(parentRot, (_a = g.rot) !== null && _a !== void 0 ? _a : A3D.vec3Zero);
|
|
60
83
|
for (const m of (_b = g.meshes) !== null && _b !== void 0 ? _b : []) {
|
|
61
84
|
elements.push(...svgMesh(m, pos, rot, point, view, factor, m.material.normal, onlyStroke, grayScale, onlyStrokeFill, font, stroke, ((_c = m.material.image) === null || _c === void 0 ? void 0 : _c.type) === "HashImage" && (buffers === null || buffers === void 0 ? void 0 : buffers[m.material.image.hash])
|
|
62
85
|
? { type: "svg", svg: buffers[m.material.image.hash] }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "abstract-3d",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.14",
|
|
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",
|
|
@@ -27,5 +27,5 @@
|
|
|
27
27
|
"@types/react-reconciler": "^0.28.8",
|
|
28
28
|
"@types/three": "0.165.0"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "53648b5923334651f236a4427a610154a7ab11e5"
|
|
31
31
|
}
|
package/src/renderers/dxf/dxf.ts
CHANGED
|
@@ -14,7 +14,7 @@ export const toDxf = (scene: A3D.Scene, view: A3D.View): string => {
|
|
|
14
14
|
A3D.vec3Zero,
|
|
15
15
|
scene.rotation_deprecated ?? A3D.vec3Zero
|
|
16
16
|
);
|
|
17
|
-
const [size, center] = sizeCenterForCameraPos(scene.size_deprecated, rotatedCenter, A3D.vec3Zero
|
|
17
|
+
const [size, center] = sizeCenterForCameraPos(scene.size_deprecated, rotatedCenter, A3D.vec3Zero);
|
|
18
18
|
return dxfHeader(size, center) + scene.groups.reduce((a, c) => a + dxfGroup(c, center, unitRot), "") + dxfFooter;
|
|
19
19
|
};
|
|
20
20
|
|
package/src/renderers/shared.ts
CHANGED
|
@@ -11,12 +11,7 @@ import {
|
|
|
11
11
|
vec3Zero,
|
|
12
12
|
} from "../abstract-3d";
|
|
13
13
|
|
|
14
|
-
export function sizeCenterForCameraPos(
|
|
15
|
-
size: Vec3,
|
|
16
|
-
center: Vec3,
|
|
17
|
-
rotation: Vec3,
|
|
18
|
-
factor: number
|
|
19
|
-
): readonly [Vec3, Vec3] {
|
|
14
|
+
export function sizeCenterForCameraPos(size: Vec3, center: Vec3, rotation: Vec3): readonly [Vec3, Vec3] {
|
|
20
15
|
const half = vec3Scale(size, 0.5);
|
|
21
16
|
const min = vec3Sub(center, half);
|
|
22
17
|
const max = vec3Add(center, half);
|
|
@@ -29,7 +24,7 @@ export function sizeCenterForCameraPos(
|
|
|
29
24
|
const v7 = vec3Rot(vec3(max.x, max.y, min.z), center, rotation);
|
|
30
25
|
const v8 = vec3Rot(vec3(min.x, max.y, min.z), center, rotation);
|
|
31
26
|
const bounds = bounds3FromVec3Array([v1, v2, v3, v4, v5, v6, v7, v8]);
|
|
32
|
-
return [
|
|
27
|
+
return [bounds3ToSize(bounds), center];
|
|
33
28
|
}
|
|
34
29
|
|
|
35
30
|
export function rotationForCameraPos(view: View): Vec3 {
|
package/src/renderers/svg/svg.ts
CHANGED
|
@@ -1,19 +1,5 @@
|
|
|
1
1
|
import { exhaustiveCheck } from "ts-exhaustive-check";
|
|
2
|
-
import
|
|
3
|
-
vec2,
|
|
4
|
-
vec3Scale,
|
|
5
|
-
Scene,
|
|
6
|
-
View,
|
|
7
|
-
Vec3,
|
|
8
|
-
Mesh,
|
|
9
|
-
vec3Rot,
|
|
10
|
-
vec3Zero,
|
|
11
|
-
vec3RotCombine,
|
|
12
|
-
vec3,
|
|
13
|
-
Vec2,
|
|
14
|
-
Group,
|
|
15
|
-
vec3TransRot,
|
|
16
|
-
} from "../../abstract-3d";
|
|
2
|
+
import * as A3D from "../../abstract-3d";
|
|
17
3
|
import { zOrderElement } from "./svg-geometries/shared";
|
|
18
4
|
import { box } from "./svg-geometries/svg-box";
|
|
19
5
|
import { cylinder } from "./svg-geometries/svg-cylinder";
|
|
@@ -27,8 +13,8 @@ import { rotationForCameraPos, sizeCenterForCameraPos } from "../shared";
|
|
|
27
13
|
import { EmbededImage, svg } from "./svg-encoding";
|
|
28
14
|
|
|
29
15
|
export function toSvg(
|
|
30
|
-
scene: Scene,
|
|
31
|
-
view: View,
|
|
16
|
+
scene: A3D.Scene,
|
|
17
|
+
view: A3D.View,
|
|
32
18
|
stroke: number,
|
|
33
19
|
scale?: { readonly size: number; readonly scaleByWidth: boolean },
|
|
34
20
|
onlyStroke?: boolean,
|
|
@@ -47,21 +33,24 @@ export function toSvg(
|
|
|
47
33
|
? scene.size_deprecated.z
|
|
48
34
|
: scene.size_deprecated.y)
|
|
49
35
|
: 1;
|
|
50
|
-
const unitRot = vec3RotCombine(rotationForCameraPos(view), scene.rotation_deprecated ?? vec3Zero);
|
|
51
|
-
const unitPos = vec3Rot(
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
const
|
|
36
|
+
const unitRot = A3D.vec3RotCombine(rotationForCameraPos(view), scene.rotation_deprecated ?? A3D.vec3Zero);
|
|
37
|
+
const unitPos = A3D.vec3Rot(
|
|
38
|
+
scene.center_deprecated ?? A3D.vec3Zero,
|
|
39
|
+
A3D.vec3Zero,
|
|
40
|
+
scene.rotation_deprecated ?? A3D.vec3Zero
|
|
41
|
+
);
|
|
42
|
+
const [size, center] = sizeCenterForCameraPos(scene.size_deprecated, unitPos, unitRot);
|
|
43
|
+
const sizeScaled = A3D.vec3Scale(size, factor);
|
|
44
|
+
const centerAdj = A3D.vec3(-center.x + size.x * 0.5, center.y + size.y * 0.5, center.z);
|
|
45
|
+
const width = sizeScaled.x + 1.5 * stroke;
|
|
46
|
+
const height = sizeScaled.y + 1.5 * stroke;
|
|
57
47
|
const elements = Array<zOrderElement>();
|
|
58
|
-
const point = (x: number, y: number): Vec2 =>
|
|
59
|
-
vec2(-centerAdj.x + unitHalfSize.x + x * factor, centerAdj.y + unitHalfSize.y - y * factor);
|
|
48
|
+
const point = (x: number, y: number): A3D.Vec2 => A3D.vec2(x * factor - stroke * 0.75, -y * factor + stroke * 0.75);
|
|
60
49
|
for (const g of scene.groups) {
|
|
61
50
|
elements.push(
|
|
62
51
|
...svgGroup(
|
|
63
52
|
g,
|
|
64
|
-
|
|
53
|
+
centerAdj,
|
|
65
54
|
unitRot,
|
|
66
55
|
point,
|
|
67
56
|
view,
|
|
@@ -76,11 +65,11 @@ export function toSvg(
|
|
|
76
65
|
);
|
|
77
66
|
}
|
|
78
67
|
elements.sort((a, b) => a.zOrder - b.zOrder);
|
|
79
|
-
const cameraPos = vec3Rot(vec3(1, 1, 1), vec3Zero, scene.rotation_deprecated ?? vec3Zero);
|
|
68
|
+
const cameraPos = A3D.vec3Rot(A3D.vec3(1, 1, 1), A3D.vec3Zero, scene.rotation_deprecated ?? A3D.vec3Zero);
|
|
80
69
|
for (const d of scene.dimensions_deprecated?.dimensions ?? []) {
|
|
81
70
|
if (flipViews(d.views[0], cameraPos) === view) {
|
|
82
|
-
const pos = vec3Rot(d.pos, unitPos, unitRot);
|
|
83
|
-
const rot = vec3RotCombine(unitRot, d.rot);
|
|
71
|
+
const pos = A3D.vec3Rot(d.pos, unitPos, unitRot);
|
|
72
|
+
const rot = A3D.vec3RotCombine(unitRot, d.rot);
|
|
84
73
|
for (const m of d.meshes) {
|
|
85
74
|
elements.push(
|
|
86
75
|
...svgMesh(
|
|
@@ -111,11 +100,11 @@ export function toSvg(
|
|
|
111
100
|
}
|
|
112
101
|
|
|
113
102
|
function svgGroup(
|
|
114
|
-
g: Group,
|
|
115
|
-
parentPos: Vec3,
|
|
116
|
-
parentRot: Vec3,
|
|
117
|
-
point: (x: number, y: number) => Vec2,
|
|
118
|
-
view: View,
|
|
103
|
+
g: A3D.Group,
|
|
104
|
+
parentPos: A3D.Vec3,
|
|
105
|
+
parentRot: A3D.Vec3,
|
|
106
|
+
point: (x: number, y: number) => A3D.Vec2,
|
|
107
|
+
view: A3D.View,
|
|
119
108
|
factor: number,
|
|
120
109
|
onlyStroke: boolean | undefined,
|
|
121
110
|
grayScale: boolean | undefined,
|
|
@@ -125,8 +114,8 @@ function svgGroup(
|
|
|
125
114
|
buffers?: Record<string, string>
|
|
126
115
|
): ReadonlyArray<zOrderElement> {
|
|
127
116
|
const elements = Array<zOrderElement>();
|
|
128
|
-
const pos = vec3TransRot(g.pos, parentPos, parentRot);
|
|
129
|
-
const rot = vec3RotCombine(parentRot, g.rot ?? vec3Zero);
|
|
117
|
+
const pos = A3D.vec3TransRot(g.pos, parentPos, parentRot);
|
|
118
|
+
const rot = A3D.vec3RotCombine(parentRot, g.rot ?? A3D.vec3Zero);
|
|
130
119
|
|
|
131
120
|
for (const m of g.meshes ?? []) {
|
|
132
121
|
elements.push(
|
|
@@ -160,11 +149,11 @@ function svgGroup(
|
|
|
160
149
|
}
|
|
161
150
|
|
|
162
151
|
function svgMesh(
|
|
163
|
-
mesh: Mesh,
|
|
164
|
-
parentPos: Vec3,
|
|
165
|
-
parentRot: Vec3,
|
|
166
|
-
point: (x: number, y: number) => Vec2,
|
|
167
|
-
view: View,
|
|
152
|
+
mesh: A3D.Mesh,
|
|
153
|
+
parentPos: A3D.Vec3,
|
|
154
|
+
parentRot: A3D.Vec3,
|
|
155
|
+
point: (x: number, y: number) => A3D.Vec2,
|
|
156
|
+
view: A3D.View,
|
|
168
157
|
factor: number,
|
|
169
158
|
color: string,
|
|
170
159
|
onlyStroke: boolean | undefined,
|
|
@@ -211,7 +200,7 @@ function svgMesh(
|
|
|
211
200
|
}
|
|
212
201
|
}
|
|
213
202
|
|
|
214
|
-
const flipViews = (v: View | undefined, pos: Vec3): View | undefined => {
|
|
203
|
+
const flipViews = (v: A3D.View | undefined, pos: A3D.Vec3): A3D.View | undefined => {
|
|
215
204
|
switch (v) {
|
|
216
205
|
case "front":
|
|
217
206
|
return pos.z < 0 ? "back" : "front";
|