@zephyr3d/scene 0.2.0 → 0.3.0

package/dist/asset/assetmanager.js

@@ -17,13 +17,12 @@ import { Application } from '../app.js';
 import '@zephyr3d/device';
 import { CopyBlitter } from '../blitter/copy.js';
 import { getSheenLutLoader, getTestCubemapLoader } from './builtin.js';
-import { GraphNode } from '../scene/graph_node.js';
 import { BUILTIN_ASSET_TEXTURE_SHEEN_LUT, BUILTIN_ASSET_TEST_CUBEMAP } from '../values.js';
 import { TGALoader } from './loaders/image/tga_Loader.js';
 
-/**
- * The asset manager
- * @public
+/**
+ * The asset manager
+ * @public
  */ class AssetManager {
     /** @internal */ static _builtinTextures = {};
     /** @internal */ static _builtinTextureLoaders = {
@@ -37,8 +36,8 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
     /** @internal */ _models;
     /** @internal */ _binaryDatas;
     /** @internal */ _textDatas;
-    /**
-   * Creates an instance of AssetManager
+    /**
+   * Creates an instance of AssetManager
    */ constructor(){
         this._httpRequest = new HttpRequest();
         this._textureLoaders = [
@@ -55,21 +54,21 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
         this._binaryDatas = {};
         this._textDatas = {};
     }
-    /**
-   * HttpRequest instance of the asset manager
+    /**
+   * HttpRequest instance of the asset manager
    */ get httpRequest() {
         return this._httpRequest;
     }
-    /**
-   * Removes all cached assets
+    /**
+   * Removes all cached assets
    */ clearCache() {
         this._textures = {};
         this._models = {};
         this._binaryDatas = {};
         this._textDatas = {};
     }
-    /**
-   * Remove and dispose all cached assets
+    /**
+   * Remove and dispose all cached assets
    */ purgeCache() {
         for(const k in this._textures){
             this._textures[k].then((tex)=>tex?.dispose()).catch((err)=>{});
@@ -79,42 +78,42 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
         this._binaryDatas = {};
         this._textDatas = {};
     }
-    /**
-   * Adds a texture loader to the asset manager
-   *
-   * @remarks
-   * TODO: this should be a static method
-   *
-   * @param loader - The texture loader to be added
+    /**
+   * Adds a texture loader to the asset manager
+   *
+   * @remarks
+   * TODO: this should be a static method
+   *
+   * @param loader - The texture loader to be added
    */ addTextureLoader(loader) {
         if (loader) {
             this._textureLoaders.unshift(loader);
         }
     }
-    /**
-   * Adds a model loader to the asset manager
-   *
-   * @remarks
-   * TODO: this should be a static method
-   *
-   * @param loader - The model loader to be added
+    /**
+   * Adds a model loader to the asset manager
+   *
+   * @remarks
+   * TODO: this should be a static method
+   *
+   * @param loader - The model loader to be added
    */ addModelLoader(loader) {
         if (loader) {
             this._modelLoaders.unshift(loader);
         }
     }
-    /**
-   * Fetches a text resource from a given URL
-   * @param url - The URL from where to fetch the resource
-   * @param postProcess - A function that will be involved when the text data was loaded.
-   *
-   * @remarks
-   * If a text data has already been loaded, the function will ignore the
-   * postProcess parameter and directly return the text loaded previously.
-   * To load the same text with different postProcess parameters,
-   * use different AssetManager instances separately.
-   *
-   * @returns The fetched text
+    /**
+   * Fetches a text resource from a given URL
+   * @param url - The URL from where to fetch the resource
+   * @param postProcess - A function that will be involved when the text data was loaded.
+   *
+   * @remarks
+   * If a text data has already been loaded, the function will ignore the
+   * postProcess parameter and directly return the text loaded previously.
+   * To load the same text with different postProcess parameters,
+   * use different AssetManager instances separately.
+   *
+   * @returns The fetched text
    */ async fetchTextData(url, postProcess) {
         let P = this._textDatas[url];
         if (!P) {
@@ -123,18 +122,18 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
         }
         return P;
     }
-    /**
-   * Fetches a binary resource from a given URL
-   * @param url - The URL from where to fetch the resource
-   * @param postProcess - A function that will be involved when the binary data was loaded.
-   *
-   * @remarks
-   * If a binary data has already been loaded, the function will ignore the
-   * postProcess parameter and directly return the data loaded previously.
-   * To load the same data with different postProcess parameters,
-   * use different AssetManager instances separately.
-   *
-   * @returns Binary data as ArrayBuffer
+    /**
+   * Fetches a binary resource from a given URL
+   * @param url - The URL from where to fetch the resource
+   * @param postProcess - A function that will be involved when the binary data was loaded.
+   *
+   * @remarks
+   * If a binary data has already been loaded, the function will ignore the
+   * postProcess parameter and directly return the data loaded previously.
+   * To load the same data with different postProcess parameters,
+   * use different AssetManager instances separately.
+   *
+   * @returns Binary data as ArrayBuffer
    */ async fetchBinaryData(url, postProcess) {
         let P = this._binaryDatas[url];
         if (!P) {
@@ -143,11 +142,11 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
         }
         return P;
     }
-    /**
-   * Fetches a texture resource from a given URL
-   * @param url - The URL from where to fetch the resource
-   * @param options - Options for texture fetching
-   * @returns The fetched texture
+    /**
+   * Fetches a texture resource from a given URL
+   * @param url - The URL from where to fetch the resource
+   * @param options - Options for texture fetching
+   * @returns The fetched texture
    */ async fetchTexture(url, options) {
         if (options?.texture) {
             return this.loadTexture(url, options.mimeType ?? null, !options.linearColorSpace, options.samplerOptions, options.texture);
@@ -175,23 +174,22 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
         }
         return P;
     }
-    /**
-   * Fetches a model resource from a given URL and adds it to a scene
-   * @param scene - The scene to which the model node belongs
-   * @param url - The URL from where to fetch the resource
-   * @param mimeType - The MIME type of the model resource, if not provided, model type will be determined by file extension
-   * @param postProcess - A function that will be involved when the model was loaded.
-   *
-   * @remarks
-   * If a model has already been loaded, the function will ignore the
-   * postProcess parameter and directly return the model loaded previously.
-   * To load the same model with different postProcess parameters,
-   * use different AssetManager instances separately.
-   *
-   * @returns The created model node
-   */ async fetchModel(scene, url, mimeType, postProcess) {
-        const sharedModel = await this.fetchModelData(scene, url, mimeType, postProcess);
-        return this.createSceneNode(scene, sharedModel);
+    /**
+   * Fetches a model resource from a given URL and adds it to a scene
+   * @param scene - The scene to which the model node belongs
+   * @param url - The URL from where to fetch the resource
+   * @param options - Options for model fetching
+   *
+   * @remarks
+   * If a model has already been loaded, the function will ignore the
+   * postProcess parameter and directly return the model loaded previously.
+   * To load the same model with different postProcess parameters,
+   * use different AssetManager instances separately.
+   *
+   * @returns The created model node
+   */ async fetchModel(scene, url, options) {
+        const sharedModel = await this.fetchModelData(scene, url, options?.mimeType, options?.postProcess);
+        return this.createSceneNode(scene, sharedModel, !options?.disableInstancing);
     }
     /** @internal */ async loadTextData(url, postProcess) {
         let text = await this._httpRequest.requestText(url);
@@ -329,10 +327,10 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
         }
         throw new Error(`Can not find loader for asset ${url}`);
     }
-    /**
-   * Fetches a built-in texture
-   * @param name - Name of the built-in texture
-   * @returns The built-in texture
+    /**
+   * Fetches a built-in texture
+   * @param name - Name of the built-in texture
+   * @returns The built-in texture
    */ async fetchBuiltinTexture(name, texture) {
         const loader = AssetManager._builtinTextureLoaders[name];
         if (!loader) {
@@ -353,21 +351,16 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
             return tex;
         }
     }
-    /** @internal */ createSceneNode(scene, model, sceneIndex) {
+    /** @internal */ createSceneNode(scene, model, instancing) {
         const group = new SceneNode(scene);
         group.name = model.name;
         let animationSet = new AnimationSet(scene);
         for(let i = 0; i < model.scenes.length; i++){
-            if (typeof sceneIndex === 'number' && sceneIndex >= 0 && i !== sceneIndex) {
-                continue;
-            } else if ((sceneIndex === undefined || sceneIndex === null) && model.activeScene >= 0 && i !== model.activeScene) {
-                continue;
-            }
             const assetScene = model.scenes[i];
             const skeletonMeshMap = new Map();
             const nodeMap = new Map();
             for(let k = 0; k < assetScene.rootNodes.length; k++){
-                this.setAssetNodeToSceneNode(scene, group, model, assetScene.rootNodes[k], skeletonMeshMap, nodeMap);
+                this.setAssetNodeToSceneNode(scene, group, model, assetScene.rootNodes[k], skeletonMeshMap, nodeMap, instancing);
             }
             for (const animationData of model.animations){
                 const animation = new AnimationClip(animationData.name, group);
@@ -403,10 +396,10 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
             animationSet
         };
     }
-    /**
-   * Sets the loader for a given builtin-texture
-   * @param name - Name of the builtin texture
-   * @param loader - Loader for the builtin texture
+    /**
+   * Sets the loader for a given builtin-texture
+   * @param name - Name of the builtin texture
+   * @param loader - Loader for the builtin texture
    */ static setBuiltinTextureLoader(name, loader) {
         if (loader) {
             this._builtinTextureLoaders[name] = loader;
@@ -482,7 +475,7 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
         };
         return info;
     }
-    /** @internal */ setAssetNodeToSceneNode(scene, parent, model, assetNode, skeletonMeshMap, nodeMap) {
+    /** @internal */ setAssetNodeToSceneNode(scene, parent, model, assetNode, skeletonMeshMap, nodeMap, instancing) {
         const node = new SceneNode(scene);
         nodeMap.set(assetNode, node);
         node.name = `${assetNode.name}`;
@@ -495,11 +488,10 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
             for (const subMesh of meshData.subMeshes){
                 const meshNode = new Mesh(scene);
                 meshNode.name = subMesh.name;
-                meshNode.clipMode = GraphNode.CLIP_INHERITED;
-                meshNode.showState = GraphNode.SHOW_INHERITED;
-                meshNode.pickMode = GraphNode.PICK_INHERITED;
+                meshNode.clipTestEnabled = true;
+                meshNode.showState = 'inherit';
                 meshNode.primitive = subMesh.primitive;
-                meshNode.material = subMesh.material;
+                meshNode.material = instancing ? subMesh.material.createInstance() : subMesh.material;
                 // meshNode.drawBoundingBox = true;
                 meshNode.reparent(node);
                 if (skeleton) {
@@ -521,7 +513,7 @@ import { TGALoader } from './loaders/image/tga_Loader.js';
         }
         node.reparent(parent);
         for (const child of assetNode.children){
-            this.setAssetNodeToSceneNode(scene, node, model, child, skeletonMeshMap, nodeMap);
+            this.setAssetNodeToSceneNode(scene, node, model, child, skeletonMeshMap, nodeMap, instancing);
         }
     }
     getHash(type, url, options) {

package/dist/asset/assetmanager.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetmanager.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"assetmanager.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/camera/camera.js

@@ -12,6 +12,7 @@ import '../material/grassmaterial.js';
 import '../material/terrainmaterial.js';
 import '../material/pbrmr.js';
 import '../material/pbrsg.js';
+import '@zephyr3d/device';
 import { SceneRenderer } from '../render/renderer.js';
 import '../render/sky.js';
 import '../render/clipmap.js';

package/dist/camera/camera.js.map

@@ -1 +1 @@
-{"version":3,"file":"camera.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"camera.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}