Skip to content

Commit 77bc111

Browse files
open scene WIP
1 parent 305abd5 commit 77bc111

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

app.html

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -677,18 +677,20 @@
677677
const maxResults = 12;
678678
if (s) {
679679
const regexps = s.split(/\s/).filter(s => !!s).map(s => new RegExp(escapeRegExp(s), 'i'));
680-
const results = [];
680+
const sceneResults = [];
681681
for (let i = 0; i < scenesJson.length; i++) {
682682
const site = scenesJson[i];
683683
if (regexps.some(regexp => regexp.test(site.label) || regexp.test(site.url))) {
684-
results.push(site);
685-
if (results.length >= maxResults) {
684+
sceneResults.push(site);
685+
if (sceneResults.length >= maxResults) {
686686
break;
687687
}
688688
}
689689
}
690-
return results;
690+
console.log("scenes.json --- sceneResults = " + sceneResults);
691+
return sceneResults;
691692
} else {
693+
console.log("scenes.json --- maxResults = " + maxResults);
692694
return scenesJson.slice(0, maxResults);
693695
}
694696
};
@@ -3301,11 +3303,10 @@
33013303
}
33023304
};
33033305

3304-
console.log(" ------ selectedTab = " + selectedTab);
33053306
if (selectedTab === 1) {
33063307
var searchResults = searchSitesJson(searchString);
33073308
} else if (selectedTab === 2) {
3308-
var searchResults = searchScenesJson(searchString);
3309+
var sceneResults = searchScenesJson(searchString);
33093310
}
33103311

33113312
uiIframe.contentWindow.postMessage({
@@ -3314,6 +3315,7 @@
33143315
htmlString: interfaceHtml,
33153316
templateData: {
33163317
searchResults,
3318+
sceneResults,
33173319
tab1: selectedTab === 1,
33183320
tab2: selectedTab === 2,
33193321
tab3: selectedTab === 3,
@@ -3659,7 +3661,7 @@
36593661
mesh.click = async (intersectionSpec, controllerIndex) => {
36603662
keyboardFocus = null;
36613663

3662-
const {id, href, name} = intersectionSpec;
3664+
const {id, href, name, url} = intersectionSpec;
36633665
if (id === 'url-input') {
36643666
const {x, y} = intersectionSpec;
36653667

@@ -3721,6 +3723,13 @@
37213723
_setChannel(2);
37223724
} else if (id === 'channel-global') {
37233725
_setChannel(3);
3726+
} else if (id === 'action-open-scene') {
3727+
const dom = new DOMParser().parseFromString(url, 'text/html');
3728+
if (dom.body.childNodes.length === 1 && dom.body.childNodes[0].nodeName === 'XR-SITE') {
3729+
root.innerHTML = dom.body.childNodes[0].innerHTML;
3730+
} else {
3731+
console.log('paste fail');
3732+
}
37243733
} else if (href) {
37253734
const xrIframe = document.createElement('xr-iframe');
37263735
xrIframe.src = href;

0 commit comments

Comments
 (0)