Skip to content

Commit 0b5b94f

Browse files
committed
Removed custom JavaScript dispatch events and event listeners
1 parent a0ea064 commit 0b5b94f

File tree

11 files changed

+27
-25
lines changed

11 files changed

+27
-25
lines changed

Build/Build/Build.data.unityweb

-1 Bytes
Binary file not shown.

Build/Build/Build.wasm

10 Bytes
Binary file not shown.

Build/Build/Build.wasm.framework.unityweb

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

Build/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
}, false);
4545

4646
enterARButton.addEventListener('click', function (event) {
47-
document.dispatchEvent(new CustomEvent('toggleAR', {}));
47+
unityInstance.Module.WebXR.toggleAR();
4848
}, false);
4949
enterVRButton.addEventListener('click', function (event) {
50-
document.dispatchEvent(new CustomEvent('toggleVR', {}));
50+
unityInstance.Module.WebXR.toggleVR();
5151
}, false);
5252
</script>
5353
</body>

Packages/webxr/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Changed
9+
- Optimization for JavaScript to C# communication.
10+
11+
### Removed
12+
- Custom JavaScript dispatch events from the WebGLTemplates.
813

914
## [0.8.1] - 2020-03-06
1015
### Fixed

Packages/webxr/Hidden~/WebGLTemplates/WebXR/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
}, false);
4545

4646
enterARButton.addEventListener('click', function (event) {
47-
document.dispatchEvent(new CustomEvent('toggleAR', {}));
47+
unityInstance.Module.WebXR.toggleAR();
4848
}, false);
4949
enterVRButton.addEventListener('click', function (event) {
50-
document.dispatchEvent(new CustomEvent('toggleVR', {}));
50+
unityInstance.Module.WebXR.toggleVR();
5151
}, false);
5252
</script>
5353
</body>

Packages/webxr/Hidden~/WebGLTemplates/WebXR2020/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@
9292
}, false);
9393

9494
enterARButton.addEventListener('click', function (event) {
95-
document.dispatchEvent(new CustomEvent('toggleAR', {}));
95+
unityInstance.Module.WebXR.toggleAR();
9696
}, false);
9797
enterVRButton.addEventListener('click', function (event) {
98-
document.dispatchEvent(new CustomEvent('toggleVR', {}));
98+
unityInstance.Module.WebXR.toggleVR();
9999
}, false);
100100
</script>
101101
</body>

Packages/webxr/Hidden~/WebGLTemplates/WebXRFullView/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
}, false);
4646

4747
enterARButton.addEventListener('click', function (event) {
48-
document.dispatchEvent(new CustomEvent('toggleAR', {}));
48+
unityInstance.Module.WebXR.toggleAR();
4949
}, false);
5050
enterVRButton.addEventListener('click', function (event) {
51-
document.dispatchEvent(new CustomEvent('toggleVR', {}));
51+
unityInstance.Module.WebXR.toggleVR();
5252
}, false);
5353
</script>
5454
</body>

Packages/webxr/Hidden~/WebGLTemplates/WebXRFullView2020/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@
9191
}, false);
9292

9393
enterARButton.addEventListener('click', function (event) {
94-
document.dispatchEvent(new CustomEvent('toggleAR', {}));
94+
unityInstance.Module.WebXR.toggleAR();
9595
}, false);
9696
enterVRButton.addEventListener('click', function (event) {
97-
document.dispatchEvent(new CustomEvent('toggleVR', {}));
97+
unityInstance.Module.WebXR.toggleVR();
9898
}, false);
9999
</script>
100100
</body>

Packages/webxr/Runtime/Plugins/WebGL/webxr.jslib

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mergeInto(LibraryManager.library, {
99
Module.XRSharedArrayOffset = byteOffset;
1010
Module.XRSharedArrayLength= length;
1111
Module.XRSharedArray = new Float32Array(buffer, byteOffset, length);
12-
document.dispatchEvent(new CustomEvent('UnityLoaded', {detail: {state: 'Ready', module: Module}}));
12+
Module.WebXR.onUnityLoaded({detail: {state: 'Ready', module: Module}});
1313
},
1414

1515
InitControllersArray: function(byteOffset, length) {
@@ -31,18 +31,18 @@ mergeInto(LibraryManager.library, {
3131
},
3232

3333
ToggleAR: function() {
34-
document.dispatchEvent(new CustomEvent('toggleAR', {}));
34+
Module.WebXR.toggleAR();
3535
},
3636

3737
ToggleVR: function() {
38-
document.dispatchEvent(new CustomEvent('toggleVR', {}));
38+
Module.WebXR.toggleVR();
3939
},
4040

4141
ToggleViewerHitTest: function() {
42-
document.dispatchEvent(new CustomEvent('toggleHitTest', {}));
42+
Module.WebXR.toggleHitTest();
4343
},
4444

4545
ControllerPulse: function(controller, intensity, duration) {
46-
document.dispatchEvent(new CustomEvent('callHapticPulse', {detail: {'controller' : controller, 'intensity' : intensity, 'duration': duration}}));
46+
Module.WebXR.callHapticPulse({detail: {'controller' : controller, 'intensity' : intensity, 'duration': duration}});
4747
},
4848
});

0 commit comments

Comments
 (0)