abstract-3d 0.1.12 → 0.1.13
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/svg/svg-geometries/svg-plane.d.ts.map +1 -1
- package/lib/renderers/svg/svg-geometries/svg-plane.js +5 -5
- package/lib/renderers/svg/svg-geometries/svg-plane.js.map +1 -1
- package/lib/renderers/svg/svg.d.ts.map +1 -1
- package/lib/renderers/svg/svg.js +13 -15
- package/lib/renderers/svg/svg.js.map +1 -1
- package/package.json +2 -2
- package/src/renderers/svg/svg-geometries/svg-plane.ts +6 -5
- package/src/renderers/svg/svg.ts +19 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg-plane.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-plane.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAsB,aAAa,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAwB,MAAM,iBAAiB,CAAC;AAGrE,wBAAgB,KAAK,CACnB,CAAC,EAAE,GAAG,CAAC,KAAK,EACZ,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC,IAAI,EACzC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,GAAG,SAAS,EAC/B,SAAS,EAAE,OAAO,GAAG,SAAS,EAC9B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,GAAG,CAAC,IAAI,EACnB,SAAS,EAAE,GAAG,CAAC,IAAI,EACnB,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,GAC/B,aAAa,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"svg-plane.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-plane.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAsB,aAAa,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAwB,MAAM,iBAAiB,CAAC;AAGrE,wBAAgB,KAAK,CACnB,CAAC,EAAE,GAAG,CAAC,KAAK,EACZ,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC,IAAI,EACzC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,GAAG,SAAS,EAC/B,SAAS,EAAE,OAAO,GAAG,SAAS,EAC9B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,GAAG,CAAC,IAAI,EACnB,SAAS,EAAE,GAAG,CAAC,IAAI,EACnB,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,GAC/B,aAAa,CAAC,aAAa,CAAC,CA2B9B"}
|
|
@@ -33,11 +33,11 @@ function plane(p, point, color, onlyStroke, grayScale, stroke, onlyStrokeFill, p
|
|
|
33
33
|
const half = A3D.vec2Scale(p.size, 0.5);
|
|
34
34
|
const pos = A3D.vec3TransRot(p.pos, parentPos, parentRot);
|
|
35
35
|
const rot = A3D.vec3RotCombine(parentRot, (_a = p.rot) !== null && _a !== void 0 ? _a : A3D.vec3Zero);
|
|
36
|
-
const vec3tr = (
|
|
37
|
-
const v1 = vec3tr(
|
|
38
|
-
const v2 = vec3tr(
|
|
39
|
-
const v3 = vec3tr(
|
|
40
|
-
const v4 = vec3tr(
|
|
36
|
+
const vec3tr = (x, y) => A3D.vec3TransRot(A3D.vec3(x, y, 0), pos, rot);
|
|
37
|
+
const v1 = vec3tr(-half.x, -half.y);
|
|
38
|
+
const v2 = vec3tr(half.x, -half.y);
|
|
39
|
+
const v3 = vec3tr(half.x, half.y);
|
|
40
|
+
const v4 = vec3tr(-half.x, half.y);
|
|
41
41
|
if (view === "front" && image) {
|
|
42
42
|
const [leftX, rightX] = v4.x > v2.x ? [v2.x, v4.x] : [v4.x, v2.x];
|
|
43
43
|
const [bottomY, topY] = v4.y > v2.y ? [v4.y, v2.y] : [v2.y, v4.y];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg-plane.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-plane.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,qCAA6D;AAC7D,kDAAqE;AACrE,yCAAuC;AAEvC,SAAgB,KAAK,CACnB,CAAY,EACZ,KAAyC,EACzC,KAAa,EACb,UAA+B,EAC/B,SAA8B,EAC9B,MAAc,EACd,cAAsB,EACtB,SAAmB,EACnB,SAAmB,EACnB,IAAc,EACd,KAAgC;;IAEhC,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxC,MAAM,GAAG,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,GAAG,CAAC,cAAc,CAAC,SAAS,EAAE,MAAA,CAAC,CAAC,GAAG,mCAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"svg-plane.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-plane.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,EACL,IAAI,EAUL,MAAM,mBAAmB,CAAC;AAa3B,wBAAgB,KAAK,CACnB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,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,
|
|
1
|
+
{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,EACL,IAAI,EAUL,MAAM,mBAAmB,CAAC;AAa3B,wBAAgB,KAAK,CACnB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,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,CAwE7E"}
|
package/lib/renderers/svg/svg.js
CHANGED
|
@@ -14,7 +14,7 @@ const svg_cone_1 = require("./svg-geometries/svg-cone");
|
|
|
14
14
|
const shared_1 = require("../shared");
|
|
15
15
|
const svg_encoding_1 = require("./svg-encoding");
|
|
16
16
|
function toSvg(scene, view, stroke, scale, onlyStroke, grayScale, onlyStrokeFill = "rgba(255,255,255,0)", font = "", buffers) {
|
|
17
|
-
var _a, _b, _c, _d, _e, _f, _g, _h
|
|
17
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
18
18
|
const factor = scale
|
|
19
19
|
? scale.size /
|
|
20
20
|
(scale.scaleByWidth
|
|
@@ -35,18 +35,16 @@ function toSvg(scene, view, stroke, scale, onlyStroke, grayScale, onlyStrokeFill
|
|
|
35
35
|
const elements = Array();
|
|
36
36
|
const point = (x, y) => (0, abstract_3d_1.vec2)(-centerAdj.x + unitHalfSize.x + x * factor, centerAdj.y + unitHalfSize.y - y * factor);
|
|
37
37
|
for (const g of scene.groups) {
|
|
38
|
-
|
|
39
|
-
const rot = (0, abstract_3d_1.vec3RotCombine)(unitRot, (_d = g.rot) !== null && _d !== void 0 ? _d : abstract_3d_1.vec3Zero);
|
|
40
|
-
elements.push(...svgGroup(g, pos, rot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, buffers));
|
|
38
|
+
elements.push(...svgGroup(g, unitPos, unitRot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, buffers));
|
|
41
39
|
}
|
|
42
40
|
elements.sort((a, b) => a.zOrder - b.zOrder);
|
|
43
|
-
const cameraPos = (0, abstract_3d_1.vec3Rot)((0, abstract_3d_1.vec3)(1, 1, 1), abstract_3d_1.vec3Zero, (
|
|
44
|
-
for (const d of (
|
|
41
|
+
const cameraPos = (0, abstract_3d_1.vec3Rot)((0, abstract_3d_1.vec3)(1, 1, 1), abstract_3d_1.vec3Zero, (_d = scene.rotation_deprecated) !== null && _d !== void 0 ? _d : abstract_3d_1.vec3Zero);
|
|
42
|
+
for (const d of (_f = (_e = scene.dimensions_deprecated) === null || _e === void 0 ? void 0 : _e.dimensions) !== null && _f !== void 0 ? _f : []) {
|
|
45
43
|
if (flipViews(d.views[0], cameraPos) === view) {
|
|
46
44
|
const pos = (0, abstract_3d_1.vec3Rot)(d.pos, unitPos, unitRot);
|
|
47
45
|
const rot = (0, abstract_3d_1.vec3RotCombine)(unitRot, d.rot);
|
|
48
46
|
for (const m of d.meshes) {
|
|
49
|
-
elements.push(...svgMesh(m, pos, rot, point, view, factor, (
|
|
47
|
+
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));
|
|
50
48
|
}
|
|
51
49
|
}
|
|
52
50
|
}
|
|
@@ -54,20 +52,20 @@ function toSvg(scene, view, stroke, scale, onlyStroke, grayScale, onlyStrokeFill
|
|
|
54
52
|
return { image, width, height };
|
|
55
53
|
}
|
|
56
54
|
exports.toSvg = toSvg;
|
|
57
|
-
function svgGroup(g,
|
|
55
|
+
function svgGroup(g, parentPos, parentRot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, buffers) {
|
|
58
56
|
var _a, _b, _c, _d, _e;
|
|
59
57
|
const elements = Array();
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
const pos = (0, abstract_3d_1.vec3TransRot)(g.pos, parentPos, parentRot);
|
|
59
|
+
const rot = (0, abstract_3d_1.vec3RotCombine)(parentRot, (_a = g.rot) !== null && _a !== void 0 ? _a : abstract_3d_1.vec3Zero);
|
|
60
|
+
for (const m of (_b = g.meshes) !== null && _b !== void 0 ? _b : []) {
|
|
61
|
+
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
62
|
? { type: "svg", svg: buffers[m.material.image.hash] }
|
|
63
|
-
: ((
|
|
63
|
+
: ((_d = m.material.image) === null || _d === void 0 ? void 0 : _d.type) === "UrlImage"
|
|
64
64
|
? { type: "url", url: m.material.image.url }
|
|
65
65
|
: undefined));
|
|
66
66
|
}
|
|
67
|
-
for (const sg of (
|
|
68
|
-
|
|
69
|
-
const sRot = (0, abstract_3d_1.vec3RotCombine)(rot, (_e = sg.rot) !== null && _e !== void 0 ? _e : abstract_3d_1.vec3Zero);
|
|
70
|
-
elements.push(...svgGroup(sg, sPos, sRot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, buffers));
|
|
67
|
+
for (const sg of (_e = g.groups) !== null && _e !== void 0 ? _e : []) {
|
|
68
|
+
elements.push(...svgGroup(sg, pos, rot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, buffers));
|
|
71
69
|
}
|
|
72
70
|
return elements;
|
|
73
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/renderers/svg/svg.ts"],"names":[],"mappings":";;;AAAA,6DAAsD;AACtD,mDAc2B;AAE3B,sDAA+C;AAC/C,gEAAyD;AACzD,wDAAiD;AACjD,0DAAmD;AACnD,0DAAmD;AACnD,8DAAuD;AACvD,wDAAiD;AACjD,wDAAiD;AACjD,sCAAyE;AACzE,iDAAmD;AAEnD,SAAgB,KAAK,CACnB,KAAY,EACZ,IAAU,EACV,MAAc,EACd,KAAiE,EACjE,UAAoB,EACpB,SAAmB,EACnB,iBAAyB,qBAAqB,EAC9C,OAAe,EAAE,EACjB,OAAgC;;IAEhC,MAAM,MAAM,GAAG,KAAK;QAClB,CAAC,CAAC,KAAK,CAAC,IAAI;YACV,CAAC,KAAK,CAAC,YAAY;gBACjB,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,MAAM;oBACnC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;oBACzB,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC3B,CAAC,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,QAAQ;oBACrC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;oBACzB,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC,CAAC;IACN,MAAM,OAAO,GAAG,IAAA,4BAAc,EAAC,IAAA,6BAAoB,EAAC,IAAI,CAAC,EAAE,MAAA,KAAK,CAAC,mBAAmB,mCAAI,sBAAQ,CAAC,CAAC;IAClG,MAAM,OAAO,GAAG,IAAA,qBAAO,EAAC,MAAA,KAAK,CAAC,iBAAiB,mCAAI,sBAAQ,EAAE,sBAAQ,EAAE,MAAA,KAAK,CAAC,mBAAmB,mCAAI,sBAAQ,CAAC,CAAC;IAC9G,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,IAAA,+BAAsB,EAAC,KAAK,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/F,MAAM,YAAY,GAAG,IAAA,uBAAS,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,IAAA,kBAAI,EAAC,MAAM,CAAC,CAAC,GAAG,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IACrF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC;IACrC,MAAM,QAAQ,GAAG,KAAK,EAAiB,CAAC;IACxC,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,CAAS,EAAQ,EAAE,CAC3C,IAAA,kBAAI,EAAC,CAAC,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAC9F,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAC7B,
|
|
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.13",
|
|
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": "fb238e1c74e87aabd6d1826eadaba02717ee1911"
|
|
31
31
|
}
|
|
@@ -19,12 +19,12 @@ export function plane(
|
|
|
19
19
|
const half = A3D.vec2Scale(p.size, 0.5);
|
|
20
20
|
const pos = A3D.vec3TransRot(p.pos, parentPos, parentRot);
|
|
21
21
|
const rot = A3D.vec3RotCombine(parentRot, p.rot ?? A3D.vec3Zero);
|
|
22
|
-
const vec3tr = (
|
|
22
|
+
const vec3tr = (x: number, y: number): A3D.Vec3 => A3D.vec3TransRot(A3D.vec3(x, y, 0), pos, rot);
|
|
23
23
|
|
|
24
|
-
const v1 = vec3tr(
|
|
25
|
-
const v2 = vec3tr(
|
|
26
|
-
const v3 = vec3tr(
|
|
27
|
-
const v4 = vec3tr(
|
|
24
|
+
const v1 = vec3tr(-half.x, -half.y);
|
|
25
|
+
const v2 = vec3tr(half.x, -half.y);
|
|
26
|
+
const v3 = vec3tr(half.x, half.y);
|
|
27
|
+
const v4 = vec3tr(-half.x, half.y);
|
|
28
28
|
|
|
29
29
|
if (view === "front" && image) {
|
|
30
30
|
const [leftX, rightX] = v4.x > v2.x ? [v2.x, v4.x] : [v4.x, v2.x];
|
|
@@ -37,6 +37,7 @@ export function plane(
|
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
const points = [point(v1.x, v1.y), point(v2.x, v2.y), point(v3.x, v3.y), point(v4.x, v4.y)];
|
|
40
|
+
|
|
40
41
|
const [strokeColor, fill, strokeThickness] = onlyStroke
|
|
41
42
|
? [grayScale ? gray : color, onlyStrokeFill, stroke]
|
|
42
43
|
: [black, grayScale ? rgbGray(color) : color, 0];
|
package/src/renderers/svg/svg.ts
CHANGED
|
@@ -58,10 +58,21 @@ export function toSvg(
|
|
|
58
58
|
const point = (x: number, y: number): Vec2 =>
|
|
59
59
|
vec2(-centerAdj.x + unitHalfSize.x + x * factor, centerAdj.y + unitHalfSize.y - y * factor);
|
|
60
60
|
for (const g of scene.groups) {
|
|
61
|
-
const pos = vec3Rot(g.pos, unitPos, unitRot);
|
|
62
|
-
const rot = vec3RotCombine(unitRot, g.rot ?? vec3Zero);
|
|
63
61
|
elements.push(
|
|
64
|
-
...svgGroup(
|
|
62
|
+
...svgGroup(
|
|
63
|
+
g,
|
|
64
|
+
unitPos,
|
|
65
|
+
unitRot,
|
|
66
|
+
point,
|
|
67
|
+
view,
|
|
68
|
+
factor,
|
|
69
|
+
onlyStroke,
|
|
70
|
+
grayScale,
|
|
71
|
+
onlyStrokeFill,
|
|
72
|
+
font,
|
|
73
|
+
stroke,
|
|
74
|
+
buffers
|
|
75
|
+
)
|
|
65
76
|
);
|
|
66
77
|
}
|
|
67
78
|
elements.sort((a, b) => a.zOrder - b.zOrder);
|
|
@@ -101,8 +112,8 @@ export function toSvg(
|
|
|
101
112
|
|
|
102
113
|
function svgGroup(
|
|
103
114
|
g: Group,
|
|
104
|
-
|
|
105
|
-
|
|
115
|
+
parentPos: Vec3,
|
|
116
|
+
parentRot: Vec3,
|
|
106
117
|
point: (x: number, y: number) => Vec2,
|
|
107
118
|
view: View,
|
|
108
119
|
factor: number,
|
|
@@ -114,6 +125,8 @@ function svgGroup(
|
|
|
114
125
|
buffers?: Record<string, string>
|
|
115
126
|
): ReadonlyArray<zOrderElement> {
|
|
116
127
|
const elements = Array<zOrderElement>();
|
|
128
|
+
const pos = vec3TransRot(g.pos, parentPos, parentRot);
|
|
129
|
+
const rot = vec3RotCombine(parentRot, g.rot ?? vec3Zero);
|
|
117
130
|
|
|
118
131
|
for (const m of g.meshes ?? []) {
|
|
119
132
|
elements.push(
|
|
@@ -139,10 +152,8 @@ function svgGroup(
|
|
|
139
152
|
);
|
|
140
153
|
}
|
|
141
154
|
for (const sg of g.groups ?? []) {
|
|
142
|
-
const sPos = vec3TransRot(sg.pos, pos, rot);
|
|
143
|
-
const sRot = vec3RotCombine(rot, sg.rot ?? vec3Zero);
|
|
144
155
|
elements.push(
|
|
145
|
-
...svgGroup(sg,
|
|
156
|
+
...svgGroup(sg, pos, rot, point, view, factor, onlyStroke, grayScale, onlyStrokeFill, font, stroke, buffers)
|
|
146
157
|
);
|
|
147
158
|
}
|
|
148
159
|
return elements;
|