@realsee/dnalogel 3.10.0 → 3.10.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.
- package/dist/index.cjs.js +23 -23
- package/dist/index.js +311 -310
- package/dist/index.umd.js +22 -22
- package/libs/PanoTagPlugin/controller/TagComputer.js +9 -8
- package/libs/base/BasePlugin.js +1 -1
- package/libs/shared-utils/logger.js +1 -1
- package/package.json +2 -2
|
@@ -12,7 +12,7 @@ var M = (b, e, i) => e in b ? $(b, e, { enumerable: !0, configurable: !0, writab
|
|
|
12
12
|
}, D = (b, e) => w(b, E(e));
|
|
13
13
|
import * as F from "three";
|
|
14
14
|
import { is3DTag as z, isMediaModelTag as R } from "../utils/tag/tagCheck.js";
|
|
15
|
-
import { getTagCenterPosition as
|
|
15
|
+
import { getTagCenterPosition as C, getTagPosition as O } from "../utils/tagPosition.js";
|
|
16
16
|
import { checkRange as h } from "../utils/checkRange.js";
|
|
17
17
|
import { isPanoramaLike as y, isModelLike as Z } from "../../shared-utils/five/mode.js";
|
|
18
18
|
import "hammerjs";
|
|
@@ -64,7 +64,8 @@ import "../utils/tag/adaptConfig.js";
|
|
|
64
64
|
import "../../shared-utils/typescript/entries.js";
|
|
65
65
|
import "../../shared-utils/url/getUrl.js";
|
|
66
66
|
import "../../shared-utils/five/transformPosition.js";
|
|
67
|
-
const
|
|
67
|
+
const I = new F.Raycaster();
|
|
68
|
+
I.params.Points.threshold = 0.1;
|
|
68
69
|
class Je extends H {
|
|
69
70
|
constructor(e) {
|
|
70
71
|
super(e);
|
|
@@ -254,7 +255,7 @@ class Je extends H {
|
|
|
254
255
|
* @description 一个点的标签
|
|
255
256
|
*/
|
|
256
257
|
getTagProject(e) {
|
|
257
|
-
const i =
|
|
258
|
+
const i = C(e);
|
|
258
259
|
if (!i)
|
|
259
260
|
return;
|
|
260
261
|
const { x: f, y: t, z: o } = i.project(this.five.camera);
|
|
@@ -271,20 +272,20 @@ class Je extends H {
|
|
|
271
272
|
(() => {
|
|
272
273
|
var g;
|
|
273
274
|
const v = (g = f.checkPoints) != null ? g : "center";
|
|
274
|
-
return v === "center" ?
|
|
275
|
+
return v === "center" ? C(e) : v === "corner" ? O(e) : Array.isArray(v) ? v : [];
|
|
275
276
|
})()
|
|
276
277
|
);
|
|
277
278
|
let s = 0, c = 0;
|
|
278
279
|
for (const v of d) {
|
|
279
280
|
const g = new F.Vector3().subVectors(v, o).normalize();
|
|
280
|
-
|
|
281
|
-
const P = o.distanceTo(v), [l] = this.five.model.intersectRaycaster(
|
|
281
|
+
I.set(o, g);
|
|
282
|
+
const P = o.distanceTo(v), [l] = this.five.model.intersectRaycaster(I), p = (() => {
|
|
282
283
|
if (!R(e))
|
|
283
284
|
return;
|
|
284
285
|
const V = this.tags.filter(R).map((A) => {
|
|
285
286
|
var T;
|
|
286
287
|
return (T = A.model) == null ? void 0 : T.object;
|
|
287
|
-
}).filter(q), [B] =
|
|
288
|
+
}).filter(q), [B] = I.intersectObjects(V, !0);
|
|
288
289
|
return B;
|
|
289
290
|
})(), S = (r = f.distanceAccuracy) != null ? r : 0.01;
|
|
290
291
|
Math.min((a = l == null ? void 0 : l.distance) != null ? a : 1 / 0, (u = p == null ? void 0 : p.distance) != null ? u : 1 / 0) + S >= P ? s++ : c++;
|
|
@@ -306,7 +307,7 @@ class Je extends H {
|
|
|
306
307
|
var o, d, s, c, n, r, a;
|
|
307
308
|
let i = 0;
|
|
308
309
|
const f = (o = e.fiveState) == null ? void 0 : o.panoIndex;
|
|
309
|
-
f !== void 0 ? i = (d = this.work.observers[f]) == null ? void 0 : d.floorIndex : i = N(this.work, (a = (r = (c = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : c.position) != null ? r : (n = e.mediaPlane) == null ? void 0 : n.position) != null ? a :
|
|
310
|
+
f !== void 0 ? i = (d = this.work.observers[f]) == null ? void 0 : d.floorIndex : i = N(this.work, (a = (r = (c = (s = e.model) == null ? void 0 : s.object) == null ? void 0 : c.position) != null ? r : (n = e.mediaPlane) == null ? void 0 : n.position) != null ? a : C(e));
|
|
310
311
|
const t = this.five.model.shownFloor;
|
|
311
312
|
return t === null || t === i;
|
|
312
313
|
}
|
package/libs/base/BasePlugin.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
function A() {
|
|
2
2
|
console.debug(
|
|
3
|
-
"%c %c@realsee/dnalogel %cv3.10.
|
|
3
|
+
"%c %c@realsee/dnalogel %cv3.10.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.10.
|
|
10
|
+
"version": "3.10.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*",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@babel/core": "^7.22.9",
|
|
39
|
-
"@realsee/five": "6.0.0-alpha.
|
|
39
|
+
"@realsee/five": "6.0.0-alpha.57",
|
|
40
40
|
"@sveltejs/vite-plugin-svelte": "^2.4.2",
|
|
41
41
|
"@tsconfig/svelte": "^4.0.1",
|
|
42
42
|
"@tweenjs/tween.js": "^20.0.3",
|