Skip to content

Commit 1333b21

Browse files
committed
Re-worked DefaultVolume system to make use of the RenderFeatures
1 parent bd74d07 commit 1333b21

14 files changed

+141
-356
lines changed

Assets/AddressableAssetsData/AddressableAssetSettings.asset

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,33 @@ MonoBehaviour:
1313
m_Name: AddressableAssetSettings
1414
m_EditorClassIdentifier:
1515
m_DefaultGroup: ae971df5c2b654af9a3670c7d1a6fc27
16+
m_OptimizeCatalogSize: 0
1617
m_BuildRemoteCatalog: 0
18+
m_BundleLocalCatalog: 0
19+
m_CatalogRequestsTimeout: 0
1720
m_DisableCatalogUpdateOnStart: 0
21+
m_IgnoreUnsupportedFilesInBuild: 0
1822
m_UniqueBundleIds: 0
23+
m_NonRecursiveBuilding: 0
24+
m_maxConcurrentWebRequests: 500
25+
m_ContiguousBundles: 0
26+
m_StripUnityVersionFromBundleBuild: 0
27+
m_DisableVisibleSubAssetRepresentations: 0
28+
m_ShaderBundleNaming: 0
29+
m_ShaderBundleCustomNaming:
30+
m_MonoScriptBundleNaming: 0
31+
m_MonoScriptBundleCustomNaming:
1932
m_RemoteCatalogBuildPath:
2033
m_Id:
2134
m_RemoteCatalogLoadPath:
2235
m_Id:
36+
m_ContentStateBuildPath:
2337
m_overridePlayerVersion:
2438
m_GroupAssets:
2539
- {fileID: 11400000, guid: 283cfc36cc7e3476c947ddc708efef12, type: 2}
2640
- {fileID: 11400000, guid: 38904d4108bb34d4396119b6e237dc14, type: 2}
2741
- {fileID: 11400000, guid: ada935aea24d34bafa3ba34440872e90, type: 2}
2842
- {fileID: 11400000, guid: a0936c6e3ab2d4684a93f95196a12668, type: 2}
29-
- {fileID: 11400000, guid: 8092aa13f89a049a185fbb3e2e152534, type: 2}
3043
m_BuildSettings:
3144
m_CompileScriptsInVirtualMode: 0
3245
m_CleanupStreamingAssetsAfterBuilds: 1

Assets/AddressableAssetsData/AssetGroups/Schemas/2bd013e8bb2a14fbc857108db02a8889_BundledAssetGroupSchema.asset

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

Assets/AddressableAssetsData/AssetGroups/Schemas/2bd013e8bb2a14fbc857108db02a8889_BundledAssetGroupSchema.asset.meta

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

Assets/AddressableAssetsData/AssetGroups/Schemas/2bd013e8bb2a14fbc857108db02a8889_ContentUpdateGroupSchema.asset

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

Assets/AddressableAssetsData/AssetGroups/Schemas/2bd013e8bb2a14fbc857108db02a8889_ContentUpdateGroupSchema.asset.meta

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

Assets/AddressableAssetsData/AssetGroups/Utility.asset

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,10 @@ MonoBehaviour:
2121
m_Address: camera
2222
m_ReadOnly: 0
2323
m_SerializedLabels: []
24-
m_MainAsset: {fileID: 0}
25-
m_TargetAsset: {fileID: 0}
2624
- m_GUID: 5b930c10a697b4d8c9c8084e03800523
2725
m_Address: checkpoint
2826
m_ReadOnly: 0
2927
m_SerializedLabels: []
30-
m_MainAsset: {fileID: 0}
31-
m_TargetAsset: {fileID: 0}
32-
- m_GUID: d4548d51034644d21971f134c82b6a9a
33-
m_Address: volume_manager
34-
m_ReadOnly: 0
35-
m_SerializedLabels: []
36-
m_MainAsset: {fileID: 0}
37-
m_TargetAsset: {fileID: 0}
3828
m_ReadOnly: 0
3929
m_Settings: {fileID: 11400000, guid: 46fc3d082b08c4dacacae72d7016c235, type: 2}
4030
m_SchemaSet:

Assets/AddressableAssetsData/AssetGroups/VolumeProfiles.asset

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

Assets/AddressableAssetsData/AssetGroups/VolumeProfiles.asset.meta

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

Assets/Data/UniversalRP/BoatDemoRenderer.asset

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
m_RendererFeatures:
1616
- {fileID: 770174969183694509}
17-
m_RendererFeatureMap: ad6e17cd0d36b00a
17+
- {fileID: 1203680893676135655}
18+
m_RendererFeatureMap: ad6e17cd0d36b00ae7a47d3a6555b410
1819
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
1920
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
2021
shaders:
@@ -63,3 +64,24 @@ MonoBehaviour:
6364
debug: 0
6465
causticShader: {fileID: 4800000, guid: 90939d2e4b62841d29c136c866715501, type: 3}
6566
causticTexture: {fileID: 2800000, guid: f395b7d64f44848c6a3cba1f1173fe90, type: 3}
67+
--- !u!114 &1203680893676135655
68+
MonoBehaviour:
69+
m_ObjectHideFlags: 0
70+
m_CorrespondingSourceObject: {fileID: 0}
71+
m_PrefabInstance: {fileID: 0}
72+
m_PrefabAsset: {fileID: 0}
73+
m_GameObject: {fileID: 0}
74+
m_Enabled: 1
75+
m_EditorHideFlags: 0
76+
m_Script: {fileID: 11500000, guid: 00cb8048fcc7dfc4c8c686452702bdd2, type: 3}
77+
m_Name: NewGlobalVolumeFeature
78+
m_EditorClassIdentifier:
79+
m_Active: 1
80+
_layerMask:
81+
serializedVersion: 2
82+
m_Bits: 4294967295
83+
_baseProfile: {fileID: 11400000, guid: ad80f6934bc444a93bb29c1f6db70cf3, type: 2}
84+
_qualityProfiles:
85+
- {fileID: 11400000, guid: 200e02ce26d6c422db35ba0777d71a09, type: 2}
86+
- {fileID: 11400000, guid: 4fe8789f8ee054ac49d9f7fe042e0918, type: 2}
87+
- {fileID: 11400000, guid: dbf7710ff9a33440f8390ed8e04dbb77, type: 2}

Assets/Objects/misc/DefaultVolume.prefab

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

0 commit comments

Comments
 (0)