abstract-3d 2.7.32 → 2.7.33

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

@@ -1,4 +1,12 @@
-import { type Shape, type Material, type Vec3, vec3TransRot, vec3RotCombine, vec3Zero, vec3 } from "../../../abstract-3d.js";
+import {
+  type Shape,
+  type Material,
+  type Vec3,
+  vec3TransRot,
+  vec3RotCombine,
+  vec3Zero,
+  vec3,
+} from "../../../abstract-3d.js";
 import type { Handle } from "../dxf-encoding/dxf-common.js";
 import { dxfEnc3DFace } from "../dxf-encoding/dxf-3dface.js";
 import { dxfEnc3DFaceTriangle } from "../dxf-encoding/dxf-triangle.js";
@@ -18,7 +26,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
       const p2 = points[i + 1];
       const p3 = points[i + 2];
       const p4 = points[i + 3];
-      if(p1 && p2 && p3 && p4) {
+      if (p1 && p2 && p3 && p4) {
         polygonString += dxfEnc3DFace(p1, p2, p3, p4, m.normal, handleRef);
       }
     }
@@ -31,7 +39,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
         const p1 = points[i - 2];
         const p2 = points[i - 1];
         const p3 = points[i];
-        if(p1 && p2 && p3) {
+        if (p1 && p2 && p3) {
           polygonString += dxfEnc3DFaceTriangle(p1, p2, p3, m.normal, handleRef);
         }
         break;
@@ -40,7 +48,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
         const p1 = points[i - 1];
         const p2 = points[i];
         const p3 = points[i + 1];
-        if(p1 && p2 && p3) {
+        if (p1 && p2 && p3) {
           polygonString += dxfEnc3DFaceTriangle(p1, p2, p3, m.normal, handleRef);
         }
         break;
@@ -49,7 +57,7 @@ export function dxfPolygon(s: Shape, m: Material, parentPos: Vec3, parentRot: Ve
         const p1 = points[i];
         const p2 = points[i + 1];
         const p3 = points[i + 2];
-        if(p1 && p2 && p3) {
+        if (p1 && p2 && p3) {
           polygonString += dxfEnc3DFaceTriangle(p1, p2, p3, m.normal, handleRef);
         }
         break;

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

@@ -63,9 +63,9 @@ export function ReactCamera({
   readonly bufferZones?: BufferZones;
   readonly fitPadding?: number;
 }): React.JSX.Element {
-  const [controls, setControls] = useState<any | null>(null);
-  const perspectiveRef = useRef<any | undefined>(undefined);
-  const orthographicRef = useRef<any | undefined>(undefined);
+  const [controls, setControls] = useState<any>(null);
+  const perspectiveRef = useRef<any>(undefined);
+  const orthographicRef = useRef<any>(undefined);
 
   const initialDistRef = useRef<number | null>(null);
   const initialTargetRef = useRef(new Vector3());
@@ -115,7 +115,7 @@ export function ReactCamera({
     const screenW = size.x;
     const screenH = size.y;
 
-    const fov = camera.type === "Perspective" ? camera.fov ?? 45 : 45;
+    const fov = camera.type === "Perspective" ? (camera.fov ?? 45) : 45;
 
     // Buffer zones in CSS pixels
     const bufLeft = bufferZones.left ?? 0;

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

@@ -48,15 +48,15 @@ export function ImageMaterial({
     materialState === "Error" && materialStateImages?.[ERROR_IMG_KEY]
       ? materialStateImages[ERROR_IMG_KEY]
       : image.type === "AbstractImage"
-      ? `data:image/svg+xml,${createSVG(image.image)}`
-      : image.url;
+        ? `data:image/svg+xml,${createSVG(image.image)}`
+        : image.url;
   const texture = suspend(urlIsSvg(url) ? loadSvg(url, filter) : loadNormal(url, filter), [url]) as Texture | null;
 
   return (
     <meshBasicMaterial
       color={getColor(selected, hovered, material, selectMat)}
       side={DoubleSide}
-      alphaTest={useAlphaTest ?? true ? 0.8 : undefined}
+      alphaTest={(useAlphaTest ?? true) ? 0.8 : undefined}
       map={texture}
       {...(material.opacity !== undefined && material.opacity < 1 ? { opacity: material.opacity } : materialDefaults)}
       transparent
@@ -77,8 +77,7 @@ function loadSvg(url: string, filter: TextureFilter): Promise<Texture | null> {
     const maxSize = 512;
     const img = new Image();
 
-    // eslint-disable-next-line consistent-return
-    img.onload = (): void => {
+    img.addEventListener("load", (): void => {
       const canvas = document.createElement("canvas");
       const imgW = img.naturalWidth;
       const imgH = img.naturalHeight;
@@ -108,9 +107,9 @@ function loadSvg(url: string, filter: TextureFilter): Promise<Texture | null> {
 
       res(texture);
       textureCache.set(url, texture);
-    };
+    });
 
-    img.onerror = () => res(null);
+    img.addEventListener("error", () => res(null));
     img.src = url;
   });
 }

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

@@ -30,10 +30,10 @@ export function ReactMaterial({
   const mat = !materialState
     ? material
     : materialState === "Accept"
-    ? acceptMat
-    : materialState === "Error"
-    ? errorMar
-    : warningMat;
+      ? acceptMat
+      : materialState === "Error"
+        ? errorMar
+        : warningMat;
 
   const opacity = material.opacity !== undefined ? material.opacity : materialDefaults.opacity!;
   if (isText) {
@@ -103,6 +103,6 @@ export function getColor(
       ? shade(-0.4, selectedMat.normal)
       : selectedMat.normal
     : hovered
-    ? shade(-0.4, mat.normal)
-    : mat.normal;
+      ? shade(-0.4, mat.normal)
+      : mat.normal;
 }

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

@@ -394,7 +394,7 @@ function ExcrudeCylinder({
   return (
     // Doesn't seem to adjust for excrude z size directly???
     <mesh rotation={[cyl.rot?.x ?? 0, cyl.rot?.y ?? 0, cyl.rot?.z ?? 0]} position={[cyl.pos.x, cyl.pos.y, cyl.pos.z]}>
-      <mesh geometry={excrudeGeometry} rotation-x={Math.PI / 2} position-y={+cyl.length / 2} castShadow receiveShadow>
+      <mesh geometry={excrudeGeometry} rotation-x={Math.PI / 2} position-y={cyl.length / 2} castShadow receiveShadow>
         {children}
       </mesh>
     </mesh>

package/src/renderers/react/react.tsx

@@ -173,7 +173,7 @@ export const render = memo(
         </React.Suspense>
       </Canvas>
     ) : (
-      sceneFallback ?? <></>
+      (sceneFallback ?? <></>)
     );
   }
 );

package/src/renderers/svg/svg-geometries/svg-cone.ts

@@ -50,7 +50,7 @@ export function cone(
   }
 
   // Add circle if direcly facing camera
-  const cylTop = vec3tr(vec3(0, +half.y, 0));
+  const cylTop = vec3tr(vec3(0, half.y, 0));
   const cylBottom = vec3tr(vec3(0, -half.y, 0));
   if (equals(cylTop.x, cylBottom.x, 0.1) && equals(cylTop.y, cylBottom.y, 0.1)) {
     zOrderComponents.push(

package/src/renderers/svg/svg-geometries/svg-cylinder.ts

@@ -56,7 +56,7 @@ export function cylinder(
   }
   if (!c.open) {
     // Add circle if direcly facing camera
-    const circleTop = vec3tr(vec3(0, +half.y, 0));
+    const circleTop = vec3tr(vec3(0, half.y, 0));
     const circleBottom = vec3tr(vec3(0, -half.y, 0));
     if (equals(circleTop.x, circleBottom.x, 0.1) && equals(circleTop.y, circleBottom.y, 0.1)) {
       const circlePos = circleTop.z > circleBottom.z ? circleTop : circleBottom;

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

@@ -50,8 +50,8 @@ export function image(
             ),
           }
         : i.image.url
-        ? { type: "url", url: imageData ?? i.image.url }
-        : undefined;
+          ? { type: "url", url: imageData ?? i.image.url }
+          : undefined;
 
       if (image) {
         const img = svgImage(point(v4.x, v4.y), i.size, rot, image, opts.imageBg ? opts.background : undefined);

package/src/utils.ts

@@ -140,10 +140,10 @@ export function shade(p: number, from: string, to?: string): string | undefined
       (f[3]! > -1 && t[3]! > -1
         ? r(((t[3]! - f[3]!) * p + f[3]!) * 255)
         : t[3]! > -1
-        ? r(t[3]! * 255)
-        : f[3]! > -1
-        ? r(f[3]! * 255)
-        : 255)
+          ? r(t[3]! * 255)
+          : f[3]! > -1
+            ? r(f[3]! * 255)
+            : 255)
     )
       .toString(16)
       .slice(1, f[3]! > -1 || t[3]! > -1 ? undefined : -2)