Skip to content

Commit da71d56

Browse files
open scene WIP
1 parent e6e54a7 commit da71d56

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
@@ -670,18 +670,20 @@
670670
const maxResults = 12;
671671
if (s) {
672672
const regexps = s.split(/\s/).filter(s => !!s).map(s => new RegExp(escapeRegExp(s), 'i'));
673-
const results = [];
673+
const sceneResults = [];
674674
for (let i = 0; i < scenesJson.length; i++) {
675675
const site = scenesJson[i];
676676
if (regexps.some(regexp => regexp.test(site.label) || regexp.test(site.url))) {
677-
results.push(site);
678-
if (results.length >= maxResults) {
677+
sceneResults.push(site);
678+
if (sceneResults.length >= maxResults) {
679679
break;
680680
}
681681
}
682682
}
683-
return results;
683+
console.log("scenes.json --- sceneResults = " + sceneResults);
684+
return sceneResults;
684685
} else {
686+
console.log("scenes.json --- maxResults = " + maxResults);
685687
return scenesJson.slice(0, maxResults);
686688
}
687689
};
@@ -3282,11 +3284,10 @@
32823284
}
32833285
};
32843286

3285-
console.log(" ------ selectedTab = " + selectedTab);
32863287
if (selectedTab === 1) {
32873288
var searchResults = searchSitesJson(searchString);
32883289
} else if (selectedTab === 2) {
3289-
var searchResults = searchScenesJson(searchString);
3290+
var sceneResults = searchScenesJson(searchString);
32903291
}
32913292

32923293
uiIframe.contentWindow.postMessage({
@@ -3295,6 +3296,7 @@
32953296
htmlString: interfaceHtml,
32963297
templateData: {
32973298
searchResults,
3299+
sceneResults,
32983300
tab1: selectedTab === 1,
32993301
tab2: selectedTab === 2,
33003302
tab3: selectedTab === 3,
@@ -3632,7 +3634,7 @@
36323634
mesh.click = async (intersectionSpec, controllerIndex) => {
36333635
keyboardFocus = null;
36343636

3635-
const {id, href, name} = intersectionSpec;
3637+
const {id, href, name, url} = intersectionSpec;
36363638
if (id === 'url-input') {
36373639
const {x, y} = intersectionSpec;
36383640

@@ -3681,6 +3683,13 @@
36813683
} else {
36823684
console.log('paste fail');
36833685
}
3686+
} else if (id === 'action-open-scene') {
3687+
const dom = new DOMParser().parseFromString(url, 'text/html');
3688+
if (dom.body.childNodes.length === 1 && dom.body.childNodes[0].nodeName === 'XR-SITE') {
3689+
root.innerHTML = dom.body.childNodes[0].innerHTML;
3690+
} else {
3691+
console.log('paste fail');
3692+
}
36843693
} else if (href) {
36853694
const xrIframe = document.createElement('xr-iframe');
36863695
xrIframe.src = href;

0 commit comments

Comments
 (0)