Skip to content

Commit 37c5632

Browse files
authored
Merge pull request #158 from De-Panther/interop_optimizations
Interop optimizations
2 parents 88cbd7a + 1a952d0 commit 37c5632

File tree

6 files changed

+248
-484
lines changed

6 files changed

+248
-484
lines changed

Packages/webxr/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ 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+
- How the interoperability between JavaScript and C# works.
810

911
## [0.11.0] - 2021-06-06
1012
### Added

Packages/webxr/Runtime/Plugins/WebGL/webxr.c

Lines changed: 0 additions & 69 deletions
This file was deleted.

Packages/webxr/Runtime/Plugins/WebGL/webxr.c.meta

Lines changed: 0 additions & 69 deletions
This file was deleted.

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,32 @@ mergeInto(LibraryManager.library, {
55
console.log(Module.WebXR.Settings);
66
},
77

8-
InitXRSharedArray: function(byteOffset, length) {
9-
Module.XRSharedArrayOffset = byteOffset;
10-
Module.XRSharedArrayLength= length;
11-
Module.XRSharedArray = new Float32Array(buffer, byteOffset, length);
8+
SetWebXREvents: function(onStartARPtr,
9+
onStartVRPtr, onVisibilityChangePtr, onEndXRPtr,
10+
onXRCapabilitiesPtr, onInputProfilesPtr) {
11+
Module.WebXR.onStartARPtr = onStartARPtr;
12+
Module.WebXR.onStartVRPtr = onStartVRPtr;
13+
Module.WebXR.onVisibilityChangePtr = onVisibilityChangePtr;
14+
Module.WebXR.onEndXRPtr = onEndXRPtr;
15+
Module.WebXR.onXRCapabilitiesPtr = onXRCapabilitiesPtr;
16+
Module.WebXR.onInputProfilesPtr = onInputProfilesPtr;
17+
},
18+
19+
InitXRSharedArray: function(byteOffset) {
20+
Module.XRSharedArrayOffset = byteOffset / 4;
1221
Module.WebXR.onUnityLoaded({detail: {state: 'Ready', module: Module}});
1322
},
1423

15-
InitControllersArray: function(byteOffset, length) {
16-
Module.ControllersArrayOffset = byteOffset;
17-
Module.ControllersArrayLength= length;
18-
Module.ControllersArray = new Float32Array(buffer, byteOffset, length);
24+
InitControllersArray: function(byteOffset) {
25+
Module.ControllersArrayOffset = byteOffset / 4;
1926
},
2027

21-
InitHandsArray: function(byteOffset, length) {
22-
Module.HandsArrayOffset = byteOffset;
23-
Module.HandsArrayLength= length;
24-
Module.HandsArray = new Float32Array(buffer, byteOffset, length);
28+
InitHandsArray: function(byteOffset) {
29+
Module.HandsArrayOffset = byteOffset / 4;
2530
},
2631

27-
InitViewerHitTestPoseArray: function(byteOffset, length) {
28-
Module.ViewerHitTestPoseArrayOffset = byteOffset;
29-
Module.ViewerHitTestPoseArrayLength= length;
30-
Module.ViewerHitTestPoseArray = new Float32Array(buffer, byteOffset, length);
32+
InitViewerHitTestPoseArray: function(byteOffset) {
33+
Module.ViewerHitTestPoseArrayOffset = byteOffset / 4;
3134
},
3235

3336
ToggleAR: function() {

0 commit comments

Comments
 (0)