Skip to content

Commit 36fad31

Browse files
committed
integrated NewMain branch into main
1 parent 5935f0e commit 36fad31

18 files changed

+661
-757
lines changed

Assets/Settings/URP-HighFidelity-Renderer.asset

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-5812586544263212320
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 66b22628b7c9ea84c9ecbf4c4a487849, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
m_Active: 1
316
--- !u!114 &-1878332245247344467
417
MonoBehaviour:
518
m_ObjectHideFlags: 0
@@ -53,7 +66,8 @@ MonoBehaviour:
5366
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
5467
m_RendererFeatures:
5568
- {fileID: -1878332245247344467}
56-
m_RendererFeatureMap: adc0de57c6d2eee5
69+
- {fileID: -5812586544263212320}
70+
m_RendererFeatureMap: adc0de57c6d2eee5e0d2f99a558b55af
5771
m_UseNativeRenderPass: 0
5872
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
5973
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!84 &8400000
4+
RenderTexture:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: SpectatorCam
10+
m_ImageContentsHash:
11+
serializedVersion: 2
12+
Hash: 00000000000000000000000000000000
13+
m_ForcedFallbackFormat: 4
14+
m_DownscaleFallback: 0
15+
m_IsAlphaChannelOptional: 0
16+
serializedVersion: 5
17+
m_Width: 3840
18+
m_Height: 2160
19+
m_AntiAliasing: 1
20+
m_MipCount: -1
21+
m_DepthStencilFormat: 94
22+
m_ColorFormat: 8
23+
m_MipMap: 0
24+
m_GenerateMips: 1
25+
m_SRGB: 0
26+
m_UseDynamicScale: 0
27+
m_BindMS: 0
28+
m_EnableCompatibleFormat: 1
29+
m_EnableRandomWrite: 0
30+
m_TextureSettings:
31+
serializedVersion: 2
32+
m_FilterMode: 1
33+
m_Aniso: 0
34+
m_MipBias: 0
35+
m_WrapU: 1
36+
m_WrapV: 1
37+
m_WrapW: 1
38+
m_Dimension: 2
39+
m_VolumeDepth: 1
40+
m_ShadowSamplingMode: 2

Assets/_SpatialControlRoom/MaterialsTextures/NDI/SpectatorCam.renderTexture.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_SpatialControlRoom/Prefab/UiInputSelection.prefab

+13-10
Original file line numberDiff line numberDiff line change
@@ -1357,6 +1357,7 @@ GameObject:
13571357
m_Component:
13581358
- component: {fileID: 4372418222074756518}
13591359
- component: {fileID: 8518991073269423874}
1360+
- component: {fileID: 7565793178287887570}
13601361
m_Layer: 0
13611362
m_Name: UiInputSelection
13621363
m_TagString: Untagged
@@ -1412,6 +1413,18 @@ MonoBehaviour:
14121413
- {fileID: 8142655638592797674}
14131414
- {fileID: 596557564114302061}
14141415
- {fileID: 6233229978842047988}
1416+
--- !u!114 &7565793178287887570
1417+
MonoBehaviour:
1418+
m_ObjectHideFlags: 0
1419+
m_CorrespondingSourceObject: {fileID: 0}
1420+
m_PrefabInstance: {fileID: 0}
1421+
m_PrefabAsset: {fileID: 0}
1422+
m_GameObject: {fileID: 7506673742445820279}
1423+
m_Enabled: 1
1424+
m_EditorHideFlags: 0
1425+
m_Script: {fileID: 11500000, guid: a4c71fce087419e41b687a090e5cc332, type: 3}
1426+
m_Name:
1427+
m_EditorClassIdentifier:
14151428
lazyFollow: {fileID: 0}
14161429
renableDelay: 0.5
14171430
--- !u!1 &7904185681260201506
@@ -3916,11 +3929,6 @@ PrefabInstance:
39163929
propertyPath: textureOffset
39173930
value: 2
39183931
objectReference: {fileID: 0}
3919-
- target: {fileID: 5322756314261159650, guid: 57ea0a83cbad69243810150afe471243,
3920-
type: 3}
3921-
propertyPath: uiInputSelectionPanel
3922-
value:
3923-
objectReference: {fileID: 8518991073269423874}
39243932
- target: {fileID: 5499427769192021769, guid: 57ea0a83cbad69243810150afe471243,
39253933
type: 3}
39263934
propertyPath: Parent
@@ -4766,11 +4774,6 @@ PrefabInstance:
47664774
propertyPath: textureOffset
47674775
value: 3
47684776
objectReference: {fileID: 0}
4769-
- target: {fileID: 5322756314261159650, guid: 57ea0a83cbad69243810150afe471243,
4770-
type: 3}
4771-
propertyPath: uiInputSelectionPanel
4772-
value:
4773-
objectReference: {fileID: 8518991073269423874}
47744777
- target: {fileID: 5499427769192021769, guid: 57ea0a83cbad69243810150afe471243,
47754778
type: 3}
47764779
propertyPath: Parent

0 commit comments

Comments
 (0)