From 9e89eef250d27f10adccd79d8f69f60746c09d4a Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 5 Sep 2021 11:07:15 -0400 Subject: [PATCH] add options to load_url for grouping and file name --- src/kiri/main.js | 6 +++--- src/moto/load-url.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kiri/main.js b/src/kiri/main.js index c32ba88a..92c479c8 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -1875,11 +1875,11 @@ console.log/** Copyright Stewart Allen -- All Rights Reserved */ }, formdata, scale); } - function platformLoadURL(url, group) { + function platformLoadURL(url, options = {}) { platform.group(); - MOTO.URL.load(url).then((objects) => { + MOTO.URL.load(url, options).then((objects) => { for (let object of objects) { - let widget = newWidget(undefined, group).loadVertices(object.mesh); + let widget = newWidget(undefined, options.group).loadVertices(object.mesh); widget.meta.file = object.file; platform.add(widget); } diff --git a/src/moto/load-url.js b/src/moto/load-url.js index 8a5553e3..56371899 100644 --- a/src/moto/load-url.js +++ b/src/moto/load-url.js @@ -9,7 +9,7 @@ function load(url, options = {}) { return new Promise((resolve, reject) => { let xhr = new XMLHttpRequest(); - let file = (((url.split('?')[0]).split('#')[0]).split('/')).pop(); + let file = options.file || options.filename || (((url.split('?')[0]).split('#')[0]).split('/')).pop(); let ext = file.split('.').pop().toLowerCase(); let deftype = ext === "obj" ? "text" : "arraybuffer"; let datatype = options.datatype || deftype;