From cc20630d30fff99d527a9d23d4c3aa66c678bed8 Mon Sep 17 00:00:00 2001 From: Kohei Futatsuka Date: Mon, 16 May 2022 10:54:27 +0900 Subject: [PATCH 1/4] ip --- src/figni-viewer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/figni-viewer.js b/src/figni-viewer.js index 0ee2b30..5ceaf4f 100644 --- a/src/figni-viewer.js +++ b/src/figni-viewer.js @@ -982,6 +982,7 @@ export default class FigniViewerElement extends HTMLElement { this.#arButton = document.createElement('span') this.#arButton.innerHTML = `${SVG_AR_BUTTON}${this.ABTEST.AR_BUTTON_TEST}` this.#arButton.classList.add('figni-viewer-ar-button') + alert(this.#figniViewerBase.canActivateAR) this.#arButton.addEventListener('click', () => { if (this.#figniViewerBase.canActivateAR) { this.#figniViewerBase.activateARMode() From 5497291c3f4874fa9b3348b6d239cc9a12d78260 Mon Sep 17 00:00:00 2001 From: Kohei Futatsuka Date: Mon, 16 May 2022 15:10:11 +0900 Subject: [PATCH 2/4] fix --- src/figni-viewer-base.js | 2 +- src/figni-viewer.js | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/figni-viewer-base.js b/src/figni-viewer-base.js index 34fb392..45c8bef 100644 --- a/src/figni-viewer-base.js +++ b/src/figni-viewer-base.js @@ -223,7 +223,7 @@ export default class FigniViewerBaseElement extends ModelViewerElement { this.cameraControls = true this.ar = true // ! 一時的にWebXRを起動しないようにします - this.arModes = 'scene-viewer quick-look' + this.arModes = 'webxr scene-viewer quick-look' this.arScale = 'fixed' this.arPlacement = 'floor' this.shadowIntensity = 1 diff --git a/src/figni-viewer.js b/src/figni-viewer.js index 5ceaf4f..e3b7678 100644 --- a/src/figni-viewer.js +++ b/src/figni-viewer.js @@ -982,11 +982,15 @@ export default class FigniViewerElement extends HTMLElement { this.#arButton = document.createElement('span') this.#arButton.innerHTML = `${SVG_AR_BUTTON}${this.ABTEST.AR_BUTTON_TEST}` this.#arButton.classList.add('figni-viewer-ar-button') - alert(this.#figniViewerBase.canActivateAR) - this.#arButton.addEventListener('click', () => { + this.#figniViewerBase.addEventListener('load', (e) => { if (this.#figniViewerBase.canActivateAR) { - this.#figniViewerBase.activateARMode() + this.#arButton.setAttribute('slot', 'ar-button') } else { + this.#arButton.removeAttribute('slot') + } + }) + this.#arButton.addEventListener('click', () => { + if (!this.#figniViewerBase.canActivateAR) { this.#showQRCodePanel() } }) From 26e5248621a75e0158a440419cc64d790a6ef6e0 Mon Sep 17 00:00:00 2001 From: Kohei Futatsuka Date: Mon, 16 May 2022 15:14:34 +0900 Subject: [PATCH 3/4] del message --- src/figni-viewer-base.js | 1 - src/figni-viewer.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/figni-viewer-base.js b/src/figni-viewer-base.js index 45c8bef..569bc2e 100644 --- a/src/figni-viewer-base.js +++ b/src/figni-viewer-base.js @@ -222,7 +222,6 @@ export default class FigniViewerBaseElement extends ModelViewerElement { this.loading = 'lazy' this.cameraControls = true this.ar = true - // ! 一時的にWebXRを起動しないようにします this.arModes = 'webxr scene-viewer quick-look' this.arScale = 'fixed' this.arPlacement = 'floor' diff --git a/src/figni-viewer.js b/src/figni-viewer.js index e3b7678..f6b0e23 100644 --- a/src/figni-viewer.js +++ b/src/figni-viewer.js @@ -982,7 +982,7 @@ export default class FigniViewerElement extends HTMLElement { this.#arButton = document.createElement('span') this.#arButton.innerHTML = `${SVG_AR_BUTTON}${this.ABTEST.AR_BUTTON_TEST}` this.#arButton.classList.add('figni-viewer-ar-button') - this.#figniViewerBase.addEventListener('load', (e) => { + this.#figniViewerBase.addEventListener('load', () => { if (this.#figniViewerBase.canActivateAR) { this.#arButton.setAttribute('slot', 'ar-button') } else { From c0eebc3ea0d0c299fc8d76ed8f3c2422c91cc05e Mon Sep 17 00:00:00 2001 From: Kohei Futatsuka Date: Mon, 16 May 2022 15:19:49 +0900 Subject: [PATCH 4/4] upd --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4828b1c..32303c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - 使い方を紹介しているヘルプページを追加 +- WebXR の起動をサポート ### Changed