@jfk-solutions/demo3d-file-format 1.8.0 → 1.10.0

package/dist/three/index.js

@@ -1,6 +1,7 @@
+export { configureRaw3DWebGPURenderer } from "./backend.js";
 import { Demo3DConveyorSideProperties, Demo3DDimensionAspect, Demo3DDimensionPoint, Demo3DExtrusionPolygon, Demo3DExtrusionProfile, Demo3DMaterial, Demo3DMesh, Demo3DPackage, Demo3DPointCloud, Demo3DProject, Demo3DPhotoEye, Demo3DResource, Demo3DSupportStand, Demo3DVisual } from "../model.js";
 import { Demo3DBinaryBlock, Demo3DXmlElement } from "../xml.js";
-export { createRaw3DThreeGroup, createRaw3DThreeScene, decodeRaw3DThreeGeometry } from "./raw3d.js";
+export { createRaw3DThreeGroup, createRaw3DThreePlayback, createRaw3DThreeScene, decodeRaw3DThreeGeometry } from "./raw3d.js";
 export { createDemo3DThreeRenderer } from "./renderer.js";
 export { applyDemo3DThreeRenderMode } from "./presentation.js";
 export async function createDemo3DThreeScene(parsed, options = {}) {
@@ -96,6 +97,8 @@ export function decodeDemo3DThreeGeometry(mesh, three) {
     const positions = new Float32Array(vertexCount * 3);
     const normals = layout.normalOffset === undefined ? undefined : new Float32Array(vertexCount * 3);
     const uvs = layout.uvOffset === undefined ? undefined : new Float32Array(vertexCount * 2);
+    const tangents = layout.tangentOffset === undefined ? undefined : new Float32Array(vertexCount * 4);
+    const colors = layout.colorOffset === undefined ? undefined : new Float32Array(vertexCount * 4);
     for (let vertexIndex = 0; vertexIndex < vertexCount; vertexIndex += 1) {
         const base = vertexIndex * layout.stride;
         positions[vertexIndex * 3] = view.getFloat32(base, true);
@@ -110,6 +113,17 @@ export function decodeDemo3DThreeGeometry(mesh, three) {
             uvs[vertexIndex * 2] = view.getFloat32(base + layout.uvOffset, true);
             uvs[vertexIndex * 2 + 1] = view.getFloat32(base + layout.uvOffset + 4, true);
         }
+        if (tangents && layout.tangentOffset !== undefined) {
+            for (let component = 0; component < 4; component++) {
+                tangents[vertexIndex * 4 + component] = view.getFloat32(base + layout.tangentOffset + component * 4, true);
+            }
+        }
+        if (colors && layout.colorOffset !== undefined) {
+            const argb = view.getUint32(base + layout.colorOffset, true);
+            for (let component = 0; component < 4; component++) {
+                colors[vertexIndex * 4 + component] = ((argb >>> [16, 8, 0, 24][component]) & 255) / 255;
+            }
+        }
     }
     const geometry = new three.BufferGeometry();
     geometry.setAttribute("position", new three.BufferAttribute(positions, 3));
@@ -119,6 +133,10 @@ export function decodeDemo3DThreeGeometry(mesh, three) {
     if (uvs) {
         geometry.setAttribute("uv", new three.BufferAttribute(uvs, 2));
     }
+    if (tangents)
+        geometry.setAttribute("tangent", new three.BufferAttribute(tangents, 4));
+    if (colors)
+        geometry.setAttribute("color", new three.BufferAttribute(colors, 4));
     if (mesh.indices) {
         geometry.setIndex(new three.BufferAttribute(readIndexBuffer(mesh.indices, mesh.indexFormat), 1));
     }
@@ -1942,9 +1960,15 @@ function createMeshObject(meshId, source, materialSelection, state) {
             ? createPlaceholderMesh(sourceId ?? meshId, meshId, primaryMaterial, state)
             : undefined;
     }
+    const colors = geometry.getAttribute("color");
+    let vertexAlpha = false;
+    if (colors?.itemSize === 4) {
+        for (let index = 0; index < colors.count; index++)
+            vertexAlpha ||= colors.getW(index) < 1;
+    }
     const threeMaterial = materials.length > 1
-        ? materials.map((material) => getMaterial(material, state))
-        : getMaterial(primaryMaterial, state);
+        ? materials.map((material) => getMaterial(material, state, !!colors, vertexAlpha))
+        : getMaterial(primaryMaterial, state, !!colors, vertexAlpha);
     const object = new state.three.Mesh(geometry, threeMaterial);
     object.name = source instanceof Demo3DVisual ? source.displayName ?? meshId : meshId;
     object.userData.demo3d = {
@@ -2111,23 +2135,37 @@ function primitiveGeometryKey(type, renderable) {
     ];
     return `primitive:${type ?? "unknown"}:${fields.map((field) => renderable.textOf(field) ?? "").join("|")}`;
 }
-function getMaterial(material, state) {
-    if (!material) {
+function getMaterial(material, state, vertexColors = false, vertexAlpha = false) {
+    if (!material && !vertexColors) {
         return state.defaultMaterial;
     }
-    const textureReference = material.textureReference;
+    const textureReference = material?.textureReference;
+    const normalTextureReference = material?.normalTextureReference;
     const key = [
         "material",
-        String(material.diffuse ?? "default"),
-        String(material.transparency ?? 0),
-        String(material.reflectivity ?? 0),
-        textureReference ?? ""
+        String(material?.diffuse ?? "default"),
+        String(material?.transparency ?? 0),
+        String(material?.reflectivity ?? 0),
+        textureReference ?? "",
+        normalTextureReference ?? "",
+        String(vertexColors),
+        String(vertexAlpha)
     ].join(":");
     const cached = state.materialCache.get(key);
     if (cached) {
         return cached;
     }
     const created = createDemo3DThreeMaterial(material, state.three);
+    if (vertexColors) {
+        const standard = created;
+        standard.vertexColors = true;
+        if (material?.diffuse === undefined)
+            standard.color.setHex(0xffffff);
+        if (vertexAlpha) {
+            standard.transparent = true;
+            standard.depthWrite = false;
+        }
+    }
     const texture = textureReference ? getTexture(textureReference, state) : undefined;
     if (texture && "map" in created) {
         const standard = created;
@@ -2138,6 +2176,11 @@ function getMaterial(material, state) {
         }
         created.needsUpdate = true;
     }
+    const normalMap = normalTextureReference ? getTexture(normalTextureReference, state, true) : undefined;
+    if (normalMap && "normalMap" in created) {
+        created.normalMap = normalMap;
+        created.needsUpdate = true;
+    }
     state.materialCache.set(key, created);
     state.stats.materials += 1;
     return created;
@@ -2197,8 +2240,9 @@ function primaryMaterial(visual) {
         visual.xml;
     return firstMaterial(materialNode) ?? visual.materials[0];
 }
-function getTexture(textureReference, state) {
-    const cached = state.textureCache.get(textureReference);
+function getTexture(textureReference, state, normalMap = false) {
+    const key = `${normalMap ? "normal" : "color"}:${textureReference}`;
+    const cached = state.textureCache.get(key);
     if (cached) {
         return cached;
     }
@@ -2208,13 +2252,13 @@ function getTexture(textureReference, state) {
     }
     const texture = new state.three.TextureLoader().load(`data:${image.mimeType};base64,${image.base64}`);
     if ("SRGBColorSpace" in state.three) {
-        texture.colorSpace = state.three.SRGBColorSpace;
+        texture.colorSpace = normalMap ? state.three.NoColorSpace : state.three.SRGBColorSpace;
     }
     texture.name = image.name ?? image.id;
     // Demo3D's generated primitive UVs use the conventional bottom-left texture
     // origin expected by Three's TextureLoader.
     texture.flipY = true;
-    state.textureCache.set(textureReference, texture);
+    state.textureCache.set(key, texture);
     state.stats.textures += 1;
     return texture;
 }
@@ -2691,10 +2735,18 @@ function vertexLayout(vertexFormat) {
     switch (vertexFormat) {
         case "Position":
             return { stride: 12 };
+        case "PositionColor":
+            return { stride: 16, colorOffset: 12 };
+        case "PositionTexture":
+            return { stride: 20, uvOffset: 12 };
         case "PositionNormal":
             return { stride: 24, normalOffset: 12 };
+        case "PositionNormalColor":
+            return { stride: 28, normalOffset: 12, colorOffset: 24 };
         case "PositionNormalTexture":
             return { stride: 32, normalOffset: 12, uvOffset: 24 };
+        case "PositionNormalTextureTangent":
+            return { stride: 48, normalOffset: 12, uvOffset: 24, tangentOffset: 32 };
         default:
             throw new Error(`Unsupported Demo3D vertex format: ${vertexFormat}`);
     }
@@ -2754,6 +2806,12 @@ function applyDemo3DTransform(object, transformText) {
 }
 function convertTriangleGeometryToThreeCoordinates(geometry) {
     geometry.scale(1, 1, -1);
+    // Reflection changes tangent-space handedness as well as the tangent direction.
+    const tangent = geometry.getAttribute("tangent");
+    if (tangent?.itemSize === 4) {
+        for (let index = 0; index < tangent.count; index++)
+            tangent.setW(index, -tangent.getW(index));
+    }
     const index = geometry.getIndex();
     if (index) {
         const values = index.array;