@3driseai/3drise-viewer 0.1.39 → 0.1.41

package/dist/shaders/clouds/CloudVolumeMaterial.js

@@ -40,6 +40,12 @@ uniform vec2  u_resolution;
 uniform int   u_steps;
 uniform float u_stepGrowth, u_maxSpan, u_fogDensity, u_detailFade;
 uniform float u_screenSpace;
+// Layer path only. The march runs at a quarter of the cloud buffer's pixels and each
+// frame picks one of the four half-res pixels under every march texel; this shifts the
+// ray onto that pixel's centre. The resolve pass rebuilds the full buffer from it.
+uniform vec2  u_uvOffset;
+// Floor on the fine step, in metres, from the detail noise size (see applyDeckUniforms).
+uniform float u_minStep;
 
 // Lightning. Declared here rather than in the shared cloudUniforms chunk so the
 // exported cloudField, which host apps pull into their own surface materials for
@@ -59,7 +65,7 @@ float ign(vec2 p){
 }
 
 void main(){
-  vec2 uv = (u_screenSpace > 0.5) ? vUv : (gl_FragCoord.xy / u_resolution);
+  vec2 uv = (u_screenSpace > 0.5) ? (vUv + u_uvOffset) : (gl_FragCoord.xy / u_resolution);
   vec2 ndc = uv * 2.0 - 1.0;
 
   vec4 vp = u_invProj * vec4(ndc, -1.0, 1.0);
@@ -98,7 +104,11 @@ void main(){
       // spans 100 km; dividing that by the step budget gives kilometre steps and every
       // feature dissolves into fog. Empty space is skipped 2.8x coarser, and the step
       // grows with distance to hold screen-space error roughly constant.
-      float dt0 = min(thick * 2.0 / float(u_steps), span / 8.0);
+      //
+      // The floor is the other half: a step much finer than the detail noise samples
+      // the same erosion feature many times over. On a shallow deck the depth-derived
+      // step can be a fraction of that, which costs samples and buys nothing visible.
+      float dt0 = min(max(thick * 2.0 / float(u_steps), u_minStep), span / 8.0);
       dt0 = max(dt0, thick * 0.004);
       float big = dt0 * 2.8;
 
@@ -279,7 +289,9 @@ export const cloudVolumeDefaults = {
     u_near: 1,
     u_far: 100000,
     u_resolution: new THREE.Vector2(1, 1),
-    u_screenSpace: 0
+    u_screenSpace: 0,
+    u_uvOffset: new THREE.Vector2(0, 0),
+    u_minStep: 0
 };
 export const CloudVolumeMaterial = shaderMaterial(cloudVolumeDefaults, vertex, fragment);
 extend({ CloudVolumeMaterial });

package/dist/triggers/kinds/gallery.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=gallery.d.ts.map

package/dist/triggers/kinds/gallery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gallery.d.ts","sourceRoot":"","sources":["../../../src/triggers/kinds/gallery.ts"],"names":[],"mappings":""}

package/dist/triggers/kinds/gallery.js

@@ -0,0 +1,39 @@
+// Triggerable: a gallery object's navigation (GalleryRuntime) — next / prev / goTo / pause / resume.
+// `ref` is the gallery's scene object id; the engine waits for it to mount (targets). Or, for a scene
+// with several galleries: GALLERY_ALL (every gallery steps together) or GALLERY_IN_VIEW (the one the
+// viewer is looking at, decided when it runs — nothing when none is on screen). An event kind:
+// a cue fires it when the playhead crosses it, an interaction on click, code / the agent at once.
+import GalleryRuntime, { GALLERY_ALL, GALLERY_IN_VIEW } from '../../galleryRuntime.js';
+import { defineTriggerable } from '../registry.js';
+defineTriggerable({
+    kind: 'gallery',
+    commands: ['next', 'prev', 'goTo', 'pause', 'resume'],
+    timeline: 'event',
+    // The special refs wait for nothing: they mean whatever is mounted when the command runs.
+    targets: (c) => (c.ref === GALLERY_ALL || c.ref === GALLERY_IN_VIEW ? [] : [c.ref]),
+    subject: (c) => `gallery ${c.ref}${c.command === 'goTo' ? ` #${c.index ?? 0}` : ''}`,
+    run: (c) => {
+        for (const id of GalleryRuntime.resolve(c.ref)) {
+            const g = GalleryRuntime.get(id);
+            if (!g)
+                continue;
+            switch (c.command) {
+                case 'next':
+                    g.next();
+                    break;
+                case 'prev':
+                    g.prev();
+                    break;
+                case 'goTo':
+                    g.goTo(Number(c.index) || 0);
+                    break;
+                case 'pause':
+                    g.pause();
+                    break;
+                case 'resume':
+                    g.resume();
+                    break;
+            }
+        }
+    },
+});

package/dist/triggers/kinds/index.d.ts

@@ -2,4 +2,5 @@ import './effects';
 import './action';
 import './animations';
 import './change';
+import './gallery';
 //# sourceMappingURL=index.d.ts.map

package/dist/triggers/kinds/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/triggers/kinds/index.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,CAAC;AACnB,OAAO,UAAU,CAAC;AAClB,OAAO,cAAc,CAAC;AACtB,OAAO,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/triggers/kinds/index.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,CAAC;AACnB,OAAO,UAAU,CAAC;AAClB,OAAO,cAAc,CAAC;AACtB,OAAO,UAAU,CAAC;AAClB,OAAO,WAAW,CAAC"}

package/dist/triggers/kinds/index.js

@@ -3,3 +3,4 @@ import './effects.js';
 import './action.js';
 import './animations.js';
 import './change.js';
+import './gallery.js';

package/dist/ui/UiAnchorUpdater.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UiAnchorUpdater.d.ts","sourceRoot":"","sources":["../../src/ui/UiAnchorUpdater.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAmB,OAAO,EAAE,KAAK,MAAM,EAAiB,KAAK,KAAK,EAAE,MAAM,OAAO,CAAC;AAoCzF,4DAA4D;AAC5D,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,QAMzI;AAID,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CA0C9G;AAID,MAAM,CAAC,OAAO,UAAU,eAAe,QAMtC"}
+{"version":3,"file":"UiAnchorUpdater.d.ts","sourceRoot":"","sources":["../../src/ui/UiAnchorUpdater.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAmB,OAAO,EAAE,KAAK,MAAM,EAAiB,KAAK,KAAK,EAAE,MAAM,OAAO,CAAC;AAqCzF,4DAA4D;AAC5D,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,QAMzI;AAID,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CA0C9G;AAID,MAAM,CAAC,OAAO,UAAU,eAAe,QAMtC"}

package/dist/ui/UiAnchorUpdater.js

@@ -13,6 +13,7 @@
 import { useFrame } from '@react-three/fiber';
 import { Box3, Raycaster, Vector3 } from 'three';
 import { findById, findByName } from '../utils/sceneQuery.js';
+import { shownInScene } from '../utils/shownInScene.js';
 import { uiAnchors } from './uiAnchors.js';
 const BOX_EVERY = 8; // frames between bounding-box refreshes
 const OCCLUDE_EVERY = 6; // frames between occlusion raycasts
@@ -93,7 +94,7 @@ export function updateAnchors(camera, scene, width, height, frame) {
             const dist = dir.length();
             _ray.set(from, dir.normalize());
             _ray.far = Math.max(0, dist - 0.02);
-            const hits = _ray.intersectObjects(scene.children, true).filter(h => h.object.isMesh && h.object.visible && !insideSubtree(h.object, target));
+            const hits = _ray.intersectObjects(scene.children, true).filter(h => h.object.isMesh && shownInScene(h.object) && !insideSubtree(h.object, target));
             entry.el.toggleAttribute('data-occluded', hits.length > 0);
         }
         else if (!entry.occlude) {

package/dist/utils/cursorPicking.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursorPicking.d.ts","sourceRoot":"","sources":["../../src/utils/cursorPicking.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;CACpC;AAUD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,OAAO,GAAG,gBAAgB,CA0BlN"}
+{"version":3,"file":"cursorPicking.d.ts","sourceRoot":"","sources":["../../src/utils/cursorPicking.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;CACpC;AAUD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,OAAO,GAAG,gBAAgB,CA0BlN"}

package/dist/utils/cursorPicking.js

@@ -1,9 +1,10 @@
 import * as THREE from 'three';
+import { shownInScene } from './shownInScene.js';
 const tmpPlane = new THREE.Plane();
 const tmpNormal = new THREE.Vector3();
 const tmpHitPoint = new THREE.Vector3();
 function pickSceneHit(raycaster, scene) {
-    const hits = raycaster.intersectObjects(scene.children, true);
+    const hits = raycaster.intersectObjects(scene.children, true).filter(h => shownInScene(h.object));
     return hits.find(h => h.object.userData.interactible === true) ?? hits[0] ?? null;
 }
 export function pickCursorWorldPos(mode, raycaster, scene, camera, pointer, planeDistance, out) {

package/dist/utils/shownInScene.d.ts

@@ -0,0 +1,13 @@
+import type { Intersection, Object3D } from 'three';
+/**
+ * Whether an Object3D is really shown: it and every ancestor up to the scene are visible.
+ *
+ * Three draws nothing under a hidden parent, but its Raycaster (and R3F's pointer events)
+ * ignore `visible` — so without this, objects inside a disabled group still catch hover /
+ * click, block clicks on what is behind them and occlude UI anchors.
+ * Pick proxies hide through `material.visible`, not `visible`, so they are unaffected.
+ */
+export declare function shownInScene(obj: Object3D | null | undefined): boolean;
+/** Ray hits on objects that are really shown (see shownInScene). */
+export declare const shownHits: <T extends Intersection>(hits: T[]) => T[];
+//# sourceMappingURL=shownInScene.d.ts.map

package/dist/utils/shownInScene.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shownInScene.d.ts","sourceRoot":"","sources":["../../src/utils/shownInScene.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEpD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAGtE;AAED,oEAAoE;AACpE,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,YAAY,EAAE,MAAM,CAAC,EAAE,KAAG,CAAC,EAA8C,CAAC"}

package/dist/utils/shownInScene.js

@@ -0,0 +1,16 @@
+/**
+ * Whether an Object3D is really shown: it and every ancestor up to the scene are visible.
+ *
+ * Three draws nothing under a hidden parent, but its Raycaster (and R3F's pointer events)
+ * ignore `visible` — so without this, objects inside a disabled group still catch hover /
+ * click, block clicks on what is behind them and occlude UI anchors.
+ * Pick proxies hide through `material.visible`, not `visible`, so they are unaffected.
+ */
+export function shownInScene(obj) {
+    for (let o = obj; o; o = o.parent)
+        if (!o.visible)
+            return false;
+    return true;
+}
+/** Ray hits on objects that are really shown (see shownInScene). */
+export const shownHits = (hits) => hits.filter(h => shownInScene(h.object));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3driseai/3drise-viewer",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@3driseai/3drise-common": "^1.0.1",
-    "@3driseai/3drise-core": "^1.0.28",
+    "@3driseai/3drise-core": "^1.0.30",
     "three-mesh-bvh": "^0.8.3"
   }
 }