Skip to content

Commit 737812c

Browse files
authored
Merge pull request #135 from De-Panther/move_transferdata_to_jspre
Optimization for JavaScript to C# communication
2 parents 6324344 + 0b5b94f commit 737812c

File tree

13 files changed

+142
-151
lines changed

13 files changed

+142
-151
lines changed

Build/Build/Build.data.unityweb

-49 Bytes
Binary file not shown.

Build/Build/Build.wasm

3.85 KB
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>

MainProject/ProjectSettings/ProjectSettings.asset

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,7 @@ PlayerSettings:
125125
16:9: 1
126126
Others: 1
127127
bundleVersion: 0.1
128-
preloadedAssets:
129-
- {fileID: 2478256764130162806, guid: 552445d583cb06c4eaf9d56596dd45c2, type: 2}
130-
- {fileID: 11400000, guid: 65eada5edf5f16b4a9d0bd3a76fa026f, type: 2}
131-
- {fileID: 11400000, guid: a5e5b7605fb48984988490688c2a74e2, type: 2}
128+
preloadedAssets: []
132129
metroInputSource: 0
133130
wsaTransparentSwapchain: 0
134131
m_HolographicPauseOnTrackingLoss: 1

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>

0 commit comments

Comments
 (0)