@realsee/dnalogel 3.34.0-dev.0 → 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 +1 -0
- package/dist/CSS3DRenderPlugin/utils/three/CSS3DRenderer.d.ts +1 -1
- package/dist/index.cjs.js +4 -4
- package/dist/index.js +9 -4
- package/dist/index.umd.js +4 -4
- package/libs/CSS3DRenderPlugin/utils/three/CSS3DRenderer.d.ts +1 -1
- package/libs/CSS3DRenderPlugin/utils/three/CSS3DRenderer.js +1 -1
- package/libs/PanoTagPlugin/controller/TagUtil.js +33 -28
- package/libs/base/BasePlugin.js +1 -1
- package/libs/shared-utils/logger.js +1 -1
- package/package.json +1 -1
|
@@ -2,9 +2,9 @@ import { CSS3DRenderer } from 'three/examples/jsm/renderers/CSS3DRenderer';
|
|
|
2
2
|
import type * as THREE from 'three';
|
|
3
3
|
export default class ICSS3DRenderer extends CSS3DRenderer {
|
|
4
4
|
wrapper?: Element;
|
|
5
|
+
domElementWrapper: HTMLDivElement;
|
|
5
6
|
private requestAnimationFrameId?;
|
|
6
7
|
private resizeDisoper?;
|
|
7
|
-
private domElementWrapper;
|
|
8
8
|
constructor();
|
|
9
9
|
setWrapper(wrapper: Element): this;
|
|
10
10
|
appendToElement(wrapper: Element): void;
|
|
@@ -10,9 +10,9 @@ class v extends d {
|
|
|
10
10
|
constructor() {
|
|
11
11
|
super();
|
|
12
12
|
n(this, "wrapper");
|
|
13
|
+
n(this, "domElementWrapper", document.createElement("div"));
|
|
13
14
|
n(this, "requestAnimationFrameId");
|
|
14
15
|
n(this, "resizeDisoper");
|
|
15
|
-
n(this, "domElementWrapper", document.createElement("div"));
|
|
16
16
|
this.domElementWrapper.classList.add("ICSS3DRendererWrapper"), this.domElementWrapper.style.position = "absolute", this.domElementWrapper.style.top = "0", this.domElementWrapper.style.left = "0", this.domElementWrapper.style.width = "100%", this.domElementWrapper.style.height = "100%", this.domElementWrapper.style.userSelect = "none", this.domElementWrapper.style.pointerEvents = "none", this.domElement.classList.add("ICSS3DRenderer"), this.domElement.style.position = "absolute", this.domElement.style.top = "0", this.domElement.style.left = "0", this.domElement.style.userSelect = "none", this.domElement.style.pointerEvents = "none", this.domElementWrapper.appendChild(this.domElement);
|
|
17
17
|
}
|
|
18
18
|
setWrapper(e) {
|
|
@@ -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";
|
|
@@ -125,7 +125,12 @@ class hi extends ne {
|
|
|
125
125
|
}
|
|
126
126
|
/** css3DRenderPlugin */
|
|
127
127
|
get css3DRenderPlugin() {
|
|
128
|
-
|
|
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;
|
|
129
134
|
}
|
|
130
135
|
getTagById(e) {
|
|
131
136
|
const i = this.tags.find((o) => o.id === e);
|
|
@@ -233,20 +238,20 @@ class hi extends ne {
|
|
|
233
238
|
* @description 获取距离
|
|
234
239
|
*/
|
|
235
240
|
getDistance(e, i) {
|
|
236
|
-
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;
|
|
237
242
|
if ((r == null ? void 0 : r.distance) !== void 0)
|
|
238
243
|
return r.distance;
|
|
239
244
|
const f = V(e);
|
|
240
245
|
if (!f)
|
|
241
246
|
return -1;
|
|
242
|
-
if (
|
|
247
|
+
if (S(n)) {
|
|
243
248
|
const c = this.workUtil.getObserverPosition(t);
|
|
244
249
|
if (c === void 0)
|
|
245
250
|
return -1;
|
|
246
251
|
const h = c.distanceTo(f);
|
|
247
252
|
return r && (r.distance = h), h;
|
|
248
253
|
}
|
|
249
|
-
if (
|
|
254
|
+
if (z(n))
|
|
250
255
|
return this.five.camera.position.distanceTo(f);
|
|
251
256
|
}
|
|
252
257
|
getPositions(e) {
|
|
@@ -318,20 +323,20 @@ class hi extends ne {
|
|
|
318
323
|
* @description 获取merge后的配置
|
|
319
324
|
*/
|
|
320
325
|
calculateTagConfig(e, i) {
|
|
321
|
-
var O,
|
|
322
|
-
const o = (
|
|
326
|
+
var A, O, I, j, x;
|
|
327
|
+
const o = (A = i == null ? void 0 : i.useCache) != null ? A : !0;
|
|
323
328
|
if (!e)
|
|
324
|
-
return (
|
|
329
|
+
return (O = this.config.globalConfig) != null ? O : {};
|
|
325
330
|
if (o) {
|
|
326
|
-
if ((
|
|
331
|
+
if ((I = e == null ? void 0 : e.computedConfig) != null && I._isMerged)
|
|
327
332
|
return e.computedConfig;
|
|
328
|
-
if ((
|
|
333
|
+
if ((j = e == null ? void 0 : e.config) != null && j._isMerged)
|
|
329
334
|
return e.config;
|
|
330
335
|
}
|
|
331
336
|
const t = {}, n = {}, r = {};
|
|
332
337
|
this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([u, m]) => {
|
|
333
338
|
var F, L;
|
|
334
|
-
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;
|
|
335
340
|
if (!v[a]) {
|
|
336
341
|
if (g.length === 0 && (v[a] = m), g.length === 1) {
|
|
337
342
|
const [p] = g;
|
|
@@ -344,18 +349,18 @@ class hi extends ne {
|
|
|
344
349
|
if (g.length === 3) {
|
|
345
350
|
const [p = "Any", M, X] = g;
|
|
346
351
|
if (M === "Audio" && e.contentType === "Audio") {
|
|
347
|
-
const
|
|
348
|
-
(
|
|
352
|
+
const R = e;
|
|
353
|
+
(R.stickType === p || p === "Any") && R.data.appearance === X && (v[a] = m);
|
|
349
354
|
}
|
|
350
355
|
}
|
|
351
356
|
}
|
|
352
357
|
});
|
|
353
|
-
const f = (
|
|
354
|
-
|
|
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]) => {
|
|
355
360
|
G.forEach((a) => {
|
|
356
|
-
(u === "PanoramaLike" &&
|
|
361
|
+
(u === "PanoramaLike" && S(a) || u === "ModelLike" && z(a)) && (P[a] = y({}, c, ...Object.values(m), f, { _isMerged: !0 }));
|
|
357
362
|
});
|
|
358
|
-
}),
|
|
363
|
+
}), $(r).forEach(([u, m]) => {
|
|
359
364
|
const a = P[u];
|
|
360
365
|
P[u] = y({}, c, a, ...Object.values(m), f, { _isMerged: !0 });
|
|
361
366
|
});
|
package/libs/base/BasePlugin.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
function A() {
|
|
2
2
|
console.debug(
|
|
3
|
-
"%c %c@realsee/dnalogel %cv3.34.0-dev.
|
|
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",
|