@realsee/dnalogel 3.3.0 → 3.3.1
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.
|
@@ -27,7 +27,7 @@ var S = (c, l, t) => new Promise((e, o) => {
|
|
|
27
27
|
a((t = t.apply(c, l)).next());
|
|
28
28
|
});
|
|
29
29
|
import { TagComputer as x } from "./TagComputer.js";
|
|
30
|
-
import { Group as y, Quaternion as O, Vector3 as
|
|
30
|
+
import { Group as y, Quaternion as O, Vector3 as b, Matrix4 as v } from "three";
|
|
31
31
|
import I from "../Components/TagContainer.js";
|
|
32
32
|
import G from "../Components/Tag/index.js";
|
|
33
33
|
import { CSS3DRenderPlugin as F } from "../../CSS3DRenderPlugin/index.js";
|
|
@@ -203,7 +203,7 @@ class ui extends x {
|
|
|
203
203
|
t.mediaPlane = new k(t.data.mediaData[0].url, t.data.mediaPosition.map(g), {
|
|
204
204
|
objectFit: t.data.objectFit
|
|
205
205
|
});
|
|
206
|
-
const n = new
|
|
206
|
+
const n = new b().addVectors(r[0], r[2]).divideScalar(2);
|
|
207
207
|
t.mediaPlane.position.copy(n), i.add(t.mediaPlane);
|
|
208
208
|
}
|
|
209
209
|
this.getRenderType(t) !== "Mesh" && (i.updateTagCss3DObjectMatrix = () => this.updateTagCss3DObjectMatrix(t, i), i.updateTagCss3DObjectMatrix());
|
|
@@ -262,8 +262,8 @@ class ui extends x {
|
|
|
262
262
|
d.onVideoReady = (u) => {
|
|
263
263
|
u.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: d.videoInstance }));
|
|
264
264
|
};
|
|
265
|
-
const
|
|
266
|
-
d.initialRenderHooks(
|
|
265
|
+
const T = (u) => (this.five.on("renderFrame", u), () => this.five.off("renderFrame", u));
|
|
266
|
+
d.initialRenderHooks(T), e.mediaPlane = d, this.imagePlaneGroup.add(e.mediaPlane);
|
|
267
267
|
}
|
|
268
268
|
});
|
|
269
269
|
}
|
|
@@ -298,7 +298,7 @@ class ui extends x {
|
|
|
298
298
|
}
|
|
299
299
|
return;
|
|
300
300
|
} else {
|
|
301
|
-
if (D(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled
|
|
301
|
+
if (D(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled)
|
|
302
302
|
return;
|
|
303
303
|
if (this.css3DRenderPlugin || (this.css3DRenderPlugin = F(this.five)), e.stickType === "3DPoint" && !e.normal)
|
|
304
304
|
return console.error("updateRenderPlaneTag: 三维点标签缺少法向量!");
|
|
@@ -315,10 +315,10 @@ class ui extends x {
|
|
|
315
315
|
p.container.style.backgroundColor = P, p.container.style.border = `3px solid ${P}`, this.css3DRenderPlugin.hooks.on("render", () => {
|
|
316
316
|
var d;
|
|
317
317
|
if (m.css3DObject.opacityMesh && n.clickable !== !1) {
|
|
318
|
-
const
|
|
318
|
+
const T = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (u) => {
|
|
319
319
|
this.hooks.emit("click", { event: u, target: "TagContent", tag: e });
|
|
320
320
|
});
|
|
321
|
-
(d = this.store.css3DRenderDisposer.get(e.id)) == null || d.push(
|
|
321
|
+
(d = this.store.css3DRenderDisposer.get(e.id)) == null || d.push(T);
|
|
322
322
|
}
|
|
323
323
|
});
|
|
324
324
|
}
|
|
@@ -378,15 +378,15 @@ class ui extends x {
|
|
|
378
378
|
* @param model 模型
|
|
379
379
|
*/
|
|
380
380
|
updateTagCss3DObjectMatrix(t, e) {
|
|
381
|
-
var
|
|
382
|
-
const o = (u = (
|
|
381
|
+
var T, u, M;
|
|
382
|
+
const o = (u = (T = this.getTagConfig(t).tag3DConfig) == null ? void 0 : T.ratio) != null ? u : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
|
|
383
383
|
if (!i)
|
|
384
384
|
return;
|
|
385
385
|
const s = D(t) ? t.data.mediaPosition : t.position;
|
|
386
386
|
if (!s || s.length !== 4 || !Array.isArray(s[0]) || !Array.isArray(s[2]))
|
|
387
387
|
return;
|
|
388
388
|
e.updateWorldMatrix(!1, !1);
|
|
389
|
-
const a = e.matrixWorld, r = new
|
|
389
|
+
const a = e.matrixWorld, r = new b().fromArray(s[0]), n = new b().fromArray(s[2]), p = $(r, n).add(new b(0, 0, 5e-4)), m = new v().setPosition(p), h = new v().makeScale(o, o, o), P = new v().multiply(a).multiply(m).multiply(h);
|
|
390
390
|
P.decompose(i.position, i.quaternion, i.scale);
|
|
391
391
|
const d = i.opacityMesh;
|
|
392
392
|
d && P.decompose(d.position, d.quaternion, d.scale);
|
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.
|
|
3
|
+
"%c %c@realsee/dnalogel %cv3.3.1",
|
|
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",
|
package/package.json
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"repository": "https://github.com/realsee-developer/dnalogel.git",
|
|
8
8
|
"description": "如视 VR 看房插件合集",
|
|
9
9
|
"private": false,
|
|
10
|
-
"version": "3.3.
|
|
10
|
+
"version": "3.3.1",
|
|
11
11
|
"license": "SEE LICENSE IN TERMS.txt",
|
|
12
12
|
"scripts": {
|
|
13
13
|
"clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",
|