@onerjs/core 8.35.2 → 8.35.4

package/Loading/sceneLoader.d.ts

@@ -277,7 +277,7 @@ type DefaultPluginOptions<BasePluginOptions> = {
     enabled?: boolean;
 } & BasePluginOptions;
 export type PluginOptions = ISceneLoaderOptions["pluginOptions"];
-type SceneSource = string | File | ArrayBufferView;
+type SceneSource = string | File | ArrayBufferView | object;
 /**
  * Defines common options for loading operations performed by SceneLoader.
  */

package/Loading/sceneLoader.js

@@ -107,6 +107,10 @@ async function loadDataAsync(fileInfo, scene, onSuccess, onProgress, onError, on
         // eslint-disable-next-line no-throw-literal
         throw "When using ArrayBufferView to load data the file extension must be provided.";
     }
+    if (fileInfo.jsonData && !pluginExtension) {
+        // eslint-disable-next-line no-throw-literal
+        throw "When using object to load data the file extension must be provided.";
+    }
     const fileExtension = !directLoad && !pluginExtension ? getFilenameExtension(fileInfo.url) : "";
     let registeredPlugin = pluginExtension
         ? getPluginForExtension(pluginExtension, true)
@@ -225,7 +229,7 @@ async function loadDataAsync(fileInfo, scene, onSuccess, onProgress, onError, on
             }
             request = plugin.loadFile
                 ? plugin.loadFile(scene, fileInfo.rawData || fileInfo.file || fileInfo.url, fileInfo.rootUrl, dataCallback, onProgress, useArrayBuffer, errorCallback, name)
-                : scene._loadFile(fileInfo.file || fileInfo.url, dataCallback, onProgress, true, useArrayBuffer, errorCallback);
+                : scene._loadFile(fileInfo.jsonData || fileInfo.file || fileInfo.url, dataCallback, onProgress, true, useArrayBuffer, errorCallback);
         };
         const engine = scene.getEngine();
         let canUseOfflineSupport = engine.enableOfflineSupport;
@@ -254,6 +258,7 @@ function GetFileInfo(rootUrl, sceneSource) {
     let name;
     let file = null;
     let rawData = null;
+    let jsonData = null;
     if (!sceneSource) {
         url = rootUrl;
         name = Tools.GetFilename(rootUrl);
@@ -269,6 +274,11 @@ function GetFileInfo(rootUrl, sceneSource) {
         name = RandomGUID();
         rawData = sceneSource;
     }
+    else if (typeof sceneSource === "object") {
+        url = "";
+        name = RandomGUID();
+        jsonData = sceneSource;
+    }
     else if (sceneSource.startsWith("data:")) {
         url = sceneSource;
         name = "";
@@ -293,6 +303,7 @@ function GetFileInfo(rootUrl, sceneSource) {
         name: name,
         file: file,
         rawData,
+        jsonData,
     };
 }
 /**