Skip to content

Commit 40d2a15

Browse files
committed
Remove Runtime and Editor assemblies but maintain code/folder
Essentially, the monolitch assembly Unity.InputSystem was added back. The folder structure was kept so that the Runtime code is decoupled from Editor dependencies. This will help us move into a module in trunk and helps doing backports in the future, as well as current forward ports until the team is all onboarded into trunk.
1 parent 246b3e0 commit 40d2a15

File tree

1,308 files changed

+659
-171
lines changed

Some content is hidden

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

1,308 files changed

+659
-171
lines changed

Assets/QA/Tests/XRDeviceActions/XRDeviceActions.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"rootNamespace": "",
44
"references": [
55
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
6-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
7-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
6+
"GUID:75469ad4d38634e559750d17036d5f7c"
87
],
98
"includePlatforms": [],
109
"excludePlatforms": [],

Assets/Samples/InGameHints/Unity.InputSystem.InGameHints.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"rootNamespace": "",
44
"references": [
55
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
6-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
7-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
6+
"GUID:75469ad4d38634e559750d17036d5f7c"
87
],
98
"includePlatforms": [],
109
"excludePlatforms": [],

Assets/Samples/InputRecorder/Unity.InputSystem.Recorder.asmdef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Unity.InputSystem.Recorder",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:d46adbc216ac24e9a86f26d7a54b2384"
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
66
],
77
"includePlatforms": [],
88
"excludePlatforms": [],

Assets/Samples/ProjectWideActions/ProjectWideActions.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "ProjectWideActions",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
6-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
76
],
87
"includePlatforms": [],
98
"excludePlatforms": [],

Assets/Samples/RebindingUI/Unity.InputSystem.RebindingUI.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "Unity.InputSystem.RebindingUI",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
6-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
76
],
87
"includePlatforms": [],
98
"excludePlatforms": [],

Assets/Samples/UIvsGameInput/Unity.InputSystem.UIvsGameInput.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"rootNamespace": "",
44
"references": [
55
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
6-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
7-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
6+
"GUID:75469ad4d38634e559750d17036d5f7c"
87
],
98
"includePlatforms": [],
109
"excludePlatforms": [],

Assets/Samples/Visualizers/Unity.InputSystem.Visualizers.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "InputSystem.Samples.Visualizers",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:d46adbc216ac24e9a86f26d7a54b2384",
6-
"GUID:92e8d8d0b9a5e4f44b24c3e04451d190"
5+
"GUID:75469ad4d38634e559750d17036d5f7c"
76
],
87
"includePlatforms": [],
98
"excludePlatforms": [],

Assets/Settings/URP-PipelineAsset.asset

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
1313
m_Name: URP-PipelineAsset
1414
m_EditorClassIdentifier:
15-
k_AssetVersion: 11
16-
k_AssetPreviousVersion: 11
15+
k_AssetVersion: 13
16+
k_AssetPreviousVersion: 13
1717
m_RendererType: 1
1818
m_RendererData: {fileID: 0}
1919
m_RendererDataList:
@@ -33,6 +33,14 @@ MonoBehaviour:
3333
m_EnableLODCrossFade: 0
3434
m_LODCrossFadeDitheringType: 1
3535
m_ShEvalMode: 0
36+
m_LightProbeSystem: 0
37+
m_ProbeVolumeMemoryBudget: 1024
38+
m_ProbeVolumeBlendingMemoryBudget: 256
39+
m_SupportProbeVolumeGPUStreaming: 0
40+
m_SupportProbeVolumeDiskStreaming: 0
41+
m_SupportProbeVolumeScenarios: 0
42+
m_SupportProbeVolumeScenarioBlending: 0
43+
m_ProbeVolumeSHBands: 1
3644
m_MainLightRenderingMode: 1
3745
m_MainLightShadowsSupported: 1
3846
m_MainLightShadowmapResolution: 2048
@@ -45,6 +53,7 @@ MonoBehaviour:
4553
m_AdditionalLightsShadowResolutionTierHigh: 1024
4654
m_ReflectionProbeBlending: 0
4755
m_ReflectionProbeBoxProjection: 0
56+
m_ReflectionProbeAtlas: 1
4857
m_ShadowDistance: 50
4958
m_ShadowCascadeCount: 1
5059
m_Cascade2Split: 0.25
@@ -67,21 +76,30 @@ MonoBehaviour:
6776
m_SupportsLightLayers: 0
6877
m_DebugLevel: 0
6978
m_StoreActionsOptimization: 0
70-
m_EnableRenderGraph: 1
7179
m_UseAdaptivePerformance: 0
7280
m_ColorGradingMode: 0
7381
m_ColorGradingLutSize: 32
82+
m_AllowPostProcessAlphaOutput: 0
7483
m_UseFastSRGBLinearConversion: 0
7584
m_SupportDataDrivenLensFlare: 0
85+
m_SupportScreenSpaceLensFlare: 1
86+
m_GPUResidentDrawerMode: 0
87+
m_SmallMeshScreenPercentage: 0
88+
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
7689
m_ShadowType: 1
7790
m_LocalShadowsSupported: 0
7891
m_LocalShadowsAtlasResolution: 256
7992
m_MaxPixelLights: 0
8093
m_ShadowAtlasResolution: 256
8194
m_VolumeFrameworkUpdateMode: 0
82-
m_Textures:
83-
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
84-
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
95+
m_VolumeProfile: {fileID: 0}
96+
apvScenesData:
97+
obsoleteSceneBounds:
98+
m_Keys: []
99+
m_Values: []
100+
obsoleteHasProbeVolumes:
101+
m_Keys: []
102+
m_Values:
85103
m_PrefilteringModeMainLightShadows: 1
86104
m_PrefilteringModeAdditionalLight: 4
87105
m_PrefilteringModeAdditionalLightShadows: 1
@@ -92,6 +110,7 @@ MonoBehaviour:
92110
m_PrefilterDebugKeywords: 1
93111
m_PrefilterWriteRenderingLayers: 1
94112
m_PrefilterHDROutput: 1
113+
m_PrefilterAlphaOutput: 0
95114
m_PrefilterSSAODepthNormals: 1
96115
m_PrefilterSSAOSourceDepthLow: 1
97116
m_PrefilterSSAOSourceDepthMedium: 1
@@ -109,6 +128,16 @@ MonoBehaviour:
109128
m_PrefilterSoftShadowsQualityHigh: 1
110129
m_PrefilterSoftShadows: 1
111130
m_PrefilterScreenCoord: 1
131+
m_PrefilterScreenSpaceIrradiance: 0
112132
m_PrefilterNativeRenderPass: 1
133+
m_PrefilterUseLegacyLightmaps: 0
134+
m_PrefilterBicubicLightmapSampling: 0
135+
m_PrefilterReflectionProbeRotation: 0
136+
m_PrefilterReflectionProbeBlending: 0
137+
m_PrefilterReflectionProbeBoxProjection: 0
138+
m_PrefilterReflectionProbeAtlas: 0
113139
m_ShaderVariantLogLevel: 0
114140
m_ShadowCascades: 0
141+
m_Textures:
142+
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
143+
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}

Assets/Settings/URP-Renderer.asset

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,25 @@ MonoBehaviour:
1616
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
1717
type: 3}
1818
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
19+
probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959,
20+
type: 3}
21+
probeVolumeResources:
22+
probeVolumeDebugShader: {fileID: 0}
23+
probeVolumeFragmentationDebugShader: {fileID: 0}
24+
probeVolumeOffsetDebugShader: {fileID: 0}
25+
probeVolumeSamplingDebugShader: {fileID: 0}
26+
probeSamplingDebugMesh: {fileID: 0}
27+
probeSamplingDebugTexture: {fileID: 0}
28+
probeVolumeBlendStatesCS: {fileID: 0}
1929
m_RendererFeatures: []
2030
m_RendererFeatureMap:
2131
m_UseNativeRenderPass: 0
22-
postProcessData: {fileID: 0}
2332
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
24-
shaders:
25-
blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
26-
copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
27-
screenSpaceShadowPS: {fileID: 0}
28-
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
29-
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
30-
fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
31-
fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
32-
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
33-
coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
34-
coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b,
35-
type: 3}
36-
blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
37-
cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf,
38-
type: 3}
39-
objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
40-
type: 3}
41-
dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
42-
type: 3}
43-
terrainDetailLitPS: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144,
44-
type: 3}
45-
terrainDetailGrassPS: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1,
46-
type: 3}
47-
terrainDetailGrassBillboardPS: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90,
48-
type: 3}
49-
m_AssetVersion: 2
33+
postProcessData: {fileID: 0}
34+
m_AssetVersion: 3
35+
m_PrepassLayerMask:
36+
serializedVersion: 2
37+
m_Bits: 4294967295
5038
m_OpaqueLayerMask:
5139
serializedVersion: 2
5240
m_Bits: 4294967295
@@ -64,5 +52,7 @@ MonoBehaviour:
6452
m_RenderingMode: 0
6553
m_DepthPrimingMode: 0
6654
m_CopyDepthMode: 1
55+
m_DepthAttachmentFormat: 0
56+
m_DepthTextureFormat: 0
6757
m_AccurateGbufferNormals: 0
6858
m_IntermediateTextureMode: 1

Assets/Tests/InputSystem.Editor/Unity.InputSystem.Tests.Editor.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"UnityEditor.TestRunner",
77
"Unity.InputSystem",
88
"Unity.InputSystem.TestFramework",
9-
"Unity.InputSystem.TestSupport",
10-
"Unity.InputSystem.Editor"
9+
"Unity.InputSystem.TestSupport"
1110
],
1211
"includePlatforms": [
1312
"Editor"

0 commit comments

Comments
 (0)