Skip to content

Commit 8e7bdd3

Browse files
committed
C file and Prefab rig. also fixed issue with half transparent color on empty view on AR mode
1 parent b679c25 commit 8e7bdd3

File tree

7 files changed

+4
-22
lines changed

7 files changed

+4
-22
lines changed

Assets/WebGLTemplates/WebXR/index.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
if (!UnityLoader.SystemInfo.hasWebGL) {
1515
unityInstance.popup('Your browser does not support WebGL',
1616
[{text: 'OK', callback: onerror}]);
17-
} else if (['Edge', 'Firefox', 'Chrome', 'Safari'].indexOf(UnityLoader.SystemInfo.browser) == -1 && UnityLoader.SystemInfo.os != 'iOS') {
18-
unityInstance.popup([
19-
UnityLoader.SystemInfo.os,
20-
UnityLoader.SystemInfo.browser,
21-
'No support for Unity WebGL content'
22-
].join(' '), [{text: 'OK', callback: onsuccess}]);
2317
} else {
2418
onsuccess();
2519
}

Assets/WebGLTemplates/WebXRFullView/index.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
if (!UnityLoader.SystemInfo.hasWebGL) {
1616
unityInstance.popup('Your browser does not support WebGL',
1717
[{text: 'OK', callback: onerror}]);
18-
} else if (['Edge', 'Firefox', 'Chrome', 'Safari'].indexOf(UnityLoader.SystemInfo.browser) == -1 && UnityLoader.SystemInfo.os != 'iOS') {
19-
unityInstance.popup([
20-
UnityLoader.SystemInfo.os,
21-
UnityLoader.SystemInfo.browser,
22-
'No support for Unity WebGL content'
23-
].join(' '), [{text: 'OK', callback: onsuccess}]);
2418
} else {
2519
onsuccess();
2620
}

Assets/WebXR/Plugins/WebGL/webxr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#include "emscripten.h"
33

44
typedef void (*webxr_void)();
5-
typedef void (*webxr_void_int)();
5+
typedef void (*webxr_void_int)(int32_t);
66
typedef void (*webxr_void_int_float4_float4)(int32_t, float, float, float, float, float, float, float, float);
7-
typedef void (*webxr_void_string)();
7+
typedef void (*webxr_void_string)(const char *ptr);
88

99
webxr_void_int_float4_float4 on_start_ar_ref;
1010
webxr_void_int on_start_vr_ref;

Assets/WebXR/Samples/Desert/Prefabs/WebXRCameraSet.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,7 +1889,7 @@ Camera:
18891889
m_GameObject: {fileID: 3250837035476248814}
18901890
m_Enabled: 1
18911891
serializedVersion: 2
1892-
m_ClearFlags: 3
1892+
m_ClearFlags: 4
18931893
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
18941894
m_projectionMatrixMode: 1
18951895
m_GateFitMode: 2
@@ -1963,7 +1963,7 @@ Camera:
19631963
m_GameObject: {fileID: 6032564905858711458}
19641964
m_Enabled: 1
19651965
serializedVersion: 2
1966-
m_ClearFlags: 3
1966+
m_ClearFlags: 4
19671967
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
19681968
m_projectionMatrixMode: 1
19691969
m_GateFitMode: 2

Build/Build/Build.data.unityweb

-1 Bytes
Binary file not shown.

Build/Build/Build.wasm

0 Bytes
Binary file not shown.

Build/index.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
if (!UnityLoader.SystemInfo.hasWebGL) {
1515
unityInstance.popup('Your browser does not support WebGL',
1616
[{text: 'OK', callback: onerror}]);
17-
} else if (['Edge', 'Firefox', 'Chrome', 'Safari'].indexOf(UnityLoader.SystemInfo.browser) == -1 && UnityLoader.SystemInfo.os != 'iOS') {
18-
unityInstance.popup([
19-
UnityLoader.SystemInfo.os,
20-
UnityLoader.SystemInfo.browser,
21-
'No support for Unity WebGL content'
22-
].join(' '), [{text: 'OK', callback: onsuccess}]);
2317
} else {
2418
onsuccess();
2519
}

0 commit comments

Comments
 (0)