abstract-3d 2.6.6 → 2.6.8
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg-text.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"svg-text.d.ts","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAsD,MAAM,yBAAyB,CAAC;AAC/G,OAAO,EAAgB,UAAU,EAAS,aAAa,EAAE,MAAM,aAAa,CAAC;AAI7E,wBAAgB,IAAI,CAClB,CAAC,EAAE,IAAI,EACP,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,EACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,GACd,aAAa,CAAC,aAAa,CAAC,CAc9B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { vec3TransRot, vec3RotCombine, vec3Zero } from "../../../abstract-3d.js";
|
|
1
|
+
import { vec3TransRot, vec3RotCombine, vec3Zero, vec3 } from "../../../abstract-3d.js";
|
|
2
2
|
import { svgTrsMatrix, zElem } from "./shared.js";
|
|
3
3
|
import { svgText } from "../svg-encoding.js";
|
|
4
4
|
// dummy
|
|
@@ -10,10 +10,20 @@ export function text(t, point, fill, opts, parentPos, parentRot) {
|
|
|
10
10
|
const strings = t.text.split("\n");
|
|
11
11
|
let posY = strings.length === 1 ? 0 : (fontSize * strings.length - fontSize) / 2;
|
|
12
12
|
for (const s of strings) {
|
|
13
|
-
const matrix = svgTrsMatrix(point(pos.x, pos.y + posY), rot);
|
|
13
|
+
const matrix = svgTrsMatrix(point(pos.x, pos.y + posY), vec3RotCombine(rot, textViewRotation(opts.view)));
|
|
14
14
|
texts.push(zElem(svgText(s, matrix, fill, opts.font, fontSize), pos.z));
|
|
15
15
|
posY -= fontSize * 1.2;
|
|
16
16
|
}
|
|
17
17
|
return texts;
|
|
18
18
|
}
|
|
19
|
+
function textViewRotation(view) {
|
|
20
|
+
switch (view) {
|
|
21
|
+
case "top":
|
|
22
|
+
case "right":
|
|
23
|
+
case "back":
|
|
24
|
+
return vec3(0, Math.PI, 0);
|
|
25
|
+
default:
|
|
26
|
+
return vec3Zero;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
19
29
|
//# sourceMappingURL=svg-text.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg-text.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"svg-text.js","sourceRoot":"","sources":["../../../../src/renderers/svg/svg-geometries/svg-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAQ,MAAM,yBAAyB,CAAC;AAC/G,OAAO,EAAE,YAAY,EAAc,KAAK,EAAiB,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,QAAQ;AACR,MAAM,UAAU,IAAI,CAClB,CAAO,EACP,KAAqC,EACrC,IAAY,EACZ,IAAgB,EAChB,SAAe,EACf,SAAe;IAEf,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,KAAK,EAAiB,CAAC;IACrC,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;IAC5B,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IACjF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,cAAc,CAAC,GAAG,EAAE,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1G,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,IAAI,IAAI,QAAQ,GAAG,GAAG,CAAC;IACzB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU;IAClC,QAAO,IAAI,EAAE,CAAC;QACZ,KAAK,KAAK,CAAC;QACX,KAAK,OAAO,CAAC;QACb,KAAK,MAAM;YACT,OAAO,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC7B;YACE,OAAO,QAAQ,CAAC;IACpB,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "abstract-3d",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.8",
|
|
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",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@react-three/drei": "^10.7.7",
|
|
52
52
|
"@react-three/fiber": "^9.6.1",
|
|
53
53
|
"@react-three/postprocessing": "^3.0.4",
|
|
54
|
-
"abstract-image": "^13.0.
|
|
54
|
+
"abstract-image": "^13.0.52",
|
|
55
55
|
"suspend-react": "^0.1.3",
|
|
56
56
|
"three": "^0.184.0",
|
|
57
57
|
"ts-exhaustive-check": "^1.0.0"
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"@types/three": "^0.180.0",
|
|
66
66
|
"react": "^19.2.6"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "635ebc5544d18d8b26849bde82f89c26ad4c1548"
|
|
69
69
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Text, Vec2, Vec3, vec3TransRot, vec3RotCombine, vec3Zero } from "../../../abstract-3d.js";
|
|
1
|
+
import { Text, Vec2, Vec3, vec3TransRot, vec3RotCombine, vec3Zero, vec3, View } from "../../../abstract-3d.js";
|
|
2
2
|
import { svgTrsMatrix, SvgOptions, zElem, zOrderElement } from "./shared.js";
|
|
3
3
|
import { svgText } from "../svg-encoding.js";
|
|
4
4
|
|
|
@@ -18,10 +18,21 @@ export function text(
|
|
|
18
18
|
const strings = t.text.split("\n");
|
|
19
19
|
let posY = strings.length === 1 ? 0 : (fontSize * strings.length - fontSize) / 2;
|
|
20
20
|
for (const s of strings) {
|
|
21
|
-
const matrix = svgTrsMatrix(point(pos.x, pos.y + posY), rot);
|
|
21
|
+
const matrix = svgTrsMatrix(point(pos.x, pos.y + posY), vec3RotCombine(rot, textViewRotation(opts.view)));
|
|
22
22
|
texts.push(zElem(svgText(s, matrix, fill, opts.font, fontSize), pos.z));
|
|
23
23
|
posY -= fontSize * 1.2;
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
return texts;
|
|
27
27
|
}
|
|
28
|
+
|
|
29
|
+
function textViewRotation(view: View): Vec3 {
|
|
30
|
+
switch(view) {
|
|
31
|
+
case "top":
|
|
32
|
+
case "right":
|
|
33
|
+
case "back":
|
|
34
|
+
return vec3(0, Math.PI, 0);
|
|
35
|
+
default:
|
|
36
|
+
return vec3Zero;
|
|
37
|
+
}
|
|
38
|
+
}
|