npm - @realsee/dnalogel - Versions diffs - 3.64.23-alpha.3 → 3.64.23-ke-webgpu.1 - Mend

@realsee/dnalogel 3.64.23-alpha.3 → 3.64.23-ke-webgpu.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.

Files changed (960) hide show

package/libs/GuideLinePlugin/GuideLineModeItem.d.ts CHANGED Viewed

@@ -1,13 +1,49 @@
 import type GuideLinePlugin from './Controller';
-import type { Five } from '@realsee/five';
+import type { Five } from '@realsee/five-webgpu';
 import type { Tag } from '../PanoTagPlugin';
 import type * as PluginType from './typing';
 import type { GuideLineItem } from './GuideLineItem';
 import * as THREE from 'three';
+import { MeshBasicNodeMaterial } from 'three/webgpu';
 import { PanoTagPluginController } from '../PanoTagPlugin';
 import CustomTag from './Components/Tag.svelte';
 /** @link https://threejs.org/docs/index.html#api/en/extras/curves/CatmullRomCurve3 */
 type CatmullRomCurve3RestParams = Omit<PluginType.CatmullRomCurve3, 'type' | 'points'>;
+/**
+ * 导览线材质。原为 `ShaderMaterial` + 约 100 行手写 GLSL，WebGPU 不消费裸 GLSL，改为 TSL。
+ *
+ * 迁移时核对出三处**死代码**，已一并去掉（均非行为改动）：
+ *
+ * 1. **`animationWillError` 顶点属性从未写入几何体**。
+ *    `utils/createLineGeometry.ts:276` 的 `geometry.setAttribute('animationWillError', ...)`
+ *    是注释掉的，属性缺失时 GLSL 里读到的恒为 0，因此 `ignoreAnimationMap == 1.0`
+ *    那条「返回全透明」的分支永远不会命中。整个属性与 varying 都删除。
+ * 2. **`distanceOpacity()` 恒返回 1.0**，函数体只有 `return 1.0;`，乘上去无任何作用。
+ * 3. **`flicker` uniform 从未被更新**。`flicker()` 方法走的是 `blink()`（作用于 group 与 DOM），
+ *    并不碰这个 uniform，它一直保持初始值 1。
+ *
+ * 另外把自定义的 `opacity` uniform 换成 three 内置的 `material.opacity`（TSL 的 `materialOpacity`）。
+ * 原因：`blink()` 里对 ShaderMaterial 的分支写的是 `material.uniforms.opacity.value`，
+ * 换成 NodeMaterial 后它会落到 `else` 分支去写 `material.opacity`。
+ * 让节点链乘上 `materialOpacity`，既保住插件自己的 `setOpacity()`，也让 `blink()` 的闪烁动画继续生效——
+ * 与原实现「两者共用同一个 opacity 通道」的行为一致。
+ */
+declare class GuideLineMaterial extends MeshBasicNodeMaterial {
+    readonly setMap: (texture: THREE.Texture | null) => void;
+    readonly setUseMapColor: (use: boolean) => void;
+    readonly setMapColor: (color: THREE.Color) => void;
+    readonly setMapOpacity: (value: number) => void;
+    readonly setBackgroundColor: (color: THREE.Color) => void;
+    readonly setBackgroundOpacity: (value: number) => void;
+    readonly setBorderColor: (color: THREE.Color) => void;
+    readonly setBorderOpacity: (value: number) => void;
+    /** 0 = border-box，1 = padding-box */
+    readonly setBackgroundClip: (value: number) => void;
+    readonly setBorderWidth: (value: number) => void;
+    readonly setMaxV: (value: number) => void;
+    readonly setVOffset: (value: number) => void;
+    constructor();
+}
 export interface GuideLineTagContainer {
     tag: Tag<'Custom', '2DPoint'> | null;
     plugin: PanoTagPluginController;
@@ -30,7 +66,7 @@ declare class GuideLineModeItem {
     materialStyle: PluginType.GuideLineMaterialStyle;
     meshStyle: PluginType.GuideLineMeshStyle;
     readonly group: THREE.Group;
-    readonly mesh: THREE.Mesh<THREE.BufferGeometry, THREE.ShaderMaterial>;
+    readonly mesh: THREE.Mesh<THREE.BufferGeometry, GuideLineMaterial>;
     visible: boolean | null;
     private five;
     private mode;

package/libs/GuideLinePlugin/GuideLineModeItem.js CHANGED Viewed

@@ -1,19 +1,18 @@
 import "three";
+import "three/webgpu";
+import "three/tsl";
 import "../shared-utils/log.js";
 import "./utils/createLineGeometry.js";
 import "../shared-utils/tag.js";
 import "../shared-utils/five/mode.js";
 import "../vendor/hammerjs/hammer.js";
 import "../shared-utils/three/PointSelector/index.js";
-import "../shared-utils/three/CSS3DRenderer/index.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "@realsee/five/line";
+import "three/examples/jsm/lines/LineGeometry.js";
 import "../shared-utils/isNil.js";
-import "../shared-utils/three/core/Five_LineMaterial2.js";
+import "three/examples/jsm/lines/webgpu/Line2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "../shared-utils/three/blink.js";
-import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../shared-utils/animationFrame/BetterTween.js";
 import "../shared-utils/five/FivePuppet.js";
 import "../shared-utils/three/loadTexture.js";
@@ -22,7 +21,7 @@ import "./Components/Tag.js";
 import "./utils/index.js";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "./utils/createPath.js";
-import { GuideLineModeItem as Tm } from "./GuideLineModeItem/index.js";
+import { GuideLineModeItem as Qm } from "./GuideLineModeItem/index.js";
 import "../vendor/polyline-normals/index.js";
 import "../vendor/polyline-miter-util/index.js";
 import "../vendor/gl-vec2/add.js";
@@ -46,6 +45,7 @@ import "../shared-utils/five/fiveEveryReadyListener.js";
 import "../shared-utils/throttle.js";
 import "../shared-utils/five/fiveModelLoad.js";
 import "../vendor/animejs/lib/anime.es.js";
+import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../shared-utils/three/Magnifier.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper.js";
@@ -55,6 +55,7 @@ import "../shared-utils/even.js";
 import "../shared-utils/CSS3DRender/OpacityMesh.js";
 import "../shared-utils/three/centerPoint.js";
 import "../shared-utils/three/getObjectVisible.js";
+import "../shared-utils/three/CSS3DRenderer/index.js";
 import "../shared-utils/three/PointSelector/utils/html.js";
 import "../shared-utils/CSS3DRender/index.js";
 import "../shared-utils/CSS3DRender/CSS3DRenderer.js";
@@ -78,10 +79,7 @@ import "../shared-utils/five/getPosition.js";
 import "../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../shared-utils/three/PointSelector/utils/contents.js";
 import "../Sculpt/utils/three/rayOnLine.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
-import "../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-import "@realsee/five";
+import "@realsee/five-webgpu";
 import "../shared-utils/animationFrame/index.js";
 import "../PanoTagPlugin/utils/tag/tagCheck.js";
 import "../PanoTagPlugin/utils/debounce.js";
@@ -90,7 +88,6 @@ import "../PanoTagPlugin/utils/tag/format.js";
 import "../shared-utils/audio.js";
 import "../PanoTagPlugin/controller/TagRender.js";
 import "../PanoTagPlugin/controller/TagUtil.js";
-import "../PanoTagPlugin/typings/tag/TagConfig.js";
 import "../PanoTagPlugin/tag.config.js";
 import "../PanoTagPlugin/utils/normalPositionToPositions.js";
 import "../vendor/svelte/store/index.js";
@@ -110,14 +107,15 @@ import "../shared-utils/five/calculateThreeMouse.js";
 import "../PanoTagPlugin/utils/Cache.js";
 import "../base/BasePlugin.js";
 import "../shared-utils/url/absoluteUrl.js";
-import "../shared-utils/typescript/entries.js";
-import "../PanoTagPlugin/utils/tag/adaptConfig.js";
 import "../PanoTagPlugin/utils/DebugUtil.js";
 import "../shared-utils/safeObj.js";
 import "../PanoTagPlugin/utils/addDebugPoints.js";
 import "../PanoTagPlugin/controller/Tag/PointTag.js";
 import "../PanoTagPlugin/controller/Tag/BaseTag.js";
 import "../PanoTagPlugin/utils/tag/calculateTagConfig.js";
+import "../shared-utils/typescript/entries.js";
+import "../PanoTagPlugin/utils/tag/adaptConfig.js";
+import "../PanoTagPlugin/typings/tag/TagConfig.js";
 import "../shared-utils/vectorToCoordinate.js";
 import "../shared-utils/formatRad.js";
 import "../shared-utils/five/lookPoint.js";
@@ -130,7 +128,6 @@ import "../shared-utils/promise/withResolvers.js";
 import "../PanoTagPlugin/controller/Tag/ModelTag.js";
 import "../shared-utils/CSS3DRender/CSS3DObject.js";
 import "../shared-utils/three/GLTFLoader.js";
-import "@realsee/five/gltf-loader";
 import "../PanoTagPlugin/utils/planeNormal.js";
 import "../PanoTagPlugin/Components/Tag/index.js";
 import "../PanoTagPlugin/Components/Tag/TextTag/index.js";
@@ -204,5 +201,5 @@ import "../PanoTagPlugin/Components/TagContainer.js";
 import "../PanoTagPlugin/Components/TagItem.js";
 import "../PanoTagPlugin/Components/Common/TagPoint.js";
 export {
-  Tm as GuideLineModeItem
+  Qm as GuideLineModeItem
 };

package/libs/GuideLinePlugin/index.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { Five } from '@realsee/five';
+import type { Five } from '@realsee/five-webgpu';
 import Controller from './Controller';
 import type * as GuideLinePluginType from './typing';
 import * as GuideLineItem from './GuideLineItem';

package/libs/GuideLinePlugin/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import t from "./Controller.js";
-import { GuideLineItem$1 as sr } from "./GuideLineItem/index.js";
-import { GuideLineModeItem$1 as fr } from "./GuideLineModeItem/index.js";
+import { GuideLineItem$1 as Gr } from "./GuideLineItem/index.js";
+import { GuideLineModeItem$1 as lr } from "./GuideLineModeItem/index.js";
 import "../base/BasePluginWithData.js";
 import "../base/BasePlugin.js";
 import "../shared-utils/Subscribe.js";
@@ -23,6 +23,8 @@ import "../shared-utils/three/PointSelector/index.js";
 import "../shared-utils/three/PointSelector/utils/PointSelectorHelper.js";
 import "../shared-utils/three/Magnifier.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper.js";
+import "three/webgpu";
+import "three/tsl";
 import "../shared-utils/three/Assets/index.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../shared-utils/even.js";
@@ -31,36 +33,32 @@ import "../shared-utils/three/centerPoint.js";
 import "../shared-utils/three/getObjectVisible.js";
 import "../shared-utils/three/CSS3DRenderer/index.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "@realsee/five/line";
+import "three/examples/jsm/lines/LineGeometry.js";
 import "../shared-utils/isNil.js";
-import "../shared-utils/three/core/Five_LineMaterial2.js";
+import "three/examples/jsm/lines/webgpu/Line2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "../vendor/animejs/lib/anime.es.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import "../shared-utils/CSS3DRender/CSS3DRenderer.js";
-import "../shared-utils/createResizeObserver.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
-import "../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
-import "../shared-utils/util.js";
-import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
+import "../shared-utils/five/FivePuppet.js";
+import "@realsee/five-webgpu";
+import "../shared-utils/five/fiveModelLoad.js";
 import "../shared-utils/three/PointSelector/utils/html.js";
 import "../shared-utils/CSS3DRender/index.js";
-import "../shared-utils/five/fiveModelLoad.js";
+import "../shared-utils/CSS3DRender/CSS3DRenderer.js";
+import "../shared-utils/createResizeObserver.js";
 import "../shared-utils/three/PointSelector/utils/PointHelper2.js";
 import "../Sculpt/Meshes/Line.js";
 import "../Sculpt/typings/style.js";
 import "../shared-utils/three/IObject3D.js";
 import "../Sculpt/utils/Meshes/getLengthHTML.js";
 import "../shared-utils/three/applyObjectMatrixWorld.js";
+import "../shared-utils/util.js";
 import "../shared-utils/three/core/LineGeometry.js";
 import "../shared-utils/three/core/LineMaterial.js";
 import "../shared-utils/three/core/Line2.js";
 import "../shared-utils/three/core/LineMaterial2.js";
 import "../Sculpt/utils/unit.js";
 import "../Sculpt/utils/renderDom.js";
-import "../shared-utils/five/FivePuppet.js";
-import "@realsee/five";
 import "../CSS3DRenderPlugin/utils/three/CSS3DSprite.js";
 import "../shared-utils/isTouchDevice.js";
 import "../shared-utils/five/getPosition.js";
@@ -105,7 +103,6 @@ import "../PanoTagPlugin/utils/tag/format.js";
 import "../shared-utils/audio.js";
 import "../PanoTagPlugin/controller/TagRender.js";
 import "../PanoTagPlugin/controller/TagUtil.js";
-import "../PanoTagPlugin/typings/tag/TagConfig.js";
 import "../PanoTagPlugin/tag.config.js";
 import "../PanoTagPlugin/utils/normalPositionToPositions.js";
 import "../vendor/svelte/store/index.js";
@@ -123,14 +120,15 @@ import "../shared-utils/constants.js";
 import "../shared-utils/five/FiveDomEvents.js";
 import "../shared-utils/five/calculateThreeMouse.js";
 import "../PanoTagPlugin/utils/Cache.js";
-import "../shared-utils/typescript/entries.js";
-import "../PanoTagPlugin/utils/tag/adaptConfig.js";
 import "../PanoTagPlugin/utils/DebugUtil.js";
 import "../shared-utils/safeObj.js";
 import "../PanoTagPlugin/utils/addDebugPoints.js";
 import "../PanoTagPlugin/controller/Tag/PointTag.js";
 import "../PanoTagPlugin/controller/Tag/BaseTag.js";
 import "../PanoTagPlugin/utils/tag/calculateTagConfig.js";
+import "../shared-utils/typescript/entries.js";
+import "../PanoTagPlugin/utils/tag/adaptConfig.js";
+import "../PanoTagPlugin/typings/tag/TagConfig.js";
 import "../shared-utils/five/lookPoint.js";
 import "../PanoTagPlugin/utils/tagPosition.js";
 import "../PanoTagPlugin/utils/checkRange.js";
@@ -140,7 +138,6 @@ import "../shared-utils/promise/withResolvers.js";
 import "../PanoTagPlugin/controller/Tag/ModelTag.js";
 import "../shared-utils/CSS3DRender/CSS3DObject.js";
 import "../shared-utils/three/GLTFLoader.js";
-import "@realsee/five/gltf-loader";
 import "../PanoTagPlugin/utils/planeNormal.js";
 import "../PanoTagPlugin/Components/Tag/index.js";
 import "../PanoTagPlugin/Components/Tag/TextTag/index.js";
@@ -221,10 +218,10 @@ import "../shared-utils/five/changeMode.js";
 import "../shared-utils/nearlyEqual.js";
 import "../CruisePlugin/Move.js";
 import "../CruisePlugin/utils/getFiveStateOnCurve.js";
-const r = (i, o) => new t(i, o), Gr = r;
+const r = (i, o) => new t(i, o), nr = r;
 export {
-  sr as GuideLineItem,
-  fr as GuideLineModeItem,
+  Gr as GuideLineItem,
+  lr as GuideLineModeItem,
   r as GuideLinePlugin,
-  Gr as default
+  nr as default
 };

package/libs/GuideLinePlugin/utils/createLineGeometry.d.ts CHANGED Viewed

@@ -18,13 +18,13 @@ interface LineGeometryOption {
  * @returns THREE BufferGeometry
  */
 export declare function createLineGeometry(options: LineGeometryOption): {
-    geometry: THREE.BufferGeometry;
+    geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>;
     maxV: number;
     curvePath: any;
     curvePoints: any;
     animationWillError?: undefined;
 } | {
-    geometry: THREE.BufferGeometry;
+    geometry: THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>;
     maxV: number;
     animationWillError: {
         start: number;

package/libs/GuideLinePlugin/utils/createLineGeometry.js CHANGED Viewed

@@ -104,7 +104,12 @@ function at(s) {
   var T, v;
   if (ft(s)) {
     const y = s.points.map((p) => new i.Vector3().fromArray(p));
-    return new i.CatmullRomCurve3(y, (T = s.closed) != null ? T : !1, (v = s.curve_type) != null ? v : "centripetal", s.tension);
+    return new i.CatmullRomCurve3(
+      y,
+      (T = s.closed) != null ? T : !1,
+      (v = s.curve_type) != null ? v : "centripetal",
+      s.tension
+    );
   }
 }
 function ft(s) {

package/libs/GuideLinePlugin/utils/createPath.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import type { Work } from '@realsee/five';
+import type { Work } from '@realsee/five-webgpu';
 import type { CatmullRomCurve3, ExtraRouteData } from '../typing';
 export declare function createPath(panoIndexList: number[], work: Work, options?: Omit<CatmullRomCurve3, 'type' | 'points'> & ExtraRouteData): CatmullRomCurve3[];

package/libs/GuideLinePlugin/utils/getArrowMaterial.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import * as e from "three";
-function n(a) {
+function o(a) {
   const r = new e.TextureLoader().load(a.textureUrl);
-  return r.wrapS = r.wrapT = e.RepeatWrapping, r.encoding = e.sRGBEncoding, r.minFilter = e.LinearFilter, new e.MeshBasicMaterial({
+  return r.wrapS = r.wrapT = e.RepeatWrapping, r.colorSpace = e.SRGBColorSpace, r.minFilter = e.LinearFilter, new e.MeshBasicMaterial({
     color: 16777215,
     map: r,
     transparent: !0,
@@ -9,5 +9,5 @@ function n(a) {
   });
 }
 export {
-  n as getArrowMaterial
+  o as getArrowMaterial
 };

package/libs/GuideLinePlugin/utils/getPoint.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import * as THREE from 'three';
-export default function getPoint(position?: THREE.Vector3, colorIndex?: number): THREE.Mesh<THREE.SphereGeometry, THREE.MeshBasicMaterial>;
+export default function getPoint(position?: THREE.Vector3, colorIndex?: number): THREE.Mesh<THREE.SphereGeometry, THREE.MeshBasicMaterial, THREE.Object3DEventMap>;
 export declare function getAllMesh(): any[];