@realsee/dnalogel 3.33.1-dev.1 → 3.34.0-dev.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 +3 -0
- package/dist/CSS3DRenderPlugin/utils/three/CSS3DRenderer.d.ts +1 -1
- package/dist/PanoTagPlugin/controller/TagUtil.d.ts +6 -0
- package/dist/PanoTagPlugin/controller/index.d.ts +1 -2
- package/dist/index.cjs.js +7 -7
- package/dist/index.js +45 -27
- package/dist/index.umd.js +7 -7
- package/libs/CSS3DRenderPlugin/Controller.js +10 -10
- package/libs/CSS3DRenderPlugin/utils/three/CSS3DRender.js +14 -17
- package/libs/CSS3DRenderPlugin/utils/three/CSS3DRenderer.d.ts +1 -1
- package/libs/CSS3DRenderPlugin/utils/three/CSS3DRenderer.js +2 -2
- package/libs/GuideLinePlugin/GuideLineModeItem/index.js +5 -5
- package/libs/PanoTagPlugin/Components/TagContainer.js +114 -99
- package/libs/PanoTagPlugin/controller/TagRender.js +8 -7
- package/libs/PanoTagPlugin/controller/TagUtil.d.ts +6 -0
- package/libs/PanoTagPlugin/controller/TagUtil.js +35 -28
- package/libs/PanoTagPlugin/controller/index.d.ts +1 -2
- package/libs/PanoTagPlugin/controller/index.js +0 -2
- package/libs/base/BasePlugin.js +1 -1
- package/libs/shared-utils/logger.js +1 -1
- package/package.json +1 -1
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
var
|
|
2
|
-
var
|
|
3
|
-
var
|
|
4
|
-
var
|
|
5
|
-
var w = (l, s, e) => s in l ?
|
|
1
|
+
var Z = Object.defineProperty, q = Object.defineProperties;
|
|
2
|
+
var K = Object.getOwnPropertyDescriptors;
|
|
3
|
+
var _ = Object.getOwnPropertySymbols;
|
|
4
|
+
var Q = Object.prototype.hasOwnProperty, Y = Object.prototype.propertyIsEnumerable;
|
|
5
|
+
var w = (l, s, e) => s in l ? Z(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e, b = (l, s) => {
|
|
6
6
|
for (var e in s || (s = {}))
|
|
7
|
-
|
|
8
|
-
if (
|
|
9
|
-
for (var e of
|
|
10
|
-
|
|
7
|
+
Q.call(s, e) && w(l, e, s[e]);
|
|
8
|
+
if (_)
|
|
9
|
+
for (var e of _(s))
|
|
10
|
+
Y.call(s, e) && w(l, e, s[e]);
|
|
11
11
|
return l;
|
|
12
|
-
}, U = (l, s) =>
|
|
12
|
+
}, U = (l, s) => q(l, K(s));
|
|
13
13
|
var d = (l, s, e) => (w(l, typeof s != "symbol" ? s + "" : s, e), e);
|
|
14
14
|
import { defaultGlobalConfig as ee } from "../typings/tag/TagConfig.js";
|
|
15
15
|
import { objectAssignDeepExports as y } from "../../vendor/object-assign-deep/objectAssignDeep.js";
|
|
@@ -28,11 +28,11 @@ import { isMediaPlaneTag as le, isMediaModelTag as B, isPlaneTag as ce, isPoint3
|
|
|
28
28
|
import { VideoPlane as ue } from "../utils/model/mediaPlane.js";
|
|
29
29
|
import { FiveDomEvents as me } from "../../shared-utils/five/FiveDomEvents.js";
|
|
30
30
|
import N from "../utils/tag/adaptConfig.js";
|
|
31
|
-
import { isPanoramaLike as
|
|
31
|
+
import { isPanoramaLike as S, isModelLike as z } from "../../shared-utils/five/mode.js";
|
|
32
32
|
import "hammerjs";
|
|
33
33
|
import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
|
|
34
34
|
import "animejs";
|
|
35
|
-
import { entries as
|
|
35
|
+
import { entries as $ } from "../../shared-utils/typescript/entries.js";
|
|
36
36
|
import { getUrlExt as H } from "../../shared-utils/url/getUrl.js";
|
|
37
37
|
import { transformPosition as J } from "../../shared-utils/five/transformPosition.js";
|
|
38
38
|
import { WorkUtil as pe } from "../../shared-utils/Utils/WorkUtil.js";
|
|
@@ -73,6 +73,8 @@ class hi extends ne {
|
|
|
73
73
|
d(this, "config", te);
|
|
74
74
|
d(this, "tagsLengthWillUpdate", !0);
|
|
75
75
|
d(this, "workUtil", new pe(this.five));
|
|
76
|
+
/** 插件参数 */
|
|
77
|
+
d(this, "params");
|
|
76
78
|
d(this, "mediaStore", re({
|
|
77
79
|
currentMediaElement: null
|
|
78
80
|
}));
|
|
@@ -123,7 +125,12 @@ class hi extends ne {
|
|
|
123
125
|
}
|
|
124
126
|
/** css3DRenderPlugin */
|
|
125
127
|
get css3DRenderPlugin() {
|
|
126
|
-
|
|
128
|
+
var e, i;
|
|
129
|
+
if (!this._css3DRenderPlugin) {
|
|
130
|
+
const o = fe(this.five);
|
|
131
|
+
this._css3DRenderPlugin = o, o.frontModeCSS3DRenderer.domElementWrapper.style.zIndex = (i = (e = this.params.containerZIndex) == null ? void 0 : e.toString()) != null ? i : "";
|
|
132
|
+
}
|
|
133
|
+
return this._css3DRenderPlugin;
|
|
127
134
|
}
|
|
128
135
|
getTagById(e) {
|
|
129
136
|
const i = this.tags.find((o) => o.id === e);
|
|
@@ -231,20 +238,20 @@ class hi extends ne {
|
|
|
231
238
|
* @description 获取距离
|
|
232
239
|
*/
|
|
233
240
|
getDistance(e, i) {
|
|
234
|
-
const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r =
|
|
241
|
+
const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: n } = o, r = S(n) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
|
|
235
242
|
if ((r == null ? void 0 : r.distance) !== void 0)
|
|
236
243
|
return r.distance;
|
|
237
244
|
const f = V(e);
|
|
238
245
|
if (!f)
|
|
239
246
|
return -1;
|
|
240
|
-
if (
|
|
247
|
+
if (S(n)) {
|
|
241
248
|
const c = this.workUtil.getObserverPosition(t);
|
|
242
249
|
if (c === void 0)
|
|
243
250
|
return -1;
|
|
244
251
|
const h = c.distanceTo(f);
|
|
245
252
|
return r && (r.distance = h), h;
|
|
246
253
|
}
|
|
247
|
-
if (
|
|
254
|
+
if (z(n))
|
|
248
255
|
return this.five.camera.position.distanceTo(f);
|
|
249
256
|
}
|
|
250
257
|
getPositions(e) {
|
|
@@ -316,20 +323,20 @@ class hi extends ne {
|
|
|
316
323
|
* @description 获取merge后的配置
|
|
317
324
|
*/
|
|
318
325
|
calculateTagConfig(e, i) {
|
|
319
|
-
var O,
|
|
320
|
-
const o = (
|
|
326
|
+
var A, O, I, j, x;
|
|
327
|
+
const o = (A = i == null ? void 0 : i.useCache) != null ? A : !0;
|
|
321
328
|
if (!e)
|
|
322
|
-
return (
|
|
329
|
+
return (O = this.config.globalConfig) != null ? O : {};
|
|
323
330
|
if (o) {
|
|
324
|
-
if ((
|
|
331
|
+
if ((I = e == null ? void 0 : e.computedConfig) != null && I._isMerged)
|
|
325
332
|
return e.computedConfig;
|
|
326
|
-
if ((
|
|
333
|
+
if ((j = e == null ? void 0 : e.config) != null && j._isMerged)
|
|
327
334
|
return e.config;
|
|
328
335
|
}
|
|
329
336
|
const t = {}, n = {}, r = {};
|
|
330
337
|
this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, m]) => {
|
|
331
338
|
var F, L;
|
|
332
|
-
const a = u, D = a.split("-"),
|
|
339
|
+
const a = u, D = a.split("-"), W = u.startsWith("["), T = W ? D[0].slice(1, -1) : void 0, g = W ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (F = n[T]) != null ? F : n[T] = {} : (L = r[T]) != null ? L : r[T] = {} : t;
|
|
333
340
|
if (!v[a]) {
|
|
334
341
|
if (g.length === 0 && (v[a] = m), g.length === 1) {
|
|
335
342
|
const [p] = g;
|
|
@@ -342,18 +349,18 @@ class hi extends ne {
|
|
|
342
349
|
if (g.length === 3) {
|
|
343
350
|
const [p = "Any", M, X] = g;
|
|
344
351
|
if (M === "Audio" && e.contentType === "Audio") {
|
|
345
|
-
const
|
|
346
|
-
(
|
|
352
|
+
const R = e;
|
|
353
|
+
(R.stickType === p || p === "Any") && R.data.appearance === X && (v[a] = m);
|
|
347
354
|
}
|
|
348
355
|
}
|
|
349
356
|
}
|
|
350
357
|
});
|
|
351
|
-
const f = (
|
|
352
|
-
|
|
358
|
+
const f = (x = e.initialConfig) != null ? x : {}, c = y({}, ee, this.config.globalConfig, ...Object.values(t)), h = y({}, c, f), P = {}, G = Object.values(ae.Mode);
|
|
359
|
+
$(n).forEach(([u, m]) => {
|
|
353
360
|
G.forEach((a) => {
|
|
354
|
-
(u === "PanoramaLike" &&
|
|
361
|
+
(u === "PanoramaLike" && S(a) || u === "ModelLike" && z(a)) && (P[a] = y({}, c, ...Object.values(m), f, { _isMerged: !0 }));
|
|
355
362
|
});
|
|
356
|
-
}),
|
|
363
|
+
}), $(r).forEach(([u, m]) => {
|
|
357
364
|
const a = P[u];
|
|
358
365
|
P[u] = y({}, c, a, ...Object.values(m), f, { _isMerged: !0 });
|
|
359
366
|
});
|
|
@@ -12,14 +12,13 @@ declare class PanoTagPluginController extends TagRender {
|
|
|
12
12
|
enabled: boolean;
|
|
13
13
|
visible: boolean;
|
|
14
14
|
};
|
|
15
|
-
/** 插件参数 */
|
|
16
|
-
private params;
|
|
17
15
|
/** debug */
|
|
18
16
|
private debug;
|
|
19
17
|
private debugUtil;
|
|
20
18
|
constructor(five: Five, params?: {
|
|
21
19
|
config?: Pick<Tags, 'contentTypeConfig' | 'globalConfig'>;
|
|
22
20
|
debug?: boolean;
|
|
21
|
+
containerZIndex?: number;
|
|
23
22
|
});
|
|
24
23
|
appendTo(wrapper: Element): void;
|
|
25
24
|
/**
|
package/libs/base/BasePlugin.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
function A() {
|
|
2
2
|
console.debug(
|
|
3
|
-
"%c %c@realsee/dnalogel %cv3.
|
|
3
|
+
"%c %c@realsee/dnalogel %cv3.34.0-dev.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",
|