@zephyr3d/scene 0.9.26 → 0.10.0

package/dist/utility/serialization/scene/animation.js

@@ -13,13 +13,14 @@ import { FixedGeometryCacheTrack } from '../../../animation/fixed_geometry_cache
 import { BoundingBox } from '../../bounding_volume.js';
 import { PCAGeometryCacheTrack } from '../../../animation/pca_geometry_cache_track.js';
 import { Skeleton, SkeletonRig, SkinBinding } from '../../../animation/skeleton.js';
+import '../../../animation/animation_bank.js';
 import { SpringModifier } from '../../../animation/spring_modifier.js';
 import { createSpringParticle } from '../../../animation/spring/spring_particle.js';
 import { createSpringConstraint } from '../../../animation/spring/spring_constraint.js';
 import { SpringChain } from '../../../animation/spring/spring_chain.js';
 import { SpringSystem } from '../../../animation/spring/spring_system.js';
 import { MultiChainSpringSystem } from '../../../animation/spring/multi_chain_spring_system.js';
-import { createPlaneCollider, createCapsuleCollider, createSphereCollider } from '../../../animation/spring/spring_collider.js';
+import { createBoxCollider, createPlaneCollider, createCapsuleCollider, createSphereCollider } from '../../../animation/spring/spring_collider.js';
 import '@zephyr3d/device';
 import '../../../animation/joint_dynamics/collision.js';
 import '../../../animation/joint_dynamics/solver.js';
@@ -27,18 +28,19 @@ import { createTransformAccess, JointDynamicsSystem } from '../../../animation/j
 import { JointDynamicsModifier } from '../../../animation/joint_dynamics_modifier.js';
 import { defineProps } from '../types.js';
 import '../../../scene/scene.js';
+import '../../../render/primitive.js';
 import '../../../values.js';
 import '../../../render/render_queue.js';
-import '../../../render/primitive.js';
 import '../../../material/shader/helper.js';
 import '../../../material/lambert.js';
 import '../../../material/blinn.js';
 import '../../../material/unlit.js';
+import '../../../material/meshmaterial.js';
 import '../../../material/particle.js';
 import '../../../material/subsurfaceprofile.js';
-import '../../../material/skin.js';
+import '../../../material/sssprofile.js';
+import '../../../material/sss.js';
 import '../../../material/eye.js';
-import '../../../material/meshmaterial.js';
 import '../../../material/hair.js';
 import '../../../material/hairstrand.js';
 import '../../../material/grassmaterial.js';
@@ -55,9 +57,14 @@ import '../../../render/lightpass.js';
 import '../../../render/sky.js';
 import '../../../render/clipmap.js';
 import '../../../render/envlight.js';
+import '../../../render/lod.js';
 import '../../../render/dualdepthpeeling_oit.js';
 import '../../../shaders/atmosphere.js';
+import '../../../render/water_interaction.js';
 import '../../../render/rendergraph/scene_render_context.js';
+import '../../../render/sdf/scene_sdf.js';
+import '../../../render/sdf/global_sdf.js';
+import '../../../render/gi/voxelize_pass.js';
 import { SceneNode } from '../../../scene/scene_node.js';
 import '../../../shadow/shadowmapper.js';
 import '../../../scene/mesh.js';
@@ -71,6 +78,7 @@ import '../../../scene/batchgroup.js';
 import '../../../scene/terrain-cm/terrain-cm.js';
 import '../../../scene/terrain-cm/grass.js';
 import '../../../scene/raycast_visitor.js';
+import '../../../scene/foliage.js';
 
 const jointDynamicsModifierSkeletons = new WeakMap();
 const springModifierSkeletons = new WeakMap();
@@ -89,6 +97,29 @@ function decodeSkeletonBindPose(encoded) {
         scale: new Vector3(data[7], data[8], data[9])
     };
 }
+function encodeSkeletonPose(pose) {
+    const values = pose.flatMap((transform)=>[
+            ...transform.position,
+            ...transform.rotation,
+            ...transform.scale
+        ]);
+    return uint8ArrayToBase64(new Uint8Array(new Float32Array(values).buffer));
+}
+function decodeSkeletonPose(encoded, jointCount) {
+    const data = new Float32Array(base64ToUint8Array(encoded).buffer);
+    if (data.length !== jointCount * 10) {
+        throw new Error('Invalid serialized skeleton pose');
+    }
+    const pose = [];
+    for(let i = 0; i < jointCount; i++){
+        pose.push({
+            position: new Vector3(data[i * 10 + 0], data[i * 10 + 1], data[i * 10 + 2]),
+            rotation: new Quaternion(data[i * 10 + 3], data[i * 10 + 4], data[i * 10 + 5], data[i * 10 + 6]),
+            scale: new Vector3(data[i * 10 + 7], data[i * 10 + 8], data[i * 10 + 9])
+        });
+    }
+    return pose;
+}
 function vectorToArray(value) {
     return [
         value.x,
@@ -128,6 +159,9 @@ function serializeSpringChain(chain) {
                 } : {},
                 mass: particle.mass,
                 damping: particle.damping,
+                ...particle.collisionRadius > 0 ? {
+                    collisionRadius: particle.collisionRadius
+                } : {},
                 fixed: particle.fixed
             })),
         constraints: chain.constraints.map((constraint)=>({
@@ -156,6 +190,7 @@ function deserializeSpringChain(ctx, data) {
         chain.addParticle(createSpringParticle(position, {
             mass: item.mass,
             damping: item.damping,
+            collisionRadius: item.collisionRadius,
             fixed: item.fixed,
             node: node ?? undefined,
             anchorNode: anchorNode ?? undefined,
@@ -240,6 +275,26 @@ function serializeSpringCollider(collider) {
                     } : {}
                 };
             }
+        case 'box':
+            {
+                const box = collider;
+                return {
+                    type: 'box',
+                    ...box.node ? {
+                        node: box.node.persistentId
+                    } : {},
+                    enabled: box.enabled,
+                    center: vectorToArray(box.center),
+                    halfExtents: vectorToArray(box.halfExtents),
+                    axes: box.axes.map(vectorToArray),
+                    ...box.localOffset ? {
+                        localOffset: vectorToArray(box.localOffset)
+                    } : {},
+                    ...box.localHalfExtents ? {
+                        localHalfExtents: vectorToArray(box.localHalfExtents)
+                    } : {}
+                };
+            }
     }
 }
 function restoreSpringColliderRadiusScale(collider, data) {
@@ -280,6 +335,9 @@ function deserializeSpringCollider(ctx, data) {
         case 'plane':
             collider = createPlaneCollider(node && data.localPointOffset ? vectorFromArray(data.localPointOffset) : vectorFromArray(data.point), node && data.localNormal ? vectorFromArray(data.localNormal) : vectorFromArray(data.normal), node ?? undefined);
             break;
+        case 'box':
+            collider = createBoxCollider(node && data.localOffset ? vectorFromArray(data.localOffset) : vectorFromArray(data.center), node && data.localHalfExtents ? vectorFromArray(data.localHalfExtents) : vectorFromArray(data.halfExtents), node ?? undefined);
+            break;
     }
     collider.enabled = data.enabled;
     return collider;
@@ -293,13 +351,19 @@ function getSpringSystemOptions(system) {
         centrifugalScale: system.centrifugalScale,
         coriolisScale: system.coriolisScale,
         solver: system.solver,
+        motionModel: system.motionModel,
         poseFollow: system.poseFollow,
         poseFollowRoot: system.poseFollowRoot,
         poseFollowTip: system.poseFollowTip,
         poseFollowExponent: system.poseFollowExponent,
         maxPoseOffset: system.maxPoseOffset,
         maxPoseOffsetRoot: system.maxPoseOffsetRoot,
-        maxPoseOffsetTip: system.maxPoseOffsetTip
+        maxPoseOffsetTip: system.maxPoseOffsetTip,
+        angleLimitRoot: system.angleLimitRoot,
+        angleLimitTip: system.angleLimitTip,
+        constraintVelocityHistoryRetention: system.constraintVelocityHistoryRetention,
+        preserveInitialCollisionPenetration: system.preserveInitialCollisionPenetration,
+        initialCollisionPenetrationReleaseTime: system.initialCollisionPenetrationReleaseTime
     };
 }
 function deserializeSpringSystemOptions(options) {
@@ -1824,6 +1888,7 @@ function getPCAGeometryCacheTrackClass() {
             const inverseBindMatricesArray = new Float32Array(base64ToUint8Array(init.inverseBindMatrices).buffer);
             const bindPoseArray = new Float32Array(base64ToUint8Array(init.bindPose ?? init.bindPoseMatrices).buffer);
             const rootBindPose = init.rootBindPose ? decodeSkeletonBindPose(init.rootBindPose) : undefined;
+            const retargetPose = init.retargetPose ? decodeSkeletonPose(init.retargetPose, joints.length) : undefined;
             const inverseBindMatrices = [];
             const bindPose = [];
             for(let i = 0; i < joints.length; i++){
@@ -1849,7 +1914,8 @@ function getPCAGeometryCacheTrackClass() {
             if (!rig) {
                 rig = new SkeletonRig(joints, bindPose, {
                     rootJoint,
-                    rootBindPose
+                    rootBindPose,
+                    retargetPose
                 });
                 ctx.animationSet.rigs.push(new DRef(rig));
             }
@@ -1881,6 +1947,7 @@ function getPCAGeometryCacheTrackClass() {
                 rootBindPose: encodeSkeletonBindPose(obj.rig.rootBindPose),
                 inverseBindMatrices: uint8ArrayToBase64(new Uint8Array(new Float32Array(inverseBindMatrices).buffer)),
                 bindPose: uint8ArrayToBase64(new Uint8Array(new Float32Array(bindPose).buffer)),
+                retargetPose: obj.rig.hasRetargetPose ? encodeSkeletonPose(obj.rig.retargetPose) : undefined,
                 id: obj.persistentId
             };
         },
@@ -1923,9 +1990,11 @@ function getPCAGeometryCacheTrackClass() {
                     });
                 }
             }
+            const retargetPose = init.retargetPose ? decodeSkeletonPose(init.retargetPose, joints.length) : undefined;
             const rig = new SkeletonRig(joints, bindPose, {
                 rootJoint,
-                rootBindPose
+                rootBindPose,
+                retargetPose
             });
             rig.persistentId = init.id;
             return {
@@ -1947,6 +2016,7 @@ function getPCAGeometryCacheTrackClass() {
                 rootJoint: obj.rootJoint?.persistentId ?? '',
                 rootBindPose: encodeSkeletonBindPose(obj.rootBindPose),
                 bindPose: uint8ArrayToBase64(new Uint8Array(new Float32Array(bindPose).buffer)),
+                retargetPose: obj.hasRetargetPose ? encodeSkeletonPose(obj.retargetPose) : undefined,
                 id: obj.persistentId
             };
         },