@zephyr3d/scene 0.9.6 → 0.9.8

package/dist/utility/serialization/manager.js

@@ -3,16 +3,16 @@ import { getAABBClass } from './scene/misc.js';
 import { getSceneNodeClass, getGraphNodeClass } from './scene/node.js';
 import { getBatchGroupClass } from './scene/batch.js';
 import { getCameraClass, getPerspectiveCameraClass, getOrthoCameraClass } from './scene/camera.js';
-import { getPunctualLightClass, getDirectionalLightClass, getSpotLightClass, getRectLightClass, getPointLightClass } from './scene/light.js';
-import { getMeshMaterialClass, getPBRBluePrintMaterialClass, getSpriteBlueprintMaterialClass, getUnlitMaterialClass, getLambertMaterialClass, getBlinnMaterialClass, getPBRMetallicRoughnessMaterialClass, getPBRSpecularGlossinessMaterialClass, getParticleMaterialClass, getSpriteMaterialClass, getStandardSpriteMaterialClass } from './scene/material.js';
+import { getPunctualLightClass, getDirectionalLightClass, getSpotLightClass, getPointLightClass, getRectLightClass } from './scene/light.js';
+import { getSubsurfaceProfileClass, getMeshMaterialClass, getPBRBluePrintMaterialClass, getSpriteBlueprintMaterialClass, getUnlitMaterialClass, getMToonMaterialClass, getLambertMaterialClass, getBlinnMaterialClass, getPBRMetallicRoughnessMaterialClass, getPBRSpecularGlossinessMaterialClass, getParticleMaterialClass, getSpriteMaterialClass, getStandardSpriteMaterialClass } from './scene/material.js';
 import { getMeshClass } from './scene/mesh.js';
 import { getParticleNodeClass } from './scene/particle.js';
-import { getBoxShapeClass, getBoxFrameShapeClass, getSphereShapeClass, getTorusShapeClass, getCylinderShapeClass, getPlaneShapeClass, getTetrahedronShapeClass, getCapsuleShapeClass } from './scene/primitive.js';
+import { getBoxShapeClass, getBoxFrameShapeClass, getCapsuleShapeClass, getSphereShapeClass, getTorusShapeClass, getCylinderShapeClass, getPlaneShapeClass, getTetrahedronShapeClass } from './scene/primitive.js';
 import { getSceneClass } from './scene/scene.js';
-import { getScriptAttachmentClass } from './scene/script.js';
 import { getTerrainClass } from './scene/terrain.js';
 import { getWaterClass, getFFTWaveGeneratorClass, getFBMWaveGeneratorClass } from './scene/water.js';
-import { getInterpolatorClass, getSkeletonRigClass, getSkinBindingClass, getSkeletonClass, getJointDynamicsModifierClass, getAnimationClass, getPropTrackClass, getNodeRotationTrackClass, getNodeScaleTrackClass, getNodeTranslationTrackClass, getNodeEulerRotationTrackClass, getFixedGeometryCacheTrackClass, getPCAGeometryCacheTrackClass, getMorphTrackClass } from './scene/animation.js';
+import { getTextSpriteClass, getMSDFTextSpriteClass, getMSDFTextClass } from './scene/text.js';
+import { getInterpolatorClass, getSkeletonClass, getSkeletonRigClass, getSkinBindingClass, getJointDynamicsModifierClass, getAnimationClass, getPropTrackClass, getNodeRotationTrackClass, getNodeScaleTrackClass, getNodeTranslationTrackClass, getNodeEulerRotationTrackClass, getFixedGeometryCacheTrackClass, getPCAGeometryCacheTrackClass, getMorphTrackClass } from './scene/animation.js';
 import '../../scene/scene.js';
 import '../../values.js';
 import '../../render/render_queue.js';
@@ -23,22 +23,24 @@ import '../../material/lambert.js';
 import '../../material/blinn.js';
 import '../../material/unlit.js';
 import '../../material/particle.js';
+import '../../material/subsurfaceprofile.js';
 import '../../material/meshmaterial.js';
 import '../../material/grassmaterial.js';
 import '../../material/terrain-cm.js';
 import '../../material/pbrmr.js';
 import '../../material/pbrsg.js';
+import '../../material/mtoon.js';
 import '../../material/pbrblueprint.js';
 import '../../material/sprite.js';
 import '../../material/sprite_std.js';
-import '../../material/msdf_text.js';
 import { PBRBlockNode, SpriteBlockNode, VertexBlockNode } from '../blueprint/material/pbr.js';
 import { ConstantScalarNode, ConstantVec2Node, ConstantVec3Node, ConstantVec4Node, ConstantBooleanNode, ConstantBVec2Node, ConstantBVec3Node, ConstantBVec4Node } from '../blueprint/common/constants.js';
 import { ConstantTexture2DNode, ConstantTexture2DArrayNode, ConstantTextureCubeNode, PannerNode, TextureSampleNode } from '../blueprint/material/texture.js';
 import { MakeVectorNode, SwizzleNode, EqualNode, NotEqualNode, LogicallyAndNode, LogicallyOrNode, CompComparisonNode, AnyConditionNode, AllConditionNode, SelectionNode, Degrees2RadiansNode, Radians2DegreesNode, SinNode, CosNode, TanNode, ArcSinNode, ArcCosNode, ArcTanNode, ArcTan2Node, SinHNode, CosHNode, TanHNode, ArcsineHNode, ArccosineHNode, ArctangentHNode, ExpNode, Exp2Node, LogNode, Log2Node, SqrtNode, InvSqrtNode, AbsNode, SignNode, FloorNode, CeilNode, FractNode, DDXNode, DDYNode, FWidthNode, CompAddNode, CompSubNode, CompMulNode, CompDivNode, ModNode, MinNode, MaxNode, PowNode, StepNode, SmoothStepNode, FmaNode, ClampNode, SaturateNode, MixNode, NormalizeNode, TransformNode, RotateAboutAxisNode, FaceForwardNode, ReflectNode, RefractNode, LengthNode, DistanceNode, DotProductNode, CrossProductNode, Hash1Node, Hash2Node, Hash3Node, SimplexNoise2DNode, PerlinNoise2DNode } from '../blueprint/common/math.js';
-import { VertexOutputNode, VertexIndexNode, InstanceIndexNode, VertexColorNode, VertexUVNode, VertexPositionNode, PixelWorldPositionNode, VertexNormalNode, PixelNormalNode, VertexTangentNode, VertexBinormalNode, ViewMatrixNode, ProjectionMatrixNode, ViewProjMatrixNode, InvProjMatrixNode, InvViewProjMatrixNode, BillboardMatrixNode, CameraPositionNode, CameraVectorNode, CameraNearFarNode, SkyEnvTextureNode, ElapsedTimeNode, ResolveVertexPositionNode, ResolveVertexTangentNode, ResolveVertexNormalNode } from '../blueprint/material/inputs.js';
+import { VertexColorNode, VertexUVNode, VertexPositionNode, PixelWorldPositionNode, VertexNormalNode, PixelNormalNode, VertexTangentNode, VertexBinormalNode, ViewMatrixNode, ProjectionMatrixNode, ViewProjMatrixNode, InvProjMatrixNode, InvViewProjMatrixNode, BillboardMatrixNode, CameraPositionNode, CameraVectorNode, CameraNearFarNode, SkyEnvTextureNode, ElapsedTimeNode, ResolveVertexPositionNode, ResolveVertexTangentNode, ResolveVertexNormalNode, VertexOutputNode, VertexIndexNode, InstanceIndexNode } from '../blueprint/material/inputs.js';
 import { FunctionInputNode, FunctionOutputNode, FunctionCallNode } from '../blueprint/material/func.js';
 import '../../render/rendergraph/forward_plus_builder.js';
+import '../../render/lightpass.js';
 import '../../render/sky.js';
 import '../../render/clipmap.js';
 import '../../shaders/atmosphere.js';
@@ -47,6 +49,7 @@ import '../../shadow/shadowmapper.js';
 import '../../scene/mesh.js';
 import '../../scene/basesprite.js';
 import '../../scene/meshdrawable.js';
+import '../../material/msdf_text.js';
 import '../../scene/water.js';
 import '../../scene/particlesys.js';
 import '../../scene/batchgroup.js';
@@ -60,8 +63,8 @@ import '../../animation/joint_dynamics/collision.js';
 import '../../animation/joint_dynamics/solver.js';
 import '../../animation/joint_dynamics/joint_dynamics_system.js';
 import { getJSONPropClass, getJSONNumberClass, getJSONStringClass, getJSONBoolClass, getJSONObjectClass, getJSONArrayClass } from './json.js';
+import { getScriptAttachmentClass } from './scene/script.js';
 import { getSpriteClass } from './scene/sprite.js';
-import { getTextSpriteClass, getMSDFTextSpriteClass, getMSDFTextClass } from './scene/text.js';
 
 const defaultValues = {
     bool: false,
@@ -168,9 +171,9 @@ const defaultValues = {
             getScriptAttachmentClass(),
             getAABBClass(),
             getInterpolatorClass(),
+            getSkeletonClass(),
             getSkeletonRigClass(),
             getSkinBindingClass(),
-            getSkeletonClass(),
             getJointDynamicsModifierClass(),
             getAnimationClass(this),
             getPropTrackClass(this),
@@ -196,17 +199,19 @@ const defaultValues = {
             getPunctualLightClass(),
             getDirectionalLightClass(),
             getSpotLightClass(),
-            getRectLightClass(),
             getPointLightClass(),
+            getRectLightClass(),
             getCameraClass(),
             getPerspectiveCameraClass(),
             getOrthoCameraClass(),
             getBatchGroupClass(),
             getSceneClass(this),
+            getSubsurfaceProfileClass(),
             ...getMeshMaterialClass(),
             ...getPBRBluePrintMaterialClass(),
             ...getSpriteBlueprintMaterialClass(),
             ...getUnlitMaterialClass(this),
+            ...getMToonMaterialClass(this),
             ...getLambertMaterialClass(this),
             ...getBlinnMaterialClass(this),
             ...getPBRMetallicRoughnessMaterialClass(this),
@@ -216,12 +221,12 @@ const defaultValues = {
             ...getStandardSpriteMaterialClass(this),
             getBoxShapeClass(),
             getBoxFrameShapeClass(),
+            getCapsuleShapeClass(),
             getSphereShapeClass(),
             getTorusShapeClass(),
             getCylinderShapeClass(),
             getPlaneShapeClass(),
             getTetrahedronShapeClass(),
-            getCapsuleShapeClass(),
             ConstantScalarNode.getSerializationCls(),
             ConstantVec2Node.getSerializationCls(),
             ConstantVec3Node.getSerializationCls(),
@@ -301,9 +306,6 @@ const defaultValues = {
             Hash3Node.getSerializationCls(),
             SimplexNoise2DNode.getSerializationCls(),
             PerlinNoise2DNode.getSerializationCls(),
-            VertexOutputNode.getSerializationCls(),
-            VertexIndexNode.getSerializationCls(),
-            InstanceIndexNode.getSerializationCls(),
             VertexColorNode.getSerializationCls(),
             VertexUVNode.getSerializationCls(),
             VertexPositionNode.getSerializationCls(),
@@ -333,7 +335,10 @@ const defaultValues = {
             FunctionOutputNode.getSerializationCls(),
             FunctionCallNode.getSerializationCls(this),
             PannerNode.getSerializationCls(),
-            TextureSampleNode.getSerializationCls()
+            TextureSampleNode.getSerializationCls(),
+            VertexOutputNode.getSerializationCls(),
+            VertexIndexNode.getSerializationCls(),
+            InstanceIndexNode.getSerializationCls()
         ].map((val)=>[
                 val.ctor,
                 val
@@ -386,15 +391,7 @@ const defaultValues = {
    *
    * @returns The `SerializableClass` metadata, or `null` if not found.
    */ getClassByConstructor(ctor) {
-        let current = ctor;
-        while(typeof current === 'function' && current !== Function.prototype){
-            const cls = this._classMap.get(current);
-            if (cls) {
-                return cls;
-            }
-            current = Object.getPrototypeOf(current);
-        }
-        return null;
+        return this._classMap.get(ctor) ?? null;
     }
     /**
    * Get serialization metadata by an object instance.
@@ -443,27 +440,15 @@ const defaultValues = {
         return this._clsPropMap.get(cls) ?? null;
     }
     /**
-   * Get all properties declared on a given class and its ancestors.
-   *
-   * @param cls - Serializable class metadata.
-   *
-   * @returns An array of `PropertyAccessor` entries, or `null` if none.
+   * Get all properties declared on a class, including inherited serializable properties.
    */ getAllPropertiesByClass(cls) {
-        const props = new Map();
-        while(cls){
-            const classProps = this.getPropertiesByClass(cls);
-            if (classProps) {
-                for (const prop of classProps){
-                    if (!props.has(prop.name)) {
-                        props.set(prop.name, prop);
-                    }
-                }
-            }
-            cls = this.getClassByConstructor(cls.parent);
+        const props = [];
+        let current = cls;
+        while(current){
+            props.unshift(...this.getPropertiesByClass(current) ?? []);
+            current = current.parent ? this.getClassByConstructor(current.parent) : null;
         }
-        return [
-            ...props.values()
-        ];
+        return props;
     }
     /**
    * Get a property accessor by class and property name.
@@ -541,62 +526,23 @@ const defaultValues = {
         }
     }
     /**
-   * Register a model loader.
-   *
-   * @param mimeType - What MIME type of files this loader can load
-   * @param loader - A concrete model loader implementation.
-   */ setModelLoader(mimeType, loader) {
-        this._assetManager.setModelLoader(mimeType, loader);
-    }
-    /**
    * Fetch a binary asset by ID via the asset manager.
    *
    * @remarks
    * - Associates the returned data with the given ID for future reverse lookup.
    * - The ID is typically a VFS path or locator.
    *
-   * @param path - VFS path of the binary asset.
+   * @param id - Asset identifier or path.
    *
    * @returns A Promise that resolves to the binary content, or `null` if not found.
-   */ async fetchBinary(path, options) {
-        const id = this.VFS.normalizePath(path);
-        const data = await this._assetManager.fetchBinaryData(id, null, null, options);
+   */ async fetchBinary(id) {
+        const data = await this._assetManager.fetchBinaryData(id);
         if (data) {
             this._allocated.set(data, id);
         }
         return data;
     }
     /**
-   * Fetch a text asset by ID via the asset manager.
-   *
-   * @param path - VFS path of TTF/OTF file.
-   * @returns A Promise that resolves to the font asset, or `null` if not found.
-   */ async fetchFontAsset(path, options) {
-        const id = this.VFS.normalizePath(path);
-        const fontAsset = await this._assetManager.fetchFontAsset(id, options);
-        if (fontAsset) {
-            this._allocated.set(fontAsset, id);
-        }
-        return fontAsset;
-    }
-    /**
-   * Get a cached font asset by ID if already loaded.
-   *
-   * @param path - VFS path of TTF/OTF file.
-   * @returns The cached FontAsset if it exists and is loaded, or null if not cached or still loading.
-   */ getFontAsset(path) {
-        return this._assetManager.getFontAsset(this.VFS.normalizePath(path));
-    }
-    /**
-   * Removes a cached font asset entry by asset instance or asset ID.
-   *
-   * @param asset - Loaded font asset instance or its asset ID/path.
-   * @returns `true` if a cache entry existed and was removed.
-   */ releaseFontAsset(asset) {
-        const path = typeof asset === 'string' ? asset : this.getAssetId(asset);
-        return path ? this._assetManager.releaseFontAsset(this.VFS.normalizePath(path)) : false;
-    }
-    /**
    * Serialize an object to a JSON structure using registered class metadata.
    *
    * @remarks
@@ -723,7 +669,7 @@ const defaultValues = {
     /**
    * Load a model by ID and track the allocation for reverse lookup.
    *
-   * @param path - VFS path of the model file.
+   * @param id - Model identifier or path.
    * @param scene - Scene into which the model is loaded.
    * @param options - Optional model fetch options.
    *
@@ -756,12 +702,11 @@ const defaultValues = {
     /**
    * Load a texture by ID and track the allocation for reverse lookup.
    *
-   * @param path - VFS path of the texture file.
+   * @param id - Texture identifier or path.
    * @param options - Optional texture fetch options.
    *
    * @returns A Promise resolving to the loaded texture, or `null` if failed.
-   */ async fetchTexture(path, options) {
-        const id = this.VFS.normalizePath(path);
+   */ async fetchTexture(id, options) {
         const texture = await this._assetManager.fetchTexture(id, options);
         if (texture) {
             this._allocated.set(texture, id);
@@ -771,11 +716,10 @@ const defaultValues = {
     /**
    * Load a material by ID and track the allocation for reverse lookup.
    *
-   * @param path - VFS path of the material file.
+   * @param id - Material identifier or path.
    *
    * @returns A Promise resolving to the loaded material, or `null` if failed.
-   */ async fetchMaterial(path, options) {
-        const id = this.VFS.normalizePath(path);
+   */ async fetchMaterial(id, options) {
         const material = await this._assetManager.fetchMaterial(id, options);
         if (material) {
             this._allocated.set(material, id);
@@ -797,13 +741,17 @@ const defaultValues = {
         this._assetManager.invalidateBluePrint(path);
     }
     /**
+   * Register a model loader by MIME type.
+   */ setModelLoader(mimeType, loader) {
+        this._assetManager.setModelLoader(mimeType, loader);
+    }
+    /**
    * Load a primitive by ID and track the allocation for reverse lookup.
    *
-   * @param path - VFS path of the primitive file.
+   * @param id - Primitive identifier or path.
    *
    * @returns A Promise resolving to the loaded primitive, or `null` if failed.
-   */ async fetchPrimitive(path, options) {
-        const id = this.VFS.normalizePath(path);
+   */ async fetchPrimitive(id, options) {
         const primitive = await this._assetManager.fetchPrimitive(id, options);
         if (primitive) {
             this._allocated.set(primitive, id);
@@ -811,6 +759,27 @@ const defaultValues = {
         return primitive;
     }
     /**
+   * Load a font asset by path and track the allocation for reverse lookup.
+   */ async fetchFontAsset(path, options) {
+        const id = this.VFS.normalizePath(path);
+        const fontAsset = await this._assetManager.fetchFontAsset(id, options);
+        if (fontAsset) {
+            this._allocated.set(fontAsset, id);
+        }
+        return fontAsset;
+    }
+    /**
+   * Returns the cached font asset if it is already loaded.
+   */ getFontAsset(path) {
+        return this._assetManager.getFontAsset(this.VFS.normalizePath(path));
+    }
+    /**
+   * Releases a cached font asset.
+   */ releaseFontAsset(asset) {
+        const path = typeof asset === 'string' ? asset : this.getAssetId(asset);
+        return path ? this._assetManager.releaseFontAsset(this.VFS.normalizePath(path)) : false;
+    }
+    /**
    * Load a prefab content.
    * @param path - Path to the prefab JSON file in VFS.
    * @returns A Promise resolving to the prefab json object, or `null` on failure.
@@ -842,7 +811,6 @@ const defaultValues = {
             node.prefabId = tmpNode.get().prefabId;
             node.parent = parent;
             node.persistentId = randomUUID();
-            node.animationSet.resetSkeletonModifiers();
             tmpNode.dispose();
             return node;
         } catch (err) {
@@ -925,7 +893,7 @@ const defaultValues = {
             const u = q.shift();
             const ins = gs.incoming[u] || [];
             for (const conn of ins){
-                const v = conn.targetNodeId; // predecessor
+                const v = conn.targetNodeId; // 前驱
                 if (!reachable.has(v)) {
                     reachable.add(v);
                     q.push(v);
@@ -965,7 +933,7 @@ const defaultValues = {
             for (const u of currentLevel){
                 const ins = gs.incoming[u] || [];
                 for (const conn of ins){
-                    const v = conn.targetNodeId; // predecessor
+                    const v = conn.targetNodeId; // 前驱
                     if (!sub.has(v)) {
                         continue;
                     }