Skip to content

Commit 134fe85

Browse files
De-PantherDe-Panther
authored
Merge pull request #331 from De-Panther/xr_sdk_new_support
Add support for Unity XR SDK
2 parents f1c6e79 + 62871d1 commit 134fe85

File tree

250 files changed

+9650
-3173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+9650
-3173
lines changed

‎Build/Build/Build.data

-1.36 MB
Binary file not shown.

‎Build/Build/Build.framework.js

Lines changed: 74 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Build/Build/Build.wasm

10.1 MB
Binary file not shown.

‎DebugProjects/Unity2020.3/Packages/manifest.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"dependencies": {
3+
"com.de-panther.webxr-input-profiles-loader": "0.4.0",
34
"com.unity.ide.rider": "2.0.7",
45
"com.unity.ide.visualstudio": "2.0.8",
5-
"com.unity.ide.vscode": "1.2.3",
6+
"com.unity.ide.vscode": "1.2.5",
7+
"com.unity.render-pipelines.universal": "10.5.1",
68
"com.unity.test-framework": "1.1.24",
79
"com.unity.textmeshpro": "3.0.6",
810
"com.unity.timeline": "1.4.8",
@@ -40,5 +42,15 @@
4042
"com.unity.modules.vr": "1.0.0",
4143
"com.unity.modules.wind": "1.0.0",
4244
"com.unity.modules.xr": "1.0.0"
43-
}
45+
},
46+
"scopedRegistries": [
47+
{
48+
"name": "OpenUPM",
49+
"url": "https://package.openupm.com",
50+
"scopes": [
51+
"com.de-panther",
52+
"com.atteneder"
53+
]
54+
}
55+
]
4456
}

‎DebugProjects/Unity2020.3/Packages/packages-lock.json

Lines changed: 85 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
{
22
"dependencies": {
3+
"com.atteneder.gltfast": {
4+
"version": "4.4.8",
5+
"depth": 1,
6+
"source": "registry",
7+
"dependencies": {
8+
"com.unity.modules.jsonserialize": "1.0.0",
9+
"com.unity.modules.unitywebrequest": "1.0.0",
10+
"com.unity.modules.unitywebrequesttexture": "1.0.0",
11+
"com.unity.mathematics": "1.2.1",
12+
"com.unity.burst": "1.4.11"
13+
},
14+
"url": "https://package.openupm.com"
15+
},
316
"com.de-panther.webxr": {
417
"version": "file:webxr",
518
"depth": 0,
@@ -8,14 +21,33 @@
821
"com.unity.xr.management": "3.2.13"
922
}
1023
},
24+
"com.de-panther.webxr-input-profiles-loader": {
25+
"version": "0.4.0",
26+
"depth": 0,
27+
"source": "registry",
28+
"dependencies": {
29+
"com.unity.nuget.newtonsoft-json": "2.0.0",
30+
"com.atteneder.gltfast": "4.4.8"
31+
},
32+
"url": "https://package.openupm.com"
33+
},
1134
"com.de-panther.webxr-interactions": {
1235
"version": "file:webxr-interactions",
1336
"depth": 0,
1437
"source": "embedded",
1538
"dependencies": {
16-
"com.de-panther.webxr": "0.18.0"
39+
"com.de-panther.webxr": "0.19.0"
1740
}
1841
},
42+
"com.unity.burst": {
43+
"version": "1.4.11",
44+
"depth": 2,
45+
"source": "registry",
46+
"dependencies": {
47+
"com.unity.mathematics": "1.2.1"
48+
},
49+
"url": "https://packages.unity.com"
50+
},
1951
"com.unity.ext.nunit": {
2052
"version": "1.0.6",
2153
"depth": 1,
@@ -42,12 +74,63 @@
4274
"url": "https://packages.unity.com"
4375
},
4476
"com.unity.ide.vscode": {
45-
"version": "1.2.3",
77+
"version": "1.2.5",
4678
"depth": 0,
4779
"source": "registry",
4880
"dependencies": {},
4981
"url": "https://packages.unity.com"
5082
},
83+
"com.unity.mathematics": {
84+
"version": "1.2.1",
85+
"depth": 2,
86+
"source": "registry",
87+
"dependencies": {},
88+
"url": "https://packages.unity.com"
89+
},
90+
"com.unity.nuget.newtonsoft-json": {
91+
"version": "2.0.0",
92+
"depth": 1,
93+
"source": "registry",
94+
"dependencies": {},
95+
"url": "https://packages.unity.com"
96+
},
97+
"com.unity.render-pipelines.core": {
98+
"version": "10.5.1",
99+
"depth": 1,
100+
"source": "registry",
101+
"dependencies": {
102+
"com.unity.ugui": "1.0.0"
103+
},
104+
"url": "https://packages.unity.com"
105+
},
106+
"com.unity.render-pipelines.universal": {
107+
"version": "10.5.1",
108+
"depth": 0,
109+
"source": "registry",
110+
"dependencies": {
111+
"com.unity.mathematics": "1.1.0",
112+
"com.unity.render-pipelines.core": "10.5.1",
113+
"com.unity.shadergraph": "10.5.1"
114+
},
115+
"url": "https://packages.unity.com"
116+
},
117+
"com.unity.searcher": {
118+
"version": "4.3.2",
119+
"depth": 2,
120+
"source": "registry",
121+
"dependencies": {},
122+
"url": "https://packages.unity.com"
123+
},
124+
"com.unity.shadergraph": {
125+
"version": "10.5.1",
126+
"depth": 1,
127+
"source": "registry",
128+
"dependencies": {
129+
"com.unity.render-pipelines.core": "10.5.1",
130+
"com.unity.searcher": "4.3.2"
131+
},
132+
"url": "https://packages.unity.com"
133+
},
51134
"com.unity.subsystemregistration": {
52135
"version": "1.0.6",
53136
"depth": 1,

‎DebugProjects/Unity2020.3/ProjectSettings/BurstAotSettings_WebGL.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"MonoBehaviour": {
3+
"Version": 3,
4+
"EnableBurstCompilation": true,
5+
"EnableOptimisations": true,
6+
"EnableSafetyChecks": false,
7+
"EnableDebugInAllBuilds": false,
8+
"CpuMinTargetX32": 0,
9+
"CpuMaxTargetX32": 0,
10+
"CpuMinTargetX64": 0,
11+
"CpuMaxTargetX64": 0
12+
}
13+
}

‎DebugProjects/Unity2020.3/ProjectSettings/GraphicsSettings.asset

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,19 @@ GraphicsSettings:
2828
m_LensFlare:
2929
m_Mode: 1
3030
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
31+
m_VideoShadersIncludeMode: 2
3132
m_AlwaysIncludedShaders:
3233
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
3334
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
3435
- {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
3536
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
3637
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
3738
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
39+
- {fileID: -6465566751694194690, guid: 90c26dfde11bf4ff69ef936c6e6b1ed1, type: 3}
40+
- {fileID: -6465566751694194690, guid: ba6d401c74b2c4f96af7edf0fe32241e, type: 3}
3841
m_PreloadedShaders: []
39-
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
40-
type: 0}
41-
m_CustomRenderPipeline: {fileID: 0}
42+
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
43+
m_CustomRenderPipeline: {fileID: 11400000, guid: 0dcf41294e797d14f8c171cc44416ba8, type: 2}
4244
m_TransparencySortMode: 0
4345
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
4446
m_DefaultRenderingPath: 1
@@ -59,5 +61,5 @@ GraphicsSettings:
5961
m_AlbedoSwatchInfos: []
6062
m_LightsUseLinearIntensity: 0
6163
m_LightsUseColorTemperature: 0
64+
m_DefaultRenderingLayerMask: 1
6265
m_LogWhenShaderIsCompiled: 0
63-
m_AllowEnlightenSupportForUpgradedProject: 0

‎DebugProjects/Unity2020.3/ProjectSettings/InputManager.asset

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,3 +293,195 @@ InputManager:
293293
type: 0
294294
axis: 0
295295
joyNum: 0
296+
- serializedVersion: 3
297+
m_Name: Enable Debug Button 1
298+
descriptiveName:
299+
descriptiveNegativeName:
300+
negativeButton:
301+
positiveButton: left ctrl
302+
altNegativeButton:
303+
altPositiveButton: joystick button 8
304+
gravity: 0
305+
dead: 0
306+
sensitivity: 0
307+
snap: 0
308+
invert: 0
309+
type: 0
310+
axis: 0
311+
joyNum: 0
312+
- serializedVersion: 3
313+
m_Name: Enable Debug Button 2
314+
descriptiveName:
315+
descriptiveNegativeName:
316+
negativeButton:
317+
positiveButton: backspace
318+
altNegativeButton:
319+
altPositiveButton: joystick button 9
320+
gravity: 0
321+
dead: 0
322+
sensitivity: 0
323+
snap: 0
324+
invert: 0
325+
type: 0
326+
axis: 0
327+
joyNum: 0
328+
- serializedVersion: 3
329+
m_Name: Debug Reset
330+
descriptiveName:
331+
descriptiveNegativeName:
332+
negativeButton:
333+
positiveButton: left alt
334+
altNegativeButton:
335+
altPositiveButton: joystick button 1
336+
gravity: 0
337+
dead: 0
338+
sensitivity: 0
339+
snap: 0
340+
invert: 0
341+
type: 0
342+
axis: 0
343+
joyNum: 0
344+
- serializedVersion: 3
345+
m_Name: Debug Next
346+
descriptiveName:
347+
descriptiveNegativeName:
348+
negativeButton:
349+
positiveButton: page down
350+
altNegativeButton:
351+
altPositiveButton: joystick button 5
352+
gravity: 0
353+
dead: 0
354+
sensitivity: 0
355+
snap: 0
356+
invert: 0
357+
type: 0
358+
axis: 0
359+
joyNum: 0
360+
- serializedVersion: 3
361+
m_Name: Debug Previous
362+
descriptiveName:
363+
descriptiveNegativeName:
364+
negativeButton:
365+
positiveButton: page up
366+
altNegativeButton:
367+
altPositiveButton: joystick button 4
368+
gravity: 0
369+
dead: 0
370+
sensitivity: 0
371+
snap: 0
372+
invert: 0
373+
type: 0
374+
axis: 0
375+
joyNum: 0
376+
- serializedVersion: 3
377+
m_Name: Debug Validate
378+
descriptiveName:
379+
descriptiveNegativeName:
380+
negativeButton:
381+
positiveButton: return
382+
altNegativeButton:
383+
altPositiveButton: joystick button 0
384+
gravity: 0
385+
dead: 0
386+
sensitivity: 0
387+
snap: 0
388+
invert: 0
389+
type: 0
390+
axis: 0
391+
joyNum: 0
392+
- serializedVersion: 3
393+
m_Name: Debug Persistent
394+
descriptiveName:
395+
descriptiveNegativeName:
396+
negativeButton:
397+
positiveButton: right shift
398+
altNegativeButton:
399+
altPositiveButton: joystick button 2
400+
gravity: 0
401+
dead: 0
402+
sensitivity: 0
403+
snap: 0
404+
invert: 0
405+
type: 0
406+
axis: 0
407+
joyNum: 0
408+
- serializedVersion: 3
409+
m_Name: Debug Multiplier
410+
descriptiveName:
411+
descriptiveNegativeName:
412+
negativeButton:
413+
positiveButton: left shift
414+
altNegativeButton:
415+
altPositiveButton: joystick button 3
416+
gravity: 0
417+
dead: 0
418+
sensitivity: 0
419+
snap: 0
420+
invert: 0
421+
type: 0
422+
axis: 0
423+
joyNum: 0
424+
- serializedVersion: 3
425+
m_Name: Debug Horizontal
426+
descriptiveName:
427+
descriptiveNegativeName:
428+
negativeButton: left
429+
positiveButton: right
430+
altNegativeButton:
431+
altPositiveButton:
432+
gravity: 1000
433+
dead: 0.001
434+
sensitivity: 1000
435+
snap: 0
436+
invert: 0
437+
type: 0
438+
axis: 0
439+
joyNum: 0
440+
- serializedVersion: 3
441+
m_Name: Debug Vertical
442+
descriptiveName:
443+
descriptiveNegativeName:
444+
negativeButton: down
445+
positiveButton: up
446+
altNegativeButton:
447+
altPositiveButton:
448+
gravity: 1000
449+
dead: 0.001
450+
sensitivity: 1000
451+
snap: 0
452+
invert: 0
453+
type: 0
454+
axis: 0
455+
joyNum: 0
456+
- serializedVersion: 3
457+
m_Name: Debug Vertical
458+
descriptiveName:
459+
descriptiveNegativeName:
460+
negativeButton: down
461+
positiveButton: up
462+
altNegativeButton:
463+
altPositiveButton:
464+
gravity: 1000
465+
dead: 0.001
466+
sensitivity: 1000
467+
snap: 0
468+
invert: 0
469+
type: 2
470+
axis: 6
471+
joyNum: 0
472+
- serializedVersion: 3
473+
m_Name: Debug Horizontal
474+
descriptiveName:
475+
descriptiveNegativeName:
476+
negativeButton: left
477+
positiveButton: right
478+
altNegativeButton:
479+
altPositiveButton:
480+
gravity: 1000
481+
dead: 0.001
482+
sensitivity: 1000
483+
snap: 0
484+
invert: 0
485+
type: 2
486+
axis: 5
487+
joyNum: 0

0 commit comments

Comments
 (0)