abstract-3d 2.7.29 → 2.7.32

package/src/renderers/dxf/dxf-encoding/dxf-dimension.ts

@@ -1,6 +1,13 @@
-import { dimensionMeshifyAlignedDimension, type Material, type Vec3, DimensionAligned, View, vec3RotCombine, vec3, vec3Cross } from "../../../abstract-3d.js";
+import { dimensionMeshifyAlignedDimension } from "../../../abstract-3d.js";
+import type { DimensionAligned, View, Material, Vec3 } from "../../../abstract-3d.js";
 import { type DxfColor, dxfColor } from "./dxf-color.js";
-import { DXF_BLOCK_RECORD_TABLE_HANDLE, DXF_MODEL_SPACE_HANDLE, dxfHandleNext, dxfRound, type Handle } from "./dxf-common.js";
+import {
+  DXF_BLOCK_RECORD_TABLE_HANDLE,
+  DXF_MODEL_SPACE_HANDLE,
+  dxfHandleNext,
+  dxfRound,
+  type Handle,
+} from "./dxf-common.js";
 import { dxfEncLine } from "./dxf-line.js";
 import { DxfMTextAttachment, dxfEncMText, encodeDxfFormattedText } from "./dxf-mtext.js";
 import { dxfEncSolidTriangle } from "./dxf-triangle.js";
@@ -26,8 +33,20 @@ export function dxfEncDimension(
   const blockName = `*D${blockRecordHandle}`;
   return {
     entity: dxfEncodeDimensionEntity(blockName, measurementStart, measurementEnd, linePosition, text, col, handleRef),
-    block: dxfEncodeDimensionBlock(blockName, blockRecordHandle, measurementStart, measurementEnd, linePosition, text, col, sceneRotation, viewRotation, views, handleRef),
-    blockRecord: dxfEncodeDimensionBlockRecord(blockName, blockRecordHandle)
+    block: dxfEncodeDimensionBlock(
+      blockName,
+      blockRecordHandle,
+      measurementStart,
+      measurementEnd,
+      linePosition,
+      text,
+      col,
+      sceneRotation,
+      viewRotation,
+      views,
+      handleRef
+    ),
+    blockRecord: dxfEncodeDimensionBlockRecord(blockName, blockRecordHandle),
   };
 }
 
@@ -88,10 +107,7 @@ ${dxfRound(measurementEnd.z)}
 `;
 }
 
-function dxfEncodeDimensionBlockRecord(
-  blockName: string,
-  blockRecordHandle: string,
-): string {
+function dxfEncodeDimensionBlockRecord(blockName: string, blockRecordHandle: string): string {
   return `0
 BLOCK_RECORD
 5
@@ -146,7 +162,18 @@ ${blockName}
 ${blockName}
 1
 
-${dxfEncodeDimensionGeometry(blockRecordHandle, measurementStart, measurementEnd, linePosition, text, col, sceneRotation, viewRotation, views, handleRef)}0
+${dxfEncodeDimensionGeometry(
+  blockRecordHandle,
+  measurementStart,
+  measurementEnd,
+  linePosition,
+  text,
+  col,
+  sceneRotation,
+  viewRotation,
+  views,
+  handleRef
+)}0
 ENDBLK
 5
 ${dxfHandleNext(handleRef)}
@@ -180,8 +207,25 @@ function dxfEncodeDimensionGeometry(
   const onCreateLine = (start: Vec3, end: Vec3, _norm: Vec3, _thickness: number, _mat: Material): void => {
     entities += dxfEncLine(start, end, col, handleRef, blockRecordHandle);
   };
-  const onCreateText = (pos: Vec3, measurement: string, fontSize: number, _mat: Material, _rot: Vec3, dir: Vec3, norm: Vec3): void => {
-    entities += dxfEncMText(pos, measurement, dir, norm, fontSize, handleRef, DxfMTextAttachment.MiddleCenter, blockRecordHandle);
+  const onCreateText = (
+    pos: Vec3,
+    measurement: string,
+    fontSize: number,
+    _mat: Material,
+    _rot: Vec3,
+    dir: Vec3,
+    norm: Vec3
+  ): void => {
+    entities += dxfEncMText(
+      pos,
+      measurement,
+      dir,
+      norm,
+      fontSize,
+      handleRef,
+      DxfMTextAttachment.MiddleCenter,
+      blockRecordHandle
+    );
   };
   const onCreatePolygon = (p1: Vec3, p2: Vec3, p3: Vec3, _mat: Material): void => {
     entities += dxfEncSolidTriangle(p1, p2, p3, col, handleRef, blockRecordHandle);
@@ -191,8 +235,8 @@ function dxfEncodeDimensionGeometry(
     measurementStart,
     measurementEnd,
     text,
-    views
+    views,
   };
   dimensionMeshifyAlignedDimension(dimension, sceneRotation, viewRotation, onCreateLine, onCreateText, onCreatePolygon);
   return entities;
-}
+}

package/src/renderers/dxf/dxf-encoding/dxf-lwpolyline.ts

@@ -1,6 +1,6 @@
 import { vec3, vec3Cross, vec3Dot, vec3Length, vec3Normalize, vec3Sub, type Vec3 } from "../../../abstract-3d.js";
 import { type DxfColor, dxfColor } from "./dxf-color.js";
-import { DXF_MODEL_SPACE_HANDLE, dxfHandleNext, dxfOCSXYAxis, dxfRound, type Handle } from "./dxf-common.js";
+import { DXF_MODEL_SPACE_HANDLE, dxfHandleNext, dxfOCSXYAxis, type Handle } from "./dxf-common.js";
 
 type LwPolylinePlane = {
   readonly pos: Vec3;

package/src/renderers/dxf/dxf-geometries/dxf-image.ts

@@ -1,19 +1,19 @@
-import type { AbstractImage, Color, Component } from "abstract-image";
+import { DEFAULT_CIRCLE_SIDE_COUNT, type Handle } from "../dxf-encoding/dxf-common.js";
+import { dxfEncLine } from "../dxf-encoding/dxf-line.js";
+import { dxfEncLwPolyline } from "../dxf-encoding/dxf-lwpolyline.js";
+import type { AbstractImage, Component } from "abstract-image";
+import type { DxfDynamicColor } from "../dxf-encoding/dxf-color.js";
 import {
   type ImageMesh,
   type Vec3,
   vec2Scale,
-  vec3TransRot,
-  vec3RotCombine,
-  vec3Zero,
   vec3,
-  vec3Rot,
   vec3Add,
+  vec3Rot,
+  vec3RotCombine,
+  vec3TransRot,
+  vec3Zero,
 } from "../../../abstract-3d.js";
-import { DEFAULT_CIRCLE_SIDE_COUNT, type Handle } from "../dxf-encoding/dxf-common.js";
-import { DxfDynamicColor } from "../dxf-encoding/dxf-color.js";
-import { dxfEncLine } from "../dxf-encoding/dxf-line.js";
-import { dxfEncLwPolyline } from "../dxf-encoding/dxf-lwpolyline.js";
 
 export function dxfImage(i: ImageMesh, parentPos: Vec3, parentRot: Vec3, handleRef: Handle): string {
   const half = vec2Scale(i.size, 0.5);

package/src/renderers/dxf/dxf.ts

@@ -18,9 +18,15 @@ import {
   vec3RotCombine,
   vec3Sub,
   vec3TransRot,
-  vec3Zero
+  vec3Zero,
 } from "../../abstract-3d.js";
-import { DEFAULT_CIRCLE_SIDE_COUNT, type DxfOrigin, type Handle, dxfBuild, dxfHandleInit } from "./dxf-encoding/dxf-common.js";
+import {
+  DEFAULT_CIRCLE_SIDE_COUNT,
+  type DxfOrigin,
+  type Handle,
+  dxfBuild,
+  dxfHandleInit,
+} from "./dxf-encoding/dxf-common.js";
 import { type Optional, calculateVisibleViews } from "../../utils.js";
 import { dxfPlane } from "./dxf-geometries/dxf-plane.js";
 import { dxfBox } from "./dxf-geometries/dxf-box.js";
@@ -29,7 +35,7 @@ import { dxfCone } from "./dxf-geometries/dxf-cone.js";
 import { dxfPolygon } from "./dxf-geometries/dxf-polygon.js";
 import { dxfImage } from "./dxf-geometries/dxf-image.js";
 import { dxfDimension } from "./dxf-geometries/dxf-dimension.js";
-import { DxfDimensionDefinition } from "./dxf-encoding/dxf-dimension.js";
+import type { DxfDimensionDefinition } from "./dxf-encoding/dxf-dimension.js";
 
 export type DxfOptions = {
   readonly view: View;
@@ -68,7 +74,7 @@ export function renderScenes(scenes: ReadonlyArray<DxfScene>, baseOptions?: Opti
     allDimensions = {
       entity: allDimensions.entity + dimensions.entity,
       block: allDimensions.block + dimensions.block,
-      blockRecord: allDimensions.blockRecord + dimensions.blockRecord
+      blockRecord: allDimensions.blockRecord + dimensions.blockRecord,
     };
     allBounds.push(bounds3FromPosAndSize(center, size));
   }
@@ -88,7 +94,12 @@ const renderInternal = (
   options: DxfOptions,
   offset: Vec3,
   handleRef: Handle
-): { readonly groups: string; readonly dimensions: DxfDimensionDefinition; readonly size: Vec3; readonly center: Vec3 } => {
+): {
+  readonly groups: string;
+  readonly dimensions: DxfDimensionDefinition;
+  readonly size: Vec3;
+  readonly center: Vec3;
+} => {
   const viewRotation = rotationForCameraPos(options.view);
   const unitRot = vec3RotCombine(viewRotation, scene.rotation_deprecated ?? vec3Zero);
   const unitCenter = scene.center_deprecated ?? vec3Zero;
@@ -100,7 +111,16 @@ const renderInternal = (
   const visibleViews = calculateVisibleViews(options.view, scene.rotation_deprecated);
   return {
     groups: scene.groups.reduce((a, c) => a + dxfGroup(c, pos, unitRot, options, handleRef), ""),
-    dimensions: dxfDimensions(scene.dimensions_deprecated, pos, unitRot, scene.rotation_deprecated ?? vec3Zero, viewRotation, visibleViews, options, handleRef),
+    dimensions: dxfDimensions(
+      scene.dimensions_deprecated,
+      pos,
+      unitRot,
+      scene.rotation_deprecated ?? vec3Zero,
+      viewRotation,
+      visibleViews,
+      options,
+      handleRef
+    ),
     size,
     center: pos,
   };
@@ -178,18 +198,34 @@ function dxfGroup(g: Group, parentPos: Vec3, parentRot: Vec3, options: DxfOption
   return dxf;
 }
 
-function dxfDimensions(d: Dimensions | undefined, parentPos: Vec3, parentRot: Vec3, sceneRotation: Vec3, viewRotation: Vec3, visibleViews: Record<string, boolean>, options: DxfOptions, handleRef: Handle): DxfDimensionDefinition {
-  if(!d || !options.showDimensions) {
-   return {
-    entity: "",
-    block: "",
-    blockRecord: ""
-   };
+function dxfDimensions(
+  d: Dimensions | undefined,
+  parentPos: Vec3,
+  parentRot: Vec3,
+  sceneRotation: Vec3,
+  viewRotation: Vec3,
+  visibleViews: Record<string, boolean>,
+  options: DxfOptions,
+  handleRef: Handle
+): DxfDimensionDefinition {
+  if (!d || !options.showDimensions) {
+    return {
+      entity: "",
+      block: "",
+      blockRecord: "",
+    };
   }
   return d.dimensions
     .filter((d) => d.views?.[0] && visibleViews[d.views[0]] === true)
     .map((d) => dxfDimension(d, parentPos, parentRot, sceneRotation, viewRotation, handleRef))
-    .reduce<DxfDimensionDefinition>((prev, curr) => ({ block: prev.block + curr.block, entity: prev.entity + curr.entity, blockRecord: prev.blockRecord + curr.blockRecord }), {block: "", entity: "", blockRecord: ""});
+    .reduce<DxfDimensionDefinition>(
+      (prev, curr) => ({
+        block: prev.block + curr.block,
+        entity: prev.entity + curr.entity,
+        blockRecord: prev.blockRecord + curr.blockRecord,
+      }),
+      { block: "", entity: "", blockRecord: "" }
+    );
 }
 
 function optionsDef(options: Optional<DxfOptions> | undefined): DxfOptions {
@@ -218,6 +254,21 @@ export const renderOld = (scene: Scene, options?: Optional<DxfOptions>): string
   const bounds2 = bounds3FromPosAndSize(offset, scene.size_deprecated);
   const groupRoot = group([], offset, vec3Zero, scene.groups);
   const handleRef = dxfHandleInit();
-  const dimensions = dxfDimensions(scene.dimensions_deprecated, dimensionsPos, unitRot, scene.rotation_deprecated ?? vec3Zero, viewRotation, visibleViews, opts, handleRef);
-  return dxfBuild(dxfGroup(groupRoot, center, unitRot, opts, handleRef), dimensions, bounds2, scene.size_deprecated, center);
+  const dimensions = dxfDimensions(
+    scene.dimensions_deprecated,
+    dimensionsPos,
+    unitRot,
+    scene.rotation_deprecated ?? vec3Zero,
+    viewRotation,
+    visibleViews,
+    opts,
+    handleRef
+  );
+  return dxfBuild(
+    dxfGroup(groupRoot, center, unitRot, opts, handleRef),
+    dimensions,
+    bounds2,
+    scene.size_deprecated,
+    center
+  );
 };

package/src/renderers/react/react-camera.tsx

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import React, { useLayoutEffect, useRef, useState } from "react";
 import {
   type GizmoHelperProps,
@@ -14,7 +12,8 @@ import {
 import { type ThreeEvent, useThree } from "@react-three/fiber";
 import { exhaustiveCheck } from "ts-exhaustive-check";
 import { Vector3 } from "three";
-import { View, Scene, Vec3, vec3 } from "../../abstract-3d.js";
+import type { View, Scene, Vec3 } from "../../abstract-3d.js";
+import { vec3 } from "../../abstract-3d.js";
 
 export type Camera = A3dPerspectiveCamera | A3dOrthographicCamera;
 export type CameraType = Camera["type"];
@@ -46,7 +45,7 @@ type Viewcube = { readonly type: "Viewcube"; readonly viewcubeProps: GenericProp
 type Viewport = { readonly type: "Viewport"; readonly viewportProps: GizmoViewportProps };
 
 export function ReactCamera({
-  useAnimations,
+  useAnimations: _useAnimations,
   camera,
   view,
   scene,

package/src/renderers/react/react-dimension.tsx

@@ -1,7 +1,6 @@
-import { useFrame } from "@react-three/fiber";
 import React from "react";
-import type { Group, Line } from "three";
-import { Dimensions, Vec3, Dimension, vec3TransRot, vec3Flip, Mesh, dimensionConvertToTypeMesh, vec3Zero, Material, DimensionAligned, vec3, View, DimensionMesh } from "../../abstract-3d.js";
+import type { Dimensions, Vec3, Dimension, Mesh, Material } from "../../abstract-3d.js";
+import { dimensionConvertToTypeMesh, vec3Zero } from "../../abstract-3d.js";
 import { ReactMaterial } from "./react-material.js";
 import { ReactMesh } from "./react-mesh.js";
 
@@ -46,7 +45,6 @@ export function ReactDimension({
   visible,
   children,
   sceneRotation,
-  _sceneCenter
 }: {
   readonly dimension: Dimension;
   readonly material: Material;
@@ -60,7 +58,9 @@ export function ReactDimension({
     <group position={[dim.pos.x, dim.pos.y, dim.pos.z]} rotation={[dim.rot.x, dim.rot.y, dim.rot.z]}>
       <DimensionMeshes meshes={dim.meshes}>{children}</DimensionMeshes>
     </group>
-  ) : <></>;
+  ) : (
+    <></>
+  );
 }
 
 const DimensionMeshes = React.memo(

package/src/renderers/react/react-group.tsx

@@ -1,12 +1,14 @@
 import React from "react";
-import { ThreeEvent, useFrame } from "@react-three/fiber";
+import type { ThreeEvent } from "@react-three/fiber";
+import { useFrame } from "@react-three/fiber";
 import type { Group } from "three";
-import { Group as Group_1 } from "../../abstract-3d.js";
-import { MaterialState, ReactMaterial } from "./react-material.js";
+import type { Group as Group_1 } from "../../abstract-3d.js";
+import type { MaterialState } from "./react-material.js";
+import { ReactMaterial } from "./react-material.js";
 import { ReactMesh } from "./react-mesh.js";
 import { ImageMaterial } from "./react-image-material.js";
 import { Html } from "@react-three/drei";
-import { ReactPopover } from "./react-types.js";
+import type { ReactPopover } from "./react-types.js";
 
 export function ReactGroup({
   g,

package/src/renderers/react/react-hotspot.tsx

@@ -1,9 +1,10 @@
 import React from "react";
 import { Html } from "@react-three/drei";
-import { Box, HotSpot, vec3Scale, vec3Zero } from "../../abstract-3d.js";
+import type { Box, HotSpot } from "../../abstract-3d.js";
+import { vec3Scale, vec3Zero } from "../../abstract-3d.js";
 import { ReactMesh } from "./react-mesh.js";
 import { ReactMaterial } from "./react-material.js";
-import { ThreeEvent } from "@react-three/fiber";
+import type { ThreeEvent } from "@react-three/fiber";
 
 export interface HotSpotInfo {
   readonly replaceId: string;

package/src/renderers/react/react-image-material.tsx

@@ -2,8 +2,9 @@ import React from "react";
 import { suspend } from "suspend-react";
 import { createSVG } from "abstract-image";
 import { CanvasTexture, DoubleSide, PlaneGeometry, SRGBColorSpace, type Texture, TextureLoader } from "three";
-import { Material, Image as A3dImage } from "../../abstract-3d.js";
-import { ERROR_IMG_KEY, getColor, materialDefaults, MaterialState, selectMat } from "./react-material.js";
+import type { Material, Image as A3dImage } from "../../abstract-3d.js";
+import type { MaterialState } from "./react-material.js";
+import { ERROR_IMG_KEY, getColor, materialDefaults, selectMat } from "./react-material.js";
 
 export const planeGeometry = new PlaneGeometry();
 

package/src/renderers/react/react-material.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { BackSide, DoubleSide, FrontSide, type MaterialParameters } from "three";
-import { Material } from "../../abstract-3d.js";
+import type { Material } from "../../abstract-3d.js";
 import { shade } from "../../utils.js";
 
 const decreasedOpacity = 0.125;

package/src/renderers/react/react-mesh.tsx

@@ -23,19 +23,21 @@ import {
   Vector2,
   Vector3,
 } from "three";
-import {
+import type {
   Mesh,
   Box,
   Plane,
-  vec2Scale,
   Shape as Shape_1,
   Cylinder,
-  vec2Sub,
-  vec2Add,
   Polygon as A3dPolygon,
   Tube as A3dTube,
   CircleCurve as A3dCircleCurve,
   Hole,
+} from "../../abstract-3d.js";
+import {
+  vec2Scale,
+  vec2Sub,
+  vec2Add,
   isZero,
   vec3Scale,
   vec3,
@@ -46,8 +48,7 @@ import {
   equals,
 } from "../../abstract-3d.js";
 import { exhaustiveCheck } from "ts-exhaustive-check";
-import { ImageMaterial, planeGeometry } from "./react-image-material.js";
-import { MaterialState } from "./react-material.js";
+import { planeGeometry } from "./react-image-material.js";
 
 extend({
   SphereGeometry,
@@ -86,23 +87,9 @@ export function ReactMesh({
   const culledLineGeometry = useMemo(() => {
     const g = new BufferGeometry();
 
-    g.setAttribute(
-      "position",
-      new Float32BufferAttribute(
-        [
-          0, -1, 0,
-          0,  1, 0,
-          1, -1, 0,
-          1,  1, 0,
-        ],
-        3
-      )
-    );
+    g.setAttribute("position", new Float32BufferAttribute([0, -1, 0, 0, 1, 0, 1, -1, 0, 1, 1, 0], 3));
 
-    g.setIndex([
-      0, 2, 1,
-      2, 3, 1,
-    ]);
+    g.setIndex([0, 2, 1, 2, 3, 1]);
 
     return g;
   }, []);
@@ -302,22 +289,24 @@ export function ReactMesh({
       const { start, end, normal, thickness } = mesh.geometry;
       const color = mesh.material.normal;
 
-      return <mesh geometry={culledLineGeometry} frustumCulled={false}>
-        <shaderMaterial
-          side={FrontSide}
-          uniforms={{
-            lineStart: { value: new Vector3(start.x, start.y, start.z) },
-            lineEnd: { value: new Vector3(end.x, end.y, end.z) },
-            lineNormal: { value: new Vector3(normal.x, normal.y, normal.z) },
-            thickness: { value: thickness },
-            viewport: { value: new Vector2(size.width, size.height) },
-            nearPlane: { value: camera.near },
-            color: { value: new Color(color) },
-          }}
-          vertexShader={culledLineVertexShader}
-          fragmentShader={culledLineFragmentShader}
-        />
-      </mesh>;
+      return (
+        <mesh geometry={culledLineGeometry} frustumCulled={false}>
+          <shaderMaterial
+            side={FrontSide}
+            uniforms={{
+              lineStart: { value: new Vector3(start.x, start.y, start.z) },
+              lineEnd: { value: new Vector3(end.x, end.y, end.z) },
+              lineNormal: { value: new Vector3(normal.x, normal.y, normal.z) },
+              thickness: { value: thickness },
+              viewport: { value: new Vector2(size.width, size.height) },
+              nearPlane: { value: camera.near },
+              color: { value: new Color(color) },
+            }}
+            vertexShader={culledLineVertexShader}
+            fragmentShader={culledLineFragmentShader}
+          />
+        </mesh>
+      );
     }
     case "Polygon":
       return <Polygon polygon={mesh.geometry}>{children}</Polygon>;
@@ -655,4 +644,4 @@ const culledLineFragmentShader = `
   void main() {
     gl_FragColor = vec4(color, 1.0);
   }
-`;
+`;

package/src/renderers/react/react-scene.tsx

@@ -1,12 +1,13 @@
 import React from "react";
-import { Scene, Group } from "../../abstract-3d.js";
-import { HotSpotInfo, ReactHotSpots } from "./react-hotspot.js";
+import type { Scene, Group } from "../../abstract-3d.js";
+import type { HotSpotInfo } from "./react-hotspot.js";
+import { ReactHotSpots } from "./react-hotspot.js";
 import { ReactDimensions } from "./react-dimension.js";
 import { ReactGroup } from "./react-group.js";
-import { MaterialState } from "./react-material.js";
+import type { MaterialState } from "./react-material.js";
 import { Html } from "@react-three/drei";
-import { ThreeEvent } from "@react-three/fiber";
-import { ReactPopover } from "./react-types.js";
+import type { ThreeEvent } from "@react-three/fiber";
+import type { ReactPopover } from "./react-types.js";
 
 export type SceneMouseEvent = ThreeEvent<MouseEvent>;
 

package/src/renderers/react/react-types.ts

@@ -1,4 +1,4 @@
-import { Vec3 } from "../../abstract-3d.js";
+import type { Vec3 } from "../../abstract-3d.js";
 
 export interface ReactPopover {
   readonly id: string;

package/src/renderers/react/react.tsx

@@ -1,13 +1,14 @@
 import React, { memo } from "react";
 import { Canvas, type CanvasProps, type ThreeEvent } from "@react-three/fiber";
-import { Html, Stats, type OrbitControlsProps } from "@react-three/drei";
+import { Html, type OrbitControlsProps } from "@react-three/drei";
 import { EffectComposer, N8AO } from "@react-three/postprocessing";
 import { ReactScene } from "./react-scene.js";
-import { Scene, View, Group, Vec3 } from "../../abstract-3d.js";
-import { ReactCamera, ControlsHelper, Camera, BufferZones } from "./react-camera.js";
-import { HotSpotInfo } from "./react-hotspot.js";
-import { MaterialState } from "./react-material.js";
-import { ReactPopover } from "./react-types.js";
+import type { Scene, View, Group } from "../../abstract-3d.js";
+import type { ControlsHelper, Camera, BufferZones } from "./react-camera.js";
+import { ReactCamera } from "./react-camera.js";
+import type { HotSpotInfo } from "./react-hotspot.js";
+import type { MaterialState } from "./react-material.js";
+import type { ReactPopover } from "./react-types.js";
 
 type ReactProps = {
   readonly scene: Scene | undefined; // undefined to allow for simple early loadign the js when lazy loading the React3Js renderer