@realsee/dnalogel 3.44.0 → 3.44.2
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/CHANGELOG.md +6 -0
- package/dist/PanoTagPlugin/controller/TagUtil.d.ts +4 -1
- package/dist/index.cjs.js +17 -17
- package/dist/index.js +153 -149
- package/dist/index.umd.js +15 -15
- package/libs/PanoTagPlugin/Components/Common/TagPoint.js +37 -37
- package/libs/PanoTagPlugin/controller/Tag/BaseTag.js +34 -32
- package/libs/PanoTagPlugin/controller/TagUtil.d.ts +4 -1
- package/libs/PanoTagPlugin/controller/TagUtil.js +13 -9
- package/libs/PanoTagPlugin/controller/index.js +6 -8
- package/libs/base/BasePlugin.js +1 -1
- package/libs/shared-utils/logger.js +1 -1
- package/libs/shared-utils/three/PointSelector/utils/PointSelectorHelper.js +5 -5
- package/package.json +1 -1
|
@@ -15,11 +15,11 @@ import "../../../vendor/svelte/easing/index.js";
|
|
|
15
15
|
import "../../utils/noTypecheck.js";
|
|
16
16
|
import "../../utils/getImageInfo.js";
|
|
17
17
|
import "../../utils/px2rem.js";
|
|
18
|
-
function Q(
|
|
19
|
-
U(
|
|
18
|
+
function Q(t) {
|
|
19
|
+
U(t, "svelte-7aiuwz", '@charset "UTF-8";.tag-point-click-helper.svelte-7aiuwz.svelte-7aiuwz{position:absolute;pointer-events:auto;cursor:pointer;width:calc(100% + 0.75rem);height:calc(100% + 0.75rem);left:50%;top:50%;transform:translate(-50%, -50%)}.tag-point-wrapper.svelte-7aiuwz.svelte-7aiuwz{pointer-events:none;position:absolute;left:50%;top:50%;transform:translate(-50%, -50%)}.tag-folded-point.svelte-7aiuwz.svelte-7aiuwz,.tag-unfolded-point.svelte-7aiuwz.svelte-7aiuwz{transition:all 0.5s}.tag-point-wrapper.svelte-7aiuwz .tag-unfolded-point.svelte-7aiuwz{display:flex;justify-content:center;align-items:center;position:absolute;width:100%;height:100%;border-radius:50%}.tag-point-wrapper.svelte-7aiuwz .tag-unfolded-point.svelte-7aiuwz:after{content:"";position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);width:0.3125rem;height:0.3125rem;border-radius:50%;background-color:white}.tag-point-wrapper.svelte-7aiuwz .tag-unfolded-point.svelte-7aiuwz:before{content:"";position:absolute;width:0.875rem;height:0.875rem;border-radius:50%;background-color:rgba(0, 0, 0, 0.2)}.tag-point-wrapper.folded.svelte-7aiuwz .tag-folded-point.svelte-7aiuwz{opacity:1;scale:1}.tag-point-wrapper.folded.svelte-7aiuwz .tag-unfolded-point.svelte-7aiuwz{opacity:0;scale:1}.tag-point-wrapper.unfolded.svelte-7aiuwz .tag-folded-point.svelte-7aiuwz{opacity:0;scale:0.2}.tag-point-wrapper.unfolded.svelte-7aiuwz .tag-unfolded-point.svelte-7aiuwz{opacity:1;scale:1}');
|
|
20
20
|
}
|
|
21
|
-
function V(
|
|
22
|
-
let o, r, u, d, c, p, w,
|
|
21
|
+
function V(t) {
|
|
22
|
+
let o, r, u, d, c, p, w, e, a, l, g, v;
|
|
23
23
|
return d = new H({
|
|
24
24
|
props: {
|
|
25
25
|
center: !0,
|
|
@@ -31,53 +31,53 @@ function V(e) {
|
|
|
31
31
|
props: {
|
|
32
32
|
icon: (
|
|
33
33
|
/*url*/
|
|
34
|
-
|
|
34
|
+
t[2]
|
|
35
35
|
),
|
|
36
36
|
width: (
|
|
37
37
|
/*width*/
|
|
38
|
-
|
|
38
|
+
t[1]
|
|
39
39
|
)
|
|
40
40
|
}
|
|
41
41
|
}), a.$on(
|
|
42
42
|
"iconLoaded",
|
|
43
43
|
/*iconLoaded_handler*/
|
|
44
|
-
|
|
44
|
+
t[7]
|
|
45
45
|
), {
|
|
46
46
|
c() {
|
|
47
|
-
o = h("div"), r = h("div"), u = _(), S(d.$$.fragment), c = _(), p = h("div"), w = _(),
|
|
47
|
+
o = h("div"), r = h("div"), u = _(), S(d.$$.fragment), c = _(), p = h("div"), w = _(), e = h("div"), S(a.$$.fragment), z(r, "class", "tag-point-click-helper svelte-7aiuwz"), z(p, "class", "tag-unfolded-point svelte-7aiuwz"), y(
|
|
48
48
|
p,
|
|
49
49
|
"transition-delay",
|
|
50
50
|
/*folded*/
|
|
51
|
-
(
|
|
51
|
+
(t[3] ? (
|
|
52
52
|
/*foldDelay*/
|
|
53
|
-
|
|
53
|
+
t[5]
|
|
54
54
|
) : 0) + "ms"
|
|
55
|
-
), z(
|
|
56
|
-
|
|
55
|
+
), z(e, "class", "tag-folded-point svelte-7aiuwz"), y(
|
|
56
|
+
e,
|
|
57
57
|
"transition-delay",
|
|
58
58
|
/*folded*/
|
|
59
|
-
(
|
|
59
|
+
(t[3] ? (
|
|
60
60
|
/*foldDelay*/
|
|
61
|
-
|
|
61
|
+
t[5]
|
|
62
62
|
) : 0) + "ms"
|
|
63
63
|
), z(o, "class", "tag-point-wrapper svelte-7aiuwz"), b(
|
|
64
64
|
o,
|
|
65
65
|
"unfolded",
|
|
66
66
|
/*unfolded*/
|
|
67
|
-
|
|
67
|
+
t[0]
|
|
68
68
|
), b(
|
|
69
69
|
o,
|
|
70
70
|
"folded",
|
|
71
71
|
/*folded*/
|
|
72
|
-
|
|
72
|
+
t[3]
|
|
73
73
|
);
|
|
74
74
|
},
|
|
75
75
|
m(i, s) {
|
|
76
|
-
W(i, o, s), m(o, r), m(o, u), A(d, o, null), m(o, c), m(o, p), m(o, w), m(o,
|
|
76
|
+
W(i, o, s), m(o, r), m(o, u), A(d, o, null), m(o, c), m(o, p), m(o, w), m(o, e), A(a, e, null), l = !0, g || (v = X(
|
|
77
77
|
r,
|
|
78
78
|
"click",
|
|
79
79
|
/*handlePointClick*/
|
|
80
|
-
|
|
80
|
+
t[4]
|
|
81
81
|
), g = !0);
|
|
82
82
|
},
|
|
83
83
|
p(i, [s]) {
|
|
@@ -98,7 +98,7 @@ function V(e) {
|
|
|
98
98
|
2 && (n.width = /*width*/
|
|
99
99
|
i[1]), a.$set(n), s & /*folded*/
|
|
100
100
|
8 && y(
|
|
101
|
-
|
|
101
|
+
e,
|
|
102
102
|
"transition-delay",
|
|
103
103
|
/*folded*/
|
|
104
104
|
(i[3] ? (
|
|
@@ -130,10 +130,10 @@ function V(e) {
|
|
|
130
130
|
}
|
|
131
131
|
};
|
|
132
132
|
}
|
|
133
|
-
function Y(
|
|
133
|
+
function Y(t, o, r) {
|
|
134
134
|
let u, d, c, p;
|
|
135
135
|
const w = E("hooks");
|
|
136
|
-
let { tag:
|
|
136
|
+
let { tag: e } = o, a, l = !1;
|
|
137
137
|
const g = () => {
|
|
138
138
|
a !== void 0 && clearTimeout(a), l = !0, a = setTimeout(
|
|
139
139
|
() => {
|
|
@@ -142,25 +142,25 @@ function Y(e, o, r) {
|
|
|
142
142
|
800
|
|
143
143
|
);
|
|
144
144
|
}, v = (n) => {
|
|
145
|
-
l || (
|
|
146
|
-
}, i = (() =>
|
|
145
|
+
l || (e.entryFromModel && N(e.five.state.mode) ? e.find({ targetMode: "Panorama" }).then(() => e.unfoldAndFoldOthers()) : w.emit("click", { event: n, target: "TagPoint", tag: e }));
|
|
146
|
+
}, i = (() => e.contentType === "Text" && e.data.appearance === "plane" ? 500 : 800)();
|
|
147
147
|
function s(n) {
|
|
148
|
-
G.call(this,
|
|
148
|
+
G.call(this, t, n);
|
|
149
149
|
}
|
|
150
|
-
return
|
|
151
|
-
"tag" in n && r(6,
|
|
152
|
-
},
|
|
150
|
+
return t.$$set = (n) => {
|
|
151
|
+
"tag" in n && r(6, e = n.tag);
|
|
152
|
+
}, t.$$.update = () => {
|
|
153
153
|
var n, k, T, L;
|
|
154
|
-
|
|
155
|
-
64 && r(0, u = (n =
|
|
156
|
-
1 && r(3, d = !u),
|
|
157
|
-
64 && r(2, c = (T = (k =
|
|
154
|
+
t.$$.dirty & /*tag*/
|
|
155
|
+
64 && r(0, u = (n = e.state) == null ? void 0 : n.unfolded), t.$$.dirty & /*unfolded*/
|
|
156
|
+
1 && r(3, d = !u), t.$$.dirty & /*tag*/
|
|
157
|
+
64 && r(2, c = (T = (k = e.style) == null ? void 0 : k.point) != null && T.url ? (L = e.style) == null ? void 0 : L.point : { url: K }), t.$$.dirty & /*tag*/
|
|
158
158
|
64 && r(1, p = (() => {
|
|
159
|
-
var
|
|
160
|
-
const
|
|
161
|
-
if (typeof
|
|
162
|
-
return
|
|
163
|
-
const f = (
|
|
159
|
+
var M, $, C, F;
|
|
160
|
+
const P = ($ = (M = e.style) == null ? void 0 : M.point) == null ? void 0 : $.width;
|
|
161
|
+
if (typeof P == "number")
|
|
162
|
+
return P;
|
|
163
|
+
const f = (F = (C = e.style) == null ? void 0 : C.point) == null ? void 0 : F.size;
|
|
164
164
|
if (typeof f == "number")
|
|
165
165
|
return f;
|
|
166
166
|
if (f === "S")
|
|
@@ -179,7 +179,7 @@ function Y(e, o, r) {
|
|
|
179
179
|
d,
|
|
180
180
|
v,
|
|
181
181
|
i,
|
|
182
|
-
|
|
182
|
+
e,
|
|
183
183
|
s
|
|
184
184
|
];
|
|
185
185
|
}
|
|
@@ -2,14 +2,14 @@ var Z = Object.defineProperty, _ = Object.defineProperties;
|
|
|
2
2
|
var G = Object.getOwnPropertyDescriptors;
|
|
3
3
|
var y = Object.getOwnPropertySymbols;
|
|
4
4
|
var D = Object.prototype.hasOwnProperty, j = Object.prototype.propertyIsEnumerable;
|
|
5
|
-
var
|
|
5
|
+
var M = (u, i, e) => i in u ? Z(u, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[i] = e, p = (u, i) => {
|
|
6
6
|
for (var e in i || (i = {}))
|
|
7
|
-
D.call(i, e) &&
|
|
7
|
+
D.call(i, e) && M(u, e, i[e]);
|
|
8
8
|
if (y)
|
|
9
9
|
for (var e of y(i))
|
|
10
|
-
j.call(i, e) &&
|
|
10
|
+
j.call(i, e) && M(u, e, i[e]);
|
|
11
11
|
return u;
|
|
12
|
-
},
|
|
12
|
+
}, I = (u, i) => _(u, G(i));
|
|
13
13
|
var B = (u, i) => {
|
|
14
14
|
var e = {};
|
|
15
15
|
for (var t in u)
|
|
@@ -19,8 +19,8 @@ var B = (u, i) => {
|
|
|
19
19
|
i.indexOf(t) < 0 && j.call(u, t) && (e[t] = u[t]);
|
|
20
20
|
return e;
|
|
21
21
|
};
|
|
22
|
-
var f = (u, i, e) => (
|
|
23
|
-
var
|
|
22
|
+
var f = (u, i, e) => (M(u, typeof i != "symbol" ? i + "" : i, e), e);
|
|
23
|
+
var U = (u, i, e) => new Promise((t, r) => {
|
|
24
24
|
var n = (s) => {
|
|
25
25
|
try {
|
|
26
26
|
o(e.next(s));
|
|
@@ -37,9 +37,9 @@ var I = (u, i, e) => new Promise((t, r) => {
|
|
|
37
37
|
o((e = e.apply(u, i)).next());
|
|
38
38
|
});
|
|
39
39
|
import { Subscribe as K } from "../../../shared-utils/Subscribe.js";
|
|
40
|
-
import { calculateTagConfig as
|
|
40
|
+
import { calculateTagConfig as w } from "../../utils/tag/calculateTagConfig.js";
|
|
41
41
|
import { getTagStickType as Y } from "../../utils/tag/format.js";
|
|
42
|
-
import { isPanoramaLike as
|
|
42
|
+
import { isPanoramaLike as T, isModelLike as P } from "../../../shared-utils/five/mode.js";
|
|
43
43
|
import * as S from "three";
|
|
44
44
|
import "hammerjs";
|
|
45
45
|
import "three/examples/jsm/renderers/CSS3DRenderer";
|
|
@@ -56,7 +56,7 @@ import { uuid as oe } from "../../../shared-utils/uuid.js";
|
|
|
56
56
|
import "../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
|
|
57
57
|
import { objectAssignDeepExports as b } from "../../../vendor/object-assign-deep/objectAssignDeep.js";
|
|
58
58
|
import { getTagPosition as L, getTagCenterPosition as $ } from "../../utils/tagPosition.js";
|
|
59
|
-
import { checkRange as
|
|
59
|
+
import { checkRange as C } from "../../utils/checkRange.js";
|
|
60
60
|
import { isMediaPlaneTag as re, isMediaModelTag as V } from "../../utils/tag/tagCheck.js";
|
|
61
61
|
import { getUrlExt as N } from "../../../shared-utils/url/getUrl.js";
|
|
62
62
|
import { getFloorIndex as le } from "../../../shared-utils/five/getFloorIndex.js";
|
|
@@ -74,8 +74,8 @@ import "../../../shared-utils/Utils/FiveUtil.js";
|
|
|
74
74
|
import "../../../shared-utils/Utils/BaseUtil.js";
|
|
75
75
|
import "../../../shared-utils/Utils/WorkUtil.js";
|
|
76
76
|
import "../../../shared-utils/five/getFiveModel.js";
|
|
77
|
-
const
|
|
78
|
-
|
|
77
|
+
const k = new S.Raycaster();
|
|
78
|
+
k.params.Points.threshold = 0.1;
|
|
79
79
|
class _e {
|
|
80
80
|
constructor(i, e) {
|
|
81
81
|
f(this, "plugin");
|
|
@@ -112,7 +112,7 @@ class _e {
|
|
|
112
112
|
e.stickType = t;
|
|
113
113
|
const r = JSON.parse(JSON.stringify(e.data)), n = (s = e.initialConfig) != null ? s : e.config ? JSON.parse(JSON.stringify(e.config)) : {};
|
|
114
114
|
e.initialConfig = n;
|
|
115
|
-
const l =
|
|
115
|
+
const l = w(e, i.config), o = this.getConfig(e);
|
|
116
116
|
e.config = o, this.id = (a = e.id) != null ? a : oe(), this.enabled = (c = e.enabled) != null ? c : !0, this.contentType = e.contentType, this.data = (g = o.initialData) != null && g.important ? b(e.data, r, o.initialData) : b(e.data, o.initialData, r), this.state = p({
|
|
117
117
|
visible: void 0,
|
|
118
118
|
unfolded: !this.can("fold")
|
|
@@ -144,7 +144,7 @@ class _e {
|
|
|
144
144
|
}
|
|
145
145
|
get currentConfig() {
|
|
146
146
|
var r, n;
|
|
147
|
-
const i =
|
|
147
|
+
const i = w(this, this.plugin.config, { useCache: !0 }), e = this.five.getCurrentState().mode, t = (r = i.configWithFiveMode) == null ? void 0 : r[e];
|
|
148
148
|
return (n = t != null ? t : i) != null ? n : {};
|
|
149
149
|
}
|
|
150
150
|
get currentVisible() {
|
|
@@ -163,7 +163,7 @@ class _e {
|
|
|
163
163
|
* @description 找到标签
|
|
164
164
|
*/
|
|
165
165
|
find(i) {
|
|
166
|
-
return
|
|
166
|
+
return U(this, null, function* () {
|
|
167
167
|
var r;
|
|
168
168
|
const e = this.fiveState;
|
|
169
169
|
if (!this.fiveState)
|
|
@@ -187,7 +187,7 @@ class _e {
|
|
|
187
187
|
* @description 闪烁
|
|
188
188
|
*/
|
|
189
189
|
blink(i) {
|
|
190
|
-
return
|
|
190
|
+
return U(this, null, function* () {
|
|
191
191
|
var o, s;
|
|
192
192
|
const e = (o = this.enabled) != null ? o : !0, t = (s = this.state) == null ? void 0 : s.visible, r = e && t;
|
|
193
193
|
r === !1 && (this.state.visible = !0, this.enabled = !0, this.applyVisible(), this.plugin.addRenderQueue({ type: "TagContainerSvelte", keys: ["tags"] }), this.plugin.render(), yield de(0), this.dom && (this.dom.style.visibility = "hidden"), this.contentDom && (this.contentDom.style.visibility = "hidden"));
|
|
@@ -287,7 +287,7 @@ class _e {
|
|
|
287
287
|
}
|
|
288
288
|
getConfig(i, e) {
|
|
289
289
|
var l, o, s;
|
|
290
|
-
const t =
|
|
290
|
+
const t = w(i != null ? i : this, this.plugin.config, { useCache: e == null ? void 0 : e.useCache }), r = (l = e == null ? void 0 : e.fiveMode) != null ? l : this.five.getCurrentState().mode, n = (o = t.configWithFiveMode) == null ? void 0 : o[r];
|
|
291
291
|
return (s = n != null ? n : t) != null ? s : {};
|
|
292
292
|
}
|
|
293
293
|
getDistance(i, e = 3) {
|
|
@@ -376,7 +376,7 @@ class _e {
|
|
|
376
376
|
if (h === !1)
|
|
377
377
|
return p({ value: !1, checkedList: n, reason: "followModelVisibility check failed" }, v);
|
|
378
378
|
}
|
|
379
|
-
if (
|
|
379
|
+
if (T(r) && s.visiblePanoIndex !== void 0 && s.visiblePanoIndex !== "all" && t !== void 0) {
|
|
380
380
|
if (n.push("visiblePanoIndex"), Array.isArray(s.visiblePanoIndex) && !s.visiblePanoIndex.includes(t))
|
|
381
381
|
return {
|
|
382
382
|
value: !1,
|
|
@@ -392,7 +392,7 @@ class _e {
|
|
|
392
392
|
}
|
|
393
393
|
if (s.visibleDistance !== void 0 && (n.push("visibleDistance"), s.visibleDistance !== "unLimited")) {
|
|
394
394
|
const h = this.getDistance(e, 1);
|
|
395
|
-
if (
|
|
395
|
+
if (C(h, s.visibleDistance) === !1)
|
|
396
396
|
return {
|
|
397
397
|
value: !1,
|
|
398
398
|
checkedList: n,
|
|
@@ -430,9 +430,9 @@ class _e {
|
|
|
430
430
|
if (n || (n = (o = (l = this.fiveState) == null ? void 0 : l.mode) != null ? o : this.workUtil.observers.length ? "Panorama" : "ModelLike"), Array.isArray(n))
|
|
431
431
|
return n.includes(e);
|
|
432
432
|
if (n === "ModelLike")
|
|
433
|
-
return
|
|
433
|
+
return P(e);
|
|
434
434
|
if (n === "PanoramaLike")
|
|
435
|
-
return !
|
|
435
|
+
return !T(e);
|
|
436
436
|
if (n === "all")
|
|
437
437
|
return !0;
|
|
438
438
|
if (typeof n == "string")
|
|
@@ -442,7 +442,7 @@ class _e {
|
|
|
442
442
|
var l;
|
|
443
443
|
const n = t();
|
|
444
444
|
if (E((l = this.fiveState) == null ? void 0 : l.panoIndex) && i.entryFromModel) {
|
|
445
|
-
if (
|
|
445
|
+
if (P(e) && n ? this.entryFromModel = !1 : this.entryFromModel = !0, P(e))
|
|
446
446
|
return !0;
|
|
447
447
|
} else
|
|
448
448
|
this.entryFromModel = !1;
|
|
@@ -458,7 +458,7 @@ class _e {
|
|
|
458
458
|
/** 通过射线检测标签可用性 */
|
|
459
459
|
computeVisibleByIntersect(i) {
|
|
460
460
|
var s, a, c, g;
|
|
461
|
-
const e = z(z((s = this.getConfig().visibleConfig) != null ? s : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, r =
|
|
461
|
+
const e = z(z((s = this.getConfig().visibleConfig) != null ? s : {}).intersectRaycaster), t = i != null ? i : this.five.getCurrentState().panoIndex, r = T(this.five.getCurrentState().mode) ? this.workUtil.getObserverPosition(t) : this.five.camera.position;
|
|
462
462
|
if (r === void 0)
|
|
463
463
|
return { value: !1, reason: { type: "startPosition is undefined", fivePanoIndex: t } };
|
|
464
464
|
const n = ae(
|
|
@@ -472,19 +472,19 @@ class _e {
|
|
|
472
472
|
for (const d of n) {
|
|
473
473
|
const m = new S.Vector3().subVectors(d, r).normalize();
|
|
474
474
|
let h;
|
|
475
|
-
|
|
476
|
-
const [v] = this.fiveUtil.model.intersectRaycaster(
|
|
475
|
+
k.set(r, m);
|
|
476
|
+
const [v] = this.fiveUtil.model.intersectRaycaster(k);
|
|
477
477
|
h = v == null ? void 0 : v.distance;
|
|
478
|
-
const
|
|
478
|
+
const x = (() => {
|
|
479
479
|
if (!V(this))
|
|
480
480
|
return;
|
|
481
481
|
const q = this.plugin.tags.filter(V).map((X) => {
|
|
482
482
|
var F;
|
|
483
483
|
return (F = X.model) == null ? void 0 : F.object;
|
|
484
|
-
}).filter(E), [Q] =
|
|
484
|
+
}).filter(E), [Q] = k.intersectObjects(q, !0);
|
|
485
485
|
return Q;
|
|
486
486
|
})(), J = r.distanceTo(d), W = (a = e.distanceAccuracy) != null ? a : 0.01;
|
|
487
|
-
h = Math.min(h != null ? h : 1 / 0, (c =
|
|
487
|
+
h = Math.min(h != null ? h : 1 / 0, (c = x == null ? void 0 : x.distance) != null ? c : 1 / 0), h + W >= J ? l++ : o++;
|
|
488
488
|
const H = (g = e.needPassed) != null ? g : 1;
|
|
489
489
|
if (l >= H)
|
|
490
490
|
return { value: !0 };
|
|
@@ -526,12 +526,14 @@ class _e {
|
|
|
526
526
|
return !1;
|
|
527
527
|
if (e.keep === "unfolded")
|
|
528
528
|
return !0;
|
|
529
|
-
if (e.unfoldDistance &&
|
|
529
|
+
if (e.unfoldDistance && C(this.getDistance({ panoIndex: i }), e.unfoldDistance) === !1)
|
|
530
530
|
return !1;
|
|
531
531
|
}
|
|
532
532
|
}
|
|
533
533
|
computeUnfoldedByCamera() {
|
|
534
534
|
var e;
|
|
535
|
+
if (this.entryFromModel && P(this.five.state.mode))
|
|
536
|
+
return !1;
|
|
535
537
|
const i = this.getConfig().unfoldedConfig;
|
|
536
538
|
if (i) {
|
|
537
539
|
if (typeof i == "function")
|
|
@@ -544,7 +546,7 @@ class _e {
|
|
|
544
546
|
return;
|
|
545
547
|
if (i.autoUnfold.strategy === "ScreenPostion") {
|
|
546
548
|
const t = this.computeTagProject();
|
|
547
|
-
if (t &&
|
|
549
|
+
if (t && C(t.x, i.autoUnfold.autoUnfoldProjectX) === !1)
|
|
548
550
|
return !1;
|
|
549
551
|
}
|
|
550
552
|
if (i.autoUnfold.strategy === "MinimumDistance") {
|
|
@@ -557,9 +559,9 @@ class _e {
|
|
|
557
559
|
}).map((o) => ({ tag: o, id: o.id, tagConfig: o.getConfig().unfoldedConfig })).filter(({ tagConfig: o }) => {
|
|
558
560
|
var s, a;
|
|
559
561
|
return !(typeof o == "function" || o.keep || o.autoUnfold === !1 || ((s = o.autoUnfold) == null ? void 0 : s.enable) === !1 || ((a = o.autoUnfold) == null ? void 0 : a.strategy) !== "MinimumDistance");
|
|
560
|
-
}).map((o) =>
|
|
562
|
+
}).map((o) => I(p({}, o), { distance: o.tag.getDistance() })).filter(({ distance: o, tagConfig: s }) => {
|
|
561
563
|
const a = s.autoUnfold.distance;
|
|
562
|
-
return !(a &&
|
|
564
|
+
return !(a && C(o, a) === !1);
|
|
563
565
|
}).sort((o, s) => o.distance - s.distance).findIndex((o) => o.id === this.id);
|
|
564
566
|
if (n === -1 || n <= ((e = i.autoUnfold.maxNumber) != null ? e : 1) - 1 === !1)
|
|
565
567
|
return !1;
|
|
@@ -597,7 +599,7 @@ class _e {
|
|
|
597
599
|
return { reason: `plugin.state.visible is ${this.plugin.state.visible}` };
|
|
598
600
|
if (!this.enabled)
|
|
599
601
|
return { reason: `tag ${this.id} enabled is: ${this.enabled}` };
|
|
600
|
-
const i =
|
|
602
|
+
const i = I(p({}, this.computeVisible()), {
|
|
601
603
|
tagInstance: this
|
|
602
604
|
});
|
|
603
605
|
return i.value !== this.state.visible ? { reason: "插件故障,请联系维护人员, err: 0", info: i } : this.state.visible ? { reason: "应该是能看见才对", info: i } : i.value === !0 ? { reason: "插件故障,请联系维护人员, err: 1", info: i } : { reason: (e = i.reason.type) != null ? e : i.reason, info: i };
|
|
@@ -16,7 +16,10 @@ export declare abstract class TagUtil extends BasePlugin.Controller<State, Plugi
|
|
|
16
16
|
get container(): Element;
|
|
17
17
|
set container(container: Element);
|
|
18
18
|
config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
|
|
19
|
-
renderQueue: Map<string,
|
|
19
|
+
renderQueue: Map<string, {
|
|
20
|
+
keys: string[];
|
|
21
|
+
tags: BaseTag[];
|
|
22
|
+
}>;
|
|
20
23
|
set tagsLengthWillUpdate(value: boolean);
|
|
21
24
|
/** 插件参数 */
|
|
22
25
|
protected params: {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
var d = Object.defineProperty;
|
|
2
|
-
var c = (
|
|
3
|
-
var r = (
|
|
2
|
+
var c = (a, n, e) => n in a ? d(a, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[n] = e;
|
|
3
|
+
var r = (a, n, e) => (c(a, typeof n != "symbol" ? n + "" : n, e), e);
|
|
4
4
|
import { DefaultConfig as l } from "../tag.config.js";
|
|
5
5
|
import "three";
|
|
6
6
|
import { anyPositionToVector3 as p } from "../../shared-utils/positionToVector3.js";
|
|
@@ -134,8 +134,12 @@ class Se extends E {
|
|
|
134
134
|
return (e = this._cache_css3DTag) != null ? e : [];
|
|
135
135
|
}
|
|
136
136
|
addRenderQueue(e) {
|
|
137
|
-
|
|
138
|
-
|
|
137
|
+
var m, s;
|
|
138
|
+
const { type: t, keys: i = [], tags: o = [] } = e;
|
|
139
|
+
this.renderQueue.has(t) ? this.renderQueue.set(t, {
|
|
140
|
+
keys: Array.from(/* @__PURE__ */ new Set([...(m = this.renderQueue.get(t).keys) != null ? m : [], ...i])),
|
|
141
|
+
tags: Array.from(/* @__PURE__ */ new Set([...(s = this.renderQueue.get(t).tags) != null ? s : [], ...o]))
|
|
142
|
+
}) : this.renderQueue.set(t, { keys: i, tags: o });
|
|
139
143
|
}
|
|
140
144
|
getTagById(e) {
|
|
141
145
|
const t = this.tags.find((i) => i.id === e);
|
|
@@ -161,14 +165,14 @@ class Se extends E {
|
|
|
161
165
|
if (!t || !this.domEvents)
|
|
162
166
|
return () => {
|
|
163
167
|
};
|
|
164
|
-
const o = () => !(!e.currentVisible || e.loading),
|
|
168
|
+
const o = () => !(!e.currentVisible || e.loading), m = (s) => {
|
|
165
169
|
if (!o())
|
|
166
170
|
return !1;
|
|
167
|
-
i(
|
|
171
|
+
i(s.origDomEvent);
|
|
168
172
|
};
|
|
169
|
-
return this.domEvents.addEventListener(t, "click",
|
|
170
|
-
var
|
|
171
|
-
(
|
|
173
|
+
return this.domEvents.addEventListener(t, "click", m), () => {
|
|
174
|
+
var s;
|
|
175
|
+
(s = this.domEvents) == null || s.removeEventListener(t, "click", m);
|
|
172
176
|
};
|
|
173
177
|
}
|
|
174
178
|
/**
|
|
@@ -235,10 +235,8 @@ class ji extends R {
|
|
|
235
235
|
});
|
|
236
236
|
p(this, "handleFivePanoArrived", () => l(this, null, function* () {
|
|
237
237
|
this.tags.forEach((e) => {
|
|
238
|
-
e.state.visible = !1, e.applyVisible(), e.updateVisible();
|
|
239
|
-
}), this.temporaryState.visible = !0, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }), yield this.setUnfolded(), this.updateRender3DDomTag(), this.tags.
|
|
240
|
-
e.temporaryState = c(f({}, e.temporaryState), { visible: !0 });
|
|
241
|
-
}), this.tags.filter(w).filter((e) => {
|
|
238
|
+
e.state.visible = !1, e.temporaryState = c(f({}, e.temporaryState), { visible: !0 }), e.applyVisible(), e.updateVisible();
|
|
239
|
+
}), this.temporaryState.visible = !0, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }), yield this.setUnfolded(), this.updateRender3DDomTag(), this.tags.filter(w).filter((e) => {
|
|
242
240
|
var t;
|
|
243
241
|
return (t = e.getConfig().modelConfig) == null ? void 0 : t.autoLookAtEnabled;
|
|
244
242
|
}).forEach((e) => {
|
|
@@ -264,8 +262,8 @@ class ji extends R {
|
|
|
264
262
|
});
|
|
265
263
|
p(this, "render", () => {
|
|
266
264
|
this.renderQueue.forEach((e, t) => {
|
|
267
|
-
const
|
|
268
|
-
if (
|
|
265
|
+
const { keys: i } = e;
|
|
266
|
+
if (t === "TagContainerSvelte") {
|
|
269
267
|
const s = this.filterPointTag.filter((r) => r.screenPosition), n = {
|
|
270
268
|
hooks: this.hooks,
|
|
271
269
|
tags: s,
|
|
@@ -278,10 +276,10 @@ class ji extends R {
|
|
|
278
276
|
};
|
|
279
277
|
if (this.TagContainerSvelte) {
|
|
280
278
|
let r = {};
|
|
281
|
-
if (
|
|
279
|
+
if (i.length === 0)
|
|
282
280
|
r = n;
|
|
283
281
|
else
|
|
284
|
-
for (const h of
|
|
282
|
+
for (const h of i)
|
|
285
283
|
r[h] = n[h];
|
|
286
284
|
this.TagContainerSvelte.$set(r);
|
|
287
285
|
} else {
|
package/libs/base/BasePlugin.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
function A() {
|
|
2
2
|
console.debug(
|
|
3
|
-
"%c %c@realsee/dnalogel %cv3.44.
|
|
3
|
+
"%c %c@realsee/dnalogel %cv3.44.2",
|
|
4
4
|
[
|
|
5
5
|
"background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
|
|
6
6
|
"background-repeat: no-repeat",
|
|
@@ -4,14 +4,14 @@ var t = (a, i, e) => (f(a, typeof i != "symbol" ? i + "" : i, e), e);
|
|
|
4
4
|
import * as m from "three";
|
|
5
5
|
import { Magnifier as p } from "../../Magnifier.js";
|
|
6
6
|
import { PointHelper as u } from "./PointHelper.js";
|
|
7
|
-
import { Subscribe as
|
|
8
|
-
import { PointHelper2 as
|
|
7
|
+
import { Subscribe as b } from "../../../Subscribe.js";
|
|
8
|
+
import { PointHelper2 as g } from "./PointHelper2.js";
|
|
9
9
|
import "../../THREESphere.js";
|
|
10
10
|
import "animejs";
|
|
11
11
|
class M {
|
|
12
12
|
constructor(i, e) {
|
|
13
13
|
t(this, "five");
|
|
14
|
-
t(this, "hooks", new
|
|
14
|
+
t(this, "hooks", new b());
|
|
15
15
|
t(this, "position");
|
|
16
16
|
t(this, "magnifier", null);
|
|
17
17
|
t(this, "pointHelper", null);
|
|
@@ -39,9 +39,9 @@ class M {
|
|
|
39
39
|
t(this, "abortUpdateMagnifier", () => {
|
|
40
40
|
});
|
|
41
41
|
var s, n, h, l;
|
|
42
|
-
|
|
42
|
+
this.five = i, this.magnifier = (e == null ? void 0 : e.magnifier) !== void 0 ? e.magnifier : new p(i, (s = e == null ? void 0 : e.magnifierParams) != null ? s : { dragEnabled: !0 });
|
|
43
43
|
let r;
|
|
44
|
-
(e == null ? void 0 : e.pointHelper) === "default" || (e == null ? void 0 : e.pointHelper) === void 0 ? r = new u(i) : (e == null ? void 0 : e.pointHelper) === "highlight" ? r = new
|
|
44
|
+
(e == null ? void 0 : e.pointHelper) === "default" || (e == null ? void 0 : e.pointHelper) === void 0 ? r = new u(i) : (e == null ? void 0 : e.pointHelper) === "highlight" ? r = new g(i) : r = e.pointHelper, this.pointHelper = r, this.group.name = "five-point-selector", this.five.scene.add(this.group), (l = this.magnifier) == null || l.appendTo((h = (n = e.container) != null ? n : i.getElement().parentElement) != null ? h : document.body);
|
|
45
45
|
}
|
|
46
46
|
enable() {
|
|
47
47
|
var i;
|