pptx-react-viewer 3.21.0 → 4.1.0

package/dist/{SmartArt3DScene-T236GYUT.js → SmartArt3DScene-NHD7CZJ5.js}

@@ -161,9 +161,12 @@ function buildLabelPlane(m, textStyle) {
   const planeMaterial = new chunk3N6AC4HA_js.MeshBasicMaterial({
     map: tex.texture,
     transparent: true,
-    depthWrite: false
+    depthWrite: false,
+    depthTest: false,
+    side: chunk3N6AC4HA_js.DoubleSide
   });
   const plane = new chunk3N6AC4HA_js.Mesh(planeGeo, planeMaterial);
+  plane.renderOrder = 1;
   const euler = new chunk3N6AC4HA_js.Euler(m.rotation.x, m.rotation.y, m.rotation.z);
   const offset = new chunk3N6AC4HA_js.Vector3(0, 0, m.depth + m.bevel + 0.4).applyEuler(euler);
   plane.position.set(m.position.x + offset.x, m.position.y + offset.y, m.position.z + offset.z);
@@ -220,6 +223,13 @@ function buildMeshGroup(model, textStyle) {
         }
       }
     },
+    forEachLabelPlane(fn) {
+      for (const entry of labelEntries) {
+        if (entry.plane) {
+          fn(entry.plane);
+        }
+      }
+    },
     dispose() {
       for (const d of blockDisposables) {
         d.dispose();
@@ -231,6 +241,17 @@ function buildMeshGroup(model, textStyle) {
   };
 }
 var FOV = 42;
+function expandForMesh(expand, m) {
+  const hx = m.halfWidth + m.bevel;
+  const hy = m.halfHeight + m.bevel;
+  const hz = m.depth / 2 + m.bevel;
+  const midZ = m.position.z + m.depth / 2;
+  const cosY = Math.cos(m.rotation.y);
+  const sinY = Math.sin(m.rotation.y);
+  const worldHalfX = Math.abs(hx * cosY) + Math.abs(hz * sinY);
+  const worldHalfZ = Math.abs(hx * sinY) + Math.abs(hz * cosY);
+  expand(m.position.x, m.position.y, midZ, worldHalfX, hy, worldHalfZ);
+}
 function contentSphere(model) {
   let minX = Infinity;
   let minY = Infinity;
@@ -238,32 +259,36 @@ function contentSphere(model) {
   let maxX = -Infinity;
   let maxY = -Infinity;
   let maxZ = -Infinity;
-  const expand = (x, y, z, r) => {
-    minX = Math.min(minX, x - r);
-    minY = Math.min(minY, y - r);
-    minZ = Math.min(minZ, z - r);
-    maxX = Math.max(maxX, x + r);
-    maxY = Math.max(maxY, y + r);
-    maxZ = Math.max(maxZ, z + r);
+  const expand = (x, y, z, rx, ry, rz) => {
+    minX = Math.min(minX, x - rx);
+    minY = Math.min(minY, y - ry);
+    minZ = Math.min(minZ, z - rz);
+    maxX = Math.max(maxX, x + rx);
+    maxY = Math.max(maxY, y + ry);
+    maxZ = Math.max(maxZ, z + rz);
   };
   for (const m of model.meshes) {
-    const r = Math.max(m.halfWidth, m.halfHeight) + m.depth + m.bevel;
-    expand(m.position.x, m.position.y, m.position.z, r);
+    expandForMesh(expand, m);
   }
   for (const c of model.connectors) {
     for (const p of c.points) {
-      expand(p.x, p.y, p.z, 1);
+      expand(p.x, p.y, p.z, 1, 1, 1);
     }
   }
   if (!Number.isFinite(minX)) {
-    const fallback = Math.max(model.bounds.width, model.bounds.height) / 2 || 1;
-    return { cx: 0, cy: 0, cz: 0, radius: fallback };
+    const halfW = model.bounds.width / 2 || 1;
+    const halfH = model.bounds.height / 2 || 1;
+    const fallback = Math.max(halfW, halfH);
+    return { cx: 0, cy: 0, cz: 0, radius: fallback, halfW, halfH, halfD: 1 };
   }
   return {
     cx: (minX + maxX) / 2,
     cy: (minY + maxY) / 2,
     cz: (minZ + maxZ) / 2,
-    radius: 0.5 * Math.hypot(maxX - minX, maxY - minY, maxZ - minZ) || 1
+    radius: 0.5 * Math.hypot(maxX - minX, maxY - minY, maxZ - minZ) || 1,
+    halfW: (maxX - minX) / 2,
+    halfH: (maxY - minY) / 2,
+    halfD: (maxZ - minZ) / 2
   };
 }
 function frameDistance(radius, aspect) {
@@ -272,6 +297,83 @@ function frameDistance(radius, aspect) {
   const minFov = Math.min(vFov, hFov);
   return radius / Math.sin(minFov / 2) * 1.1;
 }
+var FRAME_FILL = 0.92;
+function placeCamera(bounds, family, dist) {
+  const { cx, cy, cz, radius } = bounds;
+  const elevation = cameraElevation(family, radius, dist);
+  return {
+    position: [cx + radius * 0.25, cy + elevation, cz + dist],
+    target: [cx, cy, cz],
+    dist
+  };
+}
+function projectedFill(bounds, placement, aspect) {
+  const vFov = FOV * Math.PI / 180;
+  const tanV = Math.tan(vFov / 2);
+  const tanH = tanV * aspect;
+  const [px, py, pz] = placement.position;
+  const [tx, ty, tz] = placement.target;
+  let fx = tx - px, fy = ty - py, fz = tz - pz;
+  const fl = Math.hypot(fx, fy, fz) || 1;
+  fx /= fl;
+  fy /= fl;
+  fz /= fl;
+  let rx = -fz, rz = fx;
+  const rl = Math.hypot(rx, rz) || 1;
+  rx /= rl;
+  rz /= rl;
+  const ux = -rz * fy, uy = rz * fx - rx * fz, uz = rx * fy;
+  let worst = 0;
+  for (const sx of [-1, 1]) {
+    for (const sy of [-1, 1]) {
+      for (const sz of [-1, 1]) {
+        const dx = bounds.cx + sx * bounds.halfW - px;
+        const dy = bounds.cy + sy * bounds.halfH - py;
+        const dz = bounds.cz + sz * bounds.halfD - pz;
+        const depth = dx * fx + dy * fy + dz * fz;
+        if (depth <= 1e-6) {
+          return Infinity;
+        }
+        const x = Math.abs(dx * rx + dz * rz) / (depth * tanH);
+        const y = Math.abs(dx * ux + dy * uy + dz * uz) / (depth * tanV);
+        worst = Math.max(worst, x, y);
+      }
+    }
+  }
+  return worst;
+}
+function fitCamera(bounds, family, aspect) {
+  let dist = frameDistance(bounds.radius, aspect);
+  let placement = placeCamera(bounds, family, dist);
+  for (let step = 0; step < 8; step++) {
+    const fill = projectedFill(bounds, placement, aspect);
+    if (!Number.isFinite(fill)) {
+      dist *= 2;
+    } else {
+      const ratio = fill / FRAME_FILL;
+      if (Math.abs(ratio - 1) < 0.01) {
+        break;
+      }
+      dist *= ratio;
+    }
+    placement = placeCamera(bounds, family, dist);
+  }
+  return placement;
+}
+var CAROUSEL_ELEVATION_DEG = 34;
+function cameraElevation(family, radius, dist) {
+  if (family === "cycle" || family === "radial") {
+    return dist * Math.tan(CAROUSEL_ELEVATION_DEG * Math.PI / 180);
+  }
+  return radius * 0.3;
+}
+function billboardLabels(built, camera) {
+  built.forEachLabelPlane((plane) => {
+    const dx = camera.position.x - plane.position.x;
+    const dz = camera.position.z - plane.position.z;
+    plane.rotation.set(0, Math.atan2(dx, dz), 0);
+  });
+}
 function mountSmartArt3D(canvas, model, width, height, options = {}) {
   const renderer = new chunk3N6AC4HA_js.WebGLRenderer({ canvas, antialias: true, alpha: !options.background });
   renderer.setPixelRatio(
@@ -285,12 +387,14 @@ function mountSmartArt3D(canvas, model, width, height, options = {}) {
   if (options.background) {
     scene.background = new chunk3N6AC4HA_js.Color(options.background);
   }
-  const { cx, cy, cz, radius } = contentSphere(model);
+  const bounds = contentSphere(model);
+  const { cx, cy, cz, radius } = bounds;
   const aspect = width / Math.max(1, height);
-  const dist = frameDistance(radius, aspect);
+  const placement = fitCamera(bounds, model.family, aspect);
+  const { dist } = placement;
   const camera = new chunk3N6AC4HA_js.PerspectiveCamera(FOV, aspect, 0.1, dist * 8 + radius * 4);
-  camera.position.set(cx + radius * 0.25, cy + radius * 0.3, cz + dist);
-  camera.lookAt(cx, cy, cz);
+  camera.position.set(...placement.position);
+  camera.lookAt(...placement.target);
   scene.add(new chunk3N6AC4HA_js.AmbientLight(16777215, 0.62));
   const key = new chunk3N6AC4HA_js.DirectionalLight(16777215, 0.95);
   key.position.set(cx + radius, cy + radius * 1.4, cz + dist);
@@ -326,6 +430,7 @@ function mountSmartArt3D(canvas, model, width, height, options = {}) {
       return;
     }
     frame = requestAnimationFrame(renderLoop);
+    billboardLabels(built, camera);
     controls?.update();
     renderer.render(scene, camera);
   };

package/dist/{SurfaceChart3DScene-FRQC5HBG.mjs → SurfaceChart3DScene-JRMX4PN5.mjs}

@@ -1,5 +1,5 @@
 import { useStableChart3DInteraction, useLatestRef } from './chunk-T6GFCLSM.mjs';
-import { mountSurfaceChart3D } from './chunk-TMTQJAGK.mjs';
+import { mountSurfaceChart3D } from './chunk-Q6QJOD56.mjs';
 import './chunk-XGB3TDIC.mjs';
 import { useRef, useEffect } from 'react';
 import { jsx } from 'react/jsx-runtime';

package/dist/{SurfaceChart3DScene-UVZPT6OD.js → SurfaceChart3DScene-ODS5E6ZG.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chunkDNR6CH6I_js = require('./chunk-DNR6CH6I.js');
-var chunkT6V342NP_js = require('./chunk-T6V342NP.js');
+var chunkSK2CZQ6P_js = require('./chunk-SK2CZQ6P.js');
 require('./chunk-4VNS5WPM.js');
 var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
@@ -23,7 +23,7 @@ function SurfaceChart3DScene({
       return;
     }
     let disposed = false;
-    void chunkT6V342NP_js.mountSurfaceChart3D(container, options, stableInteraction).then((handle) => {
+    void chunkSK2CZQ6P_js.mountSurfaceChart3D(container, options, stableInteraction).then((handle) => {
       if (disposed) {
         handle.dispose();
       } else {