diff --git a/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5014_PathTracing_DoubleSidedOverride.png.meta b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5014_PathTracing_DoubleSidedOverride.png.meta index eccfe0f3038..3703c9429b3 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5014_PathTracing_DoubleSidedOverride.png.meta +++ b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5014_PathTracing_DoubleSidedOverride.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -40,7 +40,7 @@ TextureImporter: wrapU: 0 wrapV: 0 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -71,7 +71,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/702_PunctualShadowFiltering.png b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/702_PunctualShadowFiltering.png index 728b68b56eb..ce9aac8e70c 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/702_PunctualShadowFiltering.png +++ b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/702_PunctualShadowFiltering.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed9359dd1c1660e3206f576344eacd2bed71f4d21fd62bce78e1bbb52f3ef52a -size 108105 +oid sha256:782d5704dae6fe7f8446e657970ec67756f1d998ce52e11b922f2318408ae7d7 +size 105699 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/715_PointShadow_Matte_Edge.png b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/715_PointShadow_Matte_Edge.png new file mode 100644 index 00000000000..5c2938666e3 --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/715_PointShadow_Matte_Edge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b743fae695ce57b700e3823c6bf915d5f51bb74fd57ef1b0031fc8d06ffb9a5 +size 16970 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/715_PointShadow_Matte_Edge.png.meta b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/715_PointShadow_Matte_Edge.png.meta new file mode 100644 index 00000000000..750d7c0446c --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/715_PointShadow_Matte_Edge.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 3593eccd8ef504b498c02208e5a81852 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/716_SpotShadow_Matte_Edge.png b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/716_SpotShadow_Matte_Edge.png new file mode 100644 index 00000000000..cdf9d9991d6 --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/716_SpotShadow_Matte_Edge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30c9f4a242a0d8f94b1e3cc0a5ae24e52505a49317e6ed4af01481c5bc1e81ab +size 14614 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/716_SpotShadow_Matte_Edge.png.meta b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/716_SpotShadow_Matte_Edge.png.meta new file mode 100644 index 00000000000..f72b2315c46 --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/716_SpotShadow_Matte_Edge.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: f728e33123c836743abdeb057831a5af +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge.meta b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge.meta new file mode 100644 index 00000000000..461b7feaf56 --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f61fe14278b366145bd0ecd8efac3e7c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge.unity new file mode 100644 index 00000000000..0bbaeafcfc6 --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge.unity @@ -0,0 +1,982 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &31115525 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalPosition.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderPipelineAsset + value: + objectReference: {fileID: 11400000, guid: 14a0f3aaa5e78a3439ec76d270471ebe, + type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: checkMemoryAllocation + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 480 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} +--- !u!1 &536881073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 536881077} + - component: {fileID: 536881076} + - component: {fileID: 536881075} + - component: {fileID: 536881074} + m_Layer: 0 + m_Name: ShadowMattePlane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &536881074 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536881073} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &536881075 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536881073} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6536ec273ea5e0b44ab42d53eb068ac4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &536881076 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536881073} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &536881077 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536881073} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &565659604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 565659606} + - component: {fileID: 565659605} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &565659605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565659604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 2a03d429d7c5e9749b581195d38613ea, type: 2} +--- !u!4 &565659606 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565659604} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.6061484, y: -9.595055, z: 4.1146817} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &664233133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 664233134} + - component: {fileID: 664233137} + - component: {fileID: 664233136} + - component: {fileID: 664233135} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &664233134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664233133} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -0.75, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 774345918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &664233135 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664233133} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &664233136 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664233133} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &664233137 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664233133} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &774345915 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 774345918} + - component: {fileID: 774345917} + - component: {fileID: 774345916} + m_Layer: 0 + m_Name: Point LightOpaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &774345916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774345915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Intensity: 600 + m_EnableSpotReflector: 1 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0.1 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 1 + m_NumRayTracingSamples: 1 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 8 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 0 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 + m_ShadowCascadeRatios: + - 0.05 + - 0.2 + - 0.3 + m_ShadowCascadeBorders: + - 0.2 + - 0.2 + - 0.2 + - 0.2 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 + useOldInspector: 0 + useVolumetric: 1 + featuresFoldout: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 +--- !u!108 &774345917 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774345915} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 47.746483 + m_Range: 2 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 1 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 2 + m_AreaSize: {x: 0.5, y: 0.5} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0.1 + m_ShadowAngle: 0 +--- !u!4 &774345918 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774345915} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 664233134} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1204532182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1204532183} + - component: {fileID: 1204532186} + - component: {fileID: 1204532185} + - component: {fileID: 1204532184} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1204532183 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204532182} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: -0.75, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1874057722} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &1204532184 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204532182} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1204532185 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204532182} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1204532186 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204532182} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1874057719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1874057722} + - component: {fileID: 1874057721} + - component: {fileID: 1874057720} + m_Layer: 0 + m_Name: Point LightSemiTransparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1874057720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874057719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Intensity: 600 + m_EnableSpotReflector: 1 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0.1 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 1 + m_NumRayTracingSamples: 1 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 8 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 1 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 0 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 + m_ShadowCascadeRatios: + - 0.05 + - 0.2 + - 0.3 + m_ShadowCascadeBorders: + - 0.2 + - 0.2 + - 0.2 + - 0.2 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 + useOldInspector: 0 + useVolumetric: 1 + featuresFoldout: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 +--- !u!108 &1874057721 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874057719} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 47.746483 + m_Range: 2 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 1 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 2 + m_AreaSize: {x: 0.5, y: 0.5} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0.1 + m_ShadowAngle: 0 +--- !u!4 &1874057722 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874057719} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1204532183} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge.unity.meta b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge.unity.meta new file mode 100644 index 00000000000..23445ea7a60 --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6bb64157e4d92ed43a51a4c3582d7d32 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge/Global Volume Profile.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge/Global Volume Profile.asset new file mode 100644 index 00000000000..5811643ae9f --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge/Global Volume Profile.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: [] diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge/Global Volume Profile.asset.meta b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge/Global Volume Profile.asset.meta new file mode 100644 index 00000000000..2a9f1bfd373 --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/715_PointShadow_Matte_Edge/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a03d429d7c5e9749b581195d38613ea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/716_SpotShadow_Matte_Edge.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/716_SpotShadow_Matte_Edge.unity new file mode 100644 index 00000000000..ae4be44044f --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/716_SpotShadow_Matte_Edge.unity @@ -0,0 +1,982 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &31115525 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 2 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalPosition.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: renderPipelineAsset + value: + objectReference: {fileID: 11400000, guid: 14a0f3aaa5e78a3439ec76d270471ebe, + type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: checkMemoryAllocation + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 480 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_AddedGameObjects: [] + m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} +--- !u!1 &261440655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 261440656} + - component: {fileID: 261440659} + - component: {fileID: 261440658} + - component: {fileID: 261440657} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &261440656 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261440655} + m_LocalRotation: {x: -0.27059805, y: 0.6532815, z: -0.27059805, w: 0.6532815} + m_LocalPosition: {x: 0, y: 0.17677675, z: 1.237437} + m_LocalScale: {x: 0.49999994, y: 0.5, z: 0.49999988} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 854104171} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &261440657 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261440655} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &261440658 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261440655} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &261440659 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261440655} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &536881073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 536881077} + - component: {fileID: 536881076} + - component: {fileID: 536881075} + - component: {fileID: 536881074} + m_Layer: 0 + m_Name: ShadowMattePlane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &536881074 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536881073} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &536881075 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536881073} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6536ec273ea5e0b44ab42d53eb068ac4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &536881076 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536881073} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &536881077 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536881073} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &565659604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 565659606} + - component: {fileID: 565659605} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &565659605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565659604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 2a03d429d7c5e9749b581195d38613ea, type: 2} +--- !u!4 &565659606 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565659604} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.6061484, y: -9.595055, z: 4.1146817} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &664233133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 664233134} + - component: {fileID: 664233137} + - component: {fileID: 664233136} + - component: {fileID: 664233135} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &664233134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664233133} + m_LocalRotation: {x: -0.27059805, y: 0.6532815, z: -0.27059805, w: 0.6532815} + m_LocalPosition: {x: 0, y: 0.17677675, z: 1.237437} + m_LocalScale: {x: 0.49999994, y: 0.5, z: 0.49999988} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 774345918} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &664233135 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664233133} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &664233136 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664233133} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 73c176f402d2c2f4d929aa5da7585d17, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &664233137 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664233133} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &774345915 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 774345918} + - component: {fileID: 774345917} + - component: {fileID: 774345916} + m_Layer: 0 + m_Name: Point LightOpaque + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &774345916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774345915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Intensity: 600 + m_EnableSpotReflector: 1 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0.1 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 1 + m_NumRayTracingSamples: 1 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 8 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 0 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 0 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 + m_ShadowCascadeRatios: + - 0.05 + - 0.2 + - 0.3 + m_ShadowCascadeBorders: + - 0.2 + - 0.2 + - 0.2 + - 0.2 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 + useOldInspector: 0 + useVolumetric: 1 + featuresFoldout: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 +--- !u!108 &774345917 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774345915} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1222.1244 + m_Range: 2 + m_SpotAngle: 45.6 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 1 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 2 + m_AreaSize: {x: 0.5, y: 0.5} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0.1 + m_ShadowAngle: 0 +--- !u!4 &774345918 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774345915} + m_LocalRotation: {x: 0.27059805, y: -0.6532815, z: 0.27059805, w: 0.6532815} + m_LocalPosition: {x: 0, y: 1, z: 0.75} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 664233134} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 45, y: -90, z: 0} +--- !u!1 &854104168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 854104171} + - component: {fileID: 854104170} + - component: {fileID: 854104169} + m_Layer: 0 + m_Name: Point LightTransparent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &854104169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854104168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Intensity: 600 + m_EnableSpotReflector: 1 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 + m_LightUnit: 0 + m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 + m_AffectDiffuse: 1 + m_AffectSpecular: 1 + m_NonLightmappedOnly: 0 + m_ShapeWidth: 0.5 + m_ShapeHeight: 0.5 + m_AspectRatio: 1 + m_ShapeRadius: 0.1 + m_SoftnessScale: 1 + m_UseCustomSpotLightShadowCone: 0 + m_CustomSpotLightShadowCone: 30 + m_MaxSmoothness: 0.99 + m_ApplyRangeAttenuation: 1 + m_DisplayAreaLightEmissiveMesh: 0 + m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 + m_AreaLightShadowCone: 120 + m_UseScreenSpaceShadows: 0 + m_InteractsWithSky: 1 + m_AngularDiameter: 0.5 + m_FlareSize: 2 + m_FlareTint: {r: 1, g: 1, b: 1, a: 1} + m_FlareFalloff: 4 + m_SurfaceTexture: {fileID: 0} + m_SurfaceTint: {r: 1, g: 1, b: 1, a: 1} + m_Distance: 1.5e+11 + m_UseRayTracedShadows: 1 + m_NumRayTracingSamples: 1 + m_FilterTracedShadow: 1 + m_FilterSizeTraced: 8 + m_SunLightConeAngle: 0.5 + m_LightShadowRadius: 0.5 + m_SemiTransparentShadow: 1 + m_ColorShadow: 1 + m_DistanceBasedFiltering: 0 + m_EvsmExponent: 15 + m_EvsmLightLeakBias: 0 + m_EvsmVarianceBias: 0.00001 + m_EvsmBlurPasses: 0 + m_LightlayersMask: 1 + m_LinkShadowLayers: 1 + m_ShadowNearPlane: 0.1 + m_BlockerSampleCount: 24 + m_FilterSampleCount: 16 + m_MinFilterSize: 0.1 + m_KernelSize: 5 + m_LightAngle: 1 + m_MaxDepthBias: 0.001 + m_ShadowResolution: + m_Override: 512 + m_UseOverride: 1 + m_Level: 0 + m_ShadowDimmer: 1 + m_VolumetricShadowDimmer: 1 + m_ShadowFadeDistance: 10000 + m_UseContactShadow: + m_Override: 0 + m_UseOverride: 1 + m_Level: 0 + m_RayTracedContactShadow: 0 + m_ShadowTint: {r: 0, g: 0, b: 0, a: 1} + m_PenumbraTint: 0 + m_NormalBias: 0.75 + m_SlopeBias: 0.5 + m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 + m_ShadowCascadeRatios: + - 0.05 + - 0.2 + - 0.3 + m_ShadowCascadeBorders: + - 0.2 + - 0.2 + - 0.2 + - 0.2 + m_ShadowAlgorithm: 0 + m_ShadowVariant: 0 + m_ShadowPrecision: 0 + useOldInspector: 0 + useVolumetric: 1 + featuresFoldout: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 +--- !u!108 &854104170 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854104168} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1222.1244 + m_Range: 2 + m_SpotAngle: 45.6 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 1 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 2 + m_AreaSize: {x: 0.5, y: 0.5} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0.1 + m_ShadowAngle: 0 +--- !u!4 &854104171 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854104168} + m_LocalRotation: {x: 0.27059805, y: -0.6532815, z: 0.27059805, w: 0.6532815} + m_LocalPosition: {x: 0, y: 1, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 261440656} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 45, y: -90, z: 0} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/716_SpotShadow_Matte_Edge.unity.meta b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/716_SpotShadow_Matte_Edge.unity.meta new file mode 100644 index 00000000000..690a3c39abf --- /dev/null +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/716_SpotShadow_Matte_Edge.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ce93c6d12f3215e4f91492941b86e47e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_DXR_Tests/ProjectSettings/EditorBuildSettings.asset b/TestProjects/HDRP_DXR_Tests/ProjectSettings/EditorBuildSettings.asset index 463ab47a81e..30213ab3970 100644 --- a/TestProjects/HDRP_DXR_Tests/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/HDRP_DXR_Tests/ProjectSettings/EditorBuildSettings.asset @@ -254,6 +254,12 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/714_AreaShadow_Matte.unity guid: b4e3d982133c1c24cad67533f4a204ee + - enabled: 1 + path: Assets/Scenes/715_PointShadow_Matte_Edge.unity + guid: 6bb64157e4d92ed43a51a4c3582d7d32 + - enabled: 1 + path: Assets/Scenes/716_SpotShadow_Matte_Edge.unity + guid: ce93c6d12f3215e4f91492941b86e47e - enabled: 1 path: Assets/Scenes/717_DirectionalLightTransmission.unity guid: ba799739088f73744873fb5720fcddd3 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/004-CloudsFlaresDecals.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/004-CloudsFlaresDecals.png index a6de172febc..953d582d5d9 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/004-CloudsFlaresDecals.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/004-CloudsFlaresDecals.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e36e39f16c00d42764811500f05ea1d5f6afafb35846066efff94375bfb4a88 -size 2311344 +oid sha256:72b30e4dac5fb0e3a33a4bf655cf04dd40ceee895ca26725033c196e80dd53b8 +size 2289114 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation.unity index f732f80ef88..1ad60d6008e 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1219_Lit_Light_on_Tesselation.unity @@ -196,6 +196,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -259,6 +260,7 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 64cd23eb9a1c97345b83fb36f25a5366, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!28 &412165157 Texture2D: @@ -312,6 +314,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -379,12 +382,14 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 3e517b3b2852e71478601ade3b545aca, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1001 &624799405 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -448,12 +453,14 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 3e517b3b2852e71478601ade3b545aca, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1001 &625816520 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -521,12 +528,14 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 3e517b3b2852e71478601ade3b545aca, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1001 &634519753 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -590,6 +599,7 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: ad5d42b0bdb3f4541badce73c0d6f023, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1 &864570711 GameObject: @@ -685,6 +695,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -748,6 +759,7 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: bff78e4ad8c50c24cb479ef2d44c52be, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1 &1015462003 GameObject: @@ -924,6 +936,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -953,6 +966,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -1033,6 +1047,11 @@ PrefabInstance: propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 value: 70005818916701 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: waitFrames + value: 5 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: checkMemoryAllocation @@ -1049,6 +1068,7 @@ PrefabInstance: value: 360 objectReference: {fileID: 0} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!20 &1172859778 stripped Camera: @@ -1061,6 +1081,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} @@ -1113,6 +1134,7 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: e0446b620fbf66540b1b93f937834a01, type: 3} --- !u!1 &1254408612 GameObject: @@ -1202,6 +1224,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -1265,12 +1288,14 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 4fadbc1a681767747b77a6f8964a368e, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1001 &1346863720 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -1338,6 +1363,7 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 4fadbc1a681767747b77a6f8964a368e, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1 &1471809419 GameObject: @@ -1641,6 +1667,37 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 + m_HasValidSHForNormalization: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} + m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} m_HDProbeVersion: 3 m_ObsoleteInfiniteProjection: 1 m_ObsoleteInfluenceVolume: @@ -1833,6 +1890,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -1896,6 +1954,7 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 4fadbc1a681767747b77a6f8964a368e, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1 &1634673052 GameObject: @@ -2119,6 +2178,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -2182,12 +2242,14 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: bff78e4ad8c50c24cb479ef2d44c52be, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1001 &2090829090 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -2256,12 +2318,14 @@ PrefabInstance: objectReference: {fileID: 1482910063194737830, guid: 809e4d2517af75d47969b80fedcd2025, type: 3} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1001 &2111508603 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -2329,12 +2393,14 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 3e517b3b2852e71478601ade3b545aca, type: 2} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} --- !u!1001 &2131239616 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 2 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} @@ -2407,4 +2473,5 @@ PrefabInstance: objectReference: {fileID: 1482910063194737830, guid: 809e4d2517af75d47969b80fedcd2025, type: 3} m_RemovedComponents: [] + m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: cc6cdbc8434ef824dad9d3a2b232c320, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5004_Pbr_Sky_High_Altitude.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5004_Pbr_Sky_High_Altitude.png index e30b2ff2b59..27afda7bd90 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5004_Pbr_Sky_High_Altitude.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5004_Pbr_Sky_High_Altitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:005f57c552ad6b1f4c4b42dee7e4aaa221a326470157b92b6475b9577543579e -size 698779 +oid sha256:a7137da8eb2b19a4fb8b2143cbeafb166fd1ea9a3ce3f9b68399549fbcdab1e5 +size 698273 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5005_Pbr_Sky_Med_Altitude.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5005_Pbr_Sky_Med_Altitude.png index 7be636fcd33..15eb22d7df9 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5005_Pbr_Sky_Med_Altitude.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5005_Pbr_Sky_Med_Altitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dea4f0910169a4f7b71c8cbaa7b1f4cfc0e0e9ca0735cb06c7ede61dc02dc64 -size 235180 +oid sha256:c9411a99b81a77f32f07014b5e895751248823ee6821446233f35a6c82683d48 +size 234485 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5006_Pbr_Sky_Low_Altitude.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5006_Pbr_Sky_Low_Altitude.png index 5df030e6dff..582815c74ec 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5006_Pbr_Sky_Low_Altitude.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5006_Pbr_Sky_Low_Altitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30696614b8d2a88611dcc2aaa1202fe78848a5f1c16ec8024aacb32d9163ed10 -size 93594 +oid sha256:7879ceff46a0006063bc53591116508fc4029ca4dff1a08661131d3bc8ecec01 +size 92261 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5014_VolumetricCloudsBanding.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5014_VolumetricCloudsBanding.png index b3e668c40ce..e04e8cb743d 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5014_VolumetricCloudsBanding.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5014_VolumetricCloudsBanding.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:778a5031df3835bfb79af2e44586d2c027b750142e3e572ac1b14029e5f09313 -size 217377 +oid sha256:8f28b4da8ecdd1d6cd67677058595eb10d335fd740cd163cc099e958c989d146 +size 217081 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5004_Pbr_Sky_High_Altitude.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5004_Pbr_Sky_High_Altitude.png index bd2b89d0066..2dc6a3accc6 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5004_Pbr_Sky_High_Altitude.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5004_Pbr_Sky_High_Altitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3d6a4047144db0072cbd174ed3135c2eea080f8fd8e9bad87301818fdd507a0 -size 698794 +oid sha256:ea3d321f5eb963c8a101a025c0a327baada487fc65ba4233bebf6b0e3658dda2 +size 698282 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5005_Pbr_Sky_Med_Altitude.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5005_Pbr_Sky_Med_Altitude.png index 5dc7578be71..5dcc90f9335 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5005_Pbr_Sky_Med_Altitude.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5005_Pbr_Sky_Med_Altitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e134316909dc0d17b1b023213f110131e7f7f6ba1f2a5a5121a4c6551379037 -size 235287 +oid sha256:a65b856124f395b5471f951d5bdaa7e75865020388caf7b40708cdfe3386b866 +size 234567 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5006_Pbr_Sky_Low_Altitude.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5006_Pbr_Sky_Low_Altitude.png index 094fcebbda7..7e2c6579b6c 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5006_Pbr_Sky_Low_Altitude.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5006_Pbr_Sky_Low_Altitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44233b87b3a46accb5f504529a9376995f6c01599fc490d84fe9284f1b91dbaf -size 105079 +oid sha256:fff374e6551f52327283c3c7c27ae58be0178fae40de9c1b79abbe56f46fc54a +size 92180 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5004_Pbr_Sky_High_Altitude.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5004_Pbr_Sky_High_Altitude.png index 19ac4d304c4..f8c09a77e06 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5004_Pbr_Sky_High_Altitude.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5004_Pbr_Sky_High_Altitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96a411ebeaa8a2037c78bd341286ca510315015f6ddac91d7d57642542a08ba8 -size 698749 +oid sha256:6e1518d8f9d40bda392e74f2b3642d3f54217fe1d19d03bb9f0b12fdc6a1686b +size 698369 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5005_Pbr_Sky_Med_Altitude.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5005_Pbr_Sky_Med_Altitude.png index a5899fbd221..642f6c94a2f 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5005_Pbr_Sky_Med_Altitude.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5005_Pbr_Sky_Med_Altitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1f11b3b97463aa6e5dcbebaec86c25538b16d02fa49eff8d5226505e5f06c6a -size 235263 +oid sha256:1d5a2826a0b7da41e2d571e8458cfcb52329ebcfbf51d0d15a1d1753b06c4377 +size 234552 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5006_Pbr_Sky_Low_Altitude.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5006_Pbr_Sky_Low_Altitude.png index de6df70c1cb..ec11c75456b 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5006_Pbr_Sky_Low_Altitude.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5006_Pbr_Sky_Low_Altitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d010c5c072451be22ec6e747406a98474e2a6e6c518a16cba136f26c1baa7661 -size 93601 +oid sha256:456aa23166c7579307fd2aa936f53ed06cb1d1fcd64e52b61faea6cee1728e83 +size 92099 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5014_VolumetricCloudsBanding.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5014_VolumetricCloudsBanding.png index 5144380d9a9..91217d8d7a7 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5014_VolumetricCloudsBanding.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5014_VolumetricCloudsBanding.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb53d39da44fcd4805ec6f83b3375ed855090f2d76b348c32937e12fc2820dcc -size 217302 +oid sha256:cc2d36dbbb5d3bda19aeded11a9ad54c93ffcbd7f5f5b98c96e8134e0d3c562a +size 217706 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png index 8cac267e122..c4ed23801c1 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cd089efca0897b9cc0e06ee7eef4c23f78bfca56fd604063c0fc8ebeb4f9e1c -size 95962 +oid sha256:e23c59753733955f4baf458526325c01af9232013862cea7a4c340cba64ecfd2 +size 39513 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png index 47de45a12e7..48009508350 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d65305d3b7a330f79b141cc47e30378fe0f98aad8098c8d8b2e987beef29b7dc -size 95951 +oid sha256:87297caae80ce50a0cab98bed8dc6ba267ec92ad345ac473fbdca9d1b4480c5f +size 39505 diff --git a/com.unity.render-pipelines.core/Editor/Camera/CameraUI.Drawers.cs b/com.unity.render-pipelines.core/Editor/Camera/CameraUI.Drawers.cs index edad53d7f4b..65273c93b9a 100644 --- a/com.unity.render-pipelines.core/Editor/Camera/CameraUI.Drawers.cs +++ b/com.unity.render-pipelines.core/Editor/Camera/CameraUI.Drawers.cs @@ -109,7 +109,10 @@ static void DrawerPerspectiveType(ISerializedCamera p, Editor owner) EditorGUI.BeginChangeCheck(); isPhysicalCamera = EditorGUILayout.Toggle(content, isPhysicalCamera); if (EditorGUI.EndChangeCheck()) + { p.projectionMatrixMode.intValue = isPhysicalCamera ? (int)ProjectionMatrixMode.PhysicalPropertiesBased : (int)ProjectionMatrixMode.Implicit; + s_FovChanged = true; + } EditorGUILayout.EndHorizontal(); EditorGUI.EndProperty(); diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs index b1512a72620..4a0ad0eca4c 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs @@ -104,9 +104,15 @@ internal RTHandle GetTexture(in TextureHandle handle) if (!handle.IsValid()) return null; - var resource = GetTextureResource(handle.handle).graphicsResource; - if (resource == null && handle.fallBackResource != TextureHandle.nullHandle.handle) - return GetTextureResource(handle.fallBackResource).graphicsResource; + var texResource = GetTextureResource(handle.handle); + var resource = texResource.graphicsResource; + if (resource == null) + { + if (handle.fallBackResource != TextureHandle.nullHandle.handle) + return GetTextureResource(handle.fallBackResource).graphicsResource; + else if (!texResource.imported) + throw new InvalidOperationException("Trying to use a texture that was already released or not yet created. Make sure you declare it for reading in your pass or you don't read it before it's been written to at least once."); + } return resource; } @@ -132,7 +138,11 @@ internal ComputeBuffer GetComputeBuffer(in ComputeBufferHandle handle) if (!handle.IsValid()) return null; - return GetComputeBufferResource(handle.handle).graphicsResource; + var resource = GetComputeBufferResource(handle.handle); + if (resource == null) + throw new InvalidOperationException("Trying to use a compute buffer that was already released or not yet created. Make sure you declare it for reading in your pass or you don't read it before it's been written to at least once."); + + return resource.graphicsResource; } private RenderGraphResourceRegistry() diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 78dc94a9d7d..7c3178f0945 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -9,6 +9,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed - Fixed option to force motion blur off when in XR. +- Fixed edges and ghosting appearing on shadow matte due to the shadow being black outside the range of the light (case 1371441). +- Fixed default numbder of physically based sky bounce to be 3 +- Fixed layer lit shader UI. +- Fixed error thrown when layered lit material has an invalid material type. +- Fixed a warning because of a null texture in the lens flare pass. +- Fixed a nullref when enabling raycount without ray tracing. +- Fixed default value of "Distortion Blur" from 1 to 0 according to the doc. +- Fixed unsupported material properties show when rendering pass is Low Resolution. +- Fixed FOV change when enabling physical camera. +- Fixed spot light shadows near plane +- Fixed Transparent Depth Pre/Post pass by default for the built-in HDRP Hair shader graph. +- Fixed SpeedTree graph compatibility by removing custom interpolators. +- Fixed auto-exposure mismatch between sky background and scene objects in path tracing (case 1385131). +- Fixed build warnings due to the exception in burst code (case 1382827). +- Fixed write to VT feedback in debug modes (case 1376874) ## [13.1.3] - 2021-11-17 diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md b/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md index 09b25f76a9c..750ae233d76 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md @@ -108,7 +108,7 @@ HDRP provides the following upscale filter methods: ## Overriding upscale options with code -You can also override the upscale options in the HDRP Asset for each Camera in your scene using code. To do this, call DynamicResolutionHandler.SetUpscaleFilter(Camera camera, DynamicResUpscaleFilter filter), to make HDRP ignore the value in the HDRP Asset for a given Camera. +You can also override the upscale options in the HDRP Asset for each Camera in your scene using code. To do this, call `DynamicResolutionHandler.SetUpscaleFilter(Camera camera, DynamicResUpscaleFilter filter)`, to make HDRP ignore the value in the HDRP Asset for a given Camera. diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Lit-Tessellation-Shader.md b/com.unity.render-pipelines.high-definition/Documentation~/Lit-Tessellation-Shader.md index 219b68e45c8..ebefdae432d 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Lit-Tessellation-Shader.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Lit-Tessellation-Shader.md @@ -23,7 +23,7 @@ To create a new Lit Tessellation Material: ### Surface Options -**Surface Options** control the overall look of your Material's surface and how Unity renders the Material on screen. +**Surface Options** control the look of your Material's surface and how Unity renders the Material on screen. | **Property** | **Description** | | ------------------------- | ------------------------------------------------------------ | @@ -34,7 +34,7 @@ To create a new Lit Tessellation Material: | **Material Type** | Allows you to give your Material a type, which allows you to customize it with different settings depending on the **Material Type** you select. For more information about the feature and for the list of properties each **Material Type** exposes, see the [Material Type documentation](Material-Type.md). | | **Receive Decals** | Enable the checkbox to allow HDRP to draw decals on this Material’s surface. | | **Receive SSR (Transparent)** | Enable the checkbox to make HDRP include this Material when it processes the screen space reflection pass. There is a separate option for transparent Surface Type. | -| **Geometric Specular AA** | Enable the checkbox to make HDRP perform geometric anti-aliasing on this Material. This modifies the smoothness values on surfaces of curved geometry in order to remove specular artifacts. For more information about the feature and for the list of properties this feature exposes, see the [Geometric Specular Anti-aliasing documentation](Geometric-Specular-Anti-Aliasing.md). | +| **Geometric Specular AA** | Enable the checkbox to make HDRP perform geometric antialiasing on this Material. This modifies the smoothness values on surfaces of curved geometry to remove specular artifacts. For more information about the feature and for the list of properties this feature exposes, see the [Geometric Specular antialiasing documentation](Geometric-Specular-Anti-Aliasing.md). | | **Displacement Mode** | Use this drop-down to select the method that HDRP uses to alter the height of the Material’s surface. For more information about the feature and for the list of properties each **Displacement Mode** exposes, see the [Displacement Mode documentation](Displacement-Mode.md). | ### Tessellation Options @@ -46,21 +46,21 @@ For information on the properties in this section, see the [Tessellation documen | **Property** | **Description** | | ------------------------------- | ------------------------------------------------------------ | | **Base Map** | Assign a Texture that controls both the color and opacity of your Material. To assign a Texture to this field, click the radio button and select your Texture in the Select Texture window. Use the color picker to select the color of the Material. If you do not assign a Texture, this is the absolute color of the Material. If you do assign a Texture, the final color of the Material is a combination of the Texture you assign and the color you select. The alpha value of the color controls the transparency level for the Material if you select **Transparent** from the **Surface Type** drop-down. | -| **Metallic** | Use this slider to adjust how "metal-like" the surface of your Material is (between 0 and 1). When a surface is more metallic, it reflects the environment more and its albedo color becomes less visible. At full metallic level, the surface color is entirely driven by reflections from the environment. When a surface is less metallic, its albedo color is clearer and any surface reflections are visible on top of the surface color, rather than obscuring it.
This property only appears when you unassign the Texture in the **Mask Map**. | -| **Smoothness** | Use the slider to adjust the smoothness of your Material. Every light ray that hits a smooth surface bounces off at predictable and consistent angles. For a perfectly smooth surface that reflects light like a mirror, set this to a value of 1. Less smooth surfaces reflect light over a wider range of angles (because the light hits the bumps in the microsurface), so the reflections have less detail and spread across the surface in a more diffused pattern.
This property only appears when you unassign the Texture in the **Mask Map**. | +| **Metallic** | Use this slider to adjust how "metal-like" the surface of your Material is (between 0 and 1).
When a surface is more metallic, it reflects the environment more and its albedo color becomes less visible. At full metallic level, the surface color is entirely driven by reflections from the environment. When a surface is less metallic, its albedo color is clearer and any surface reflections are visible on top of the surface color, rather than obscuring it.
This property only appears when you unassign the Texture in the **Mask Map**. | +| **Smoothness** | Use the slider to adjust the smoothness of your Material.
Every light ray that hits a smooth surface bounces off at predictable and consistent angles. For a smooth surface that reflects light like a mirror, set this to a value of 1. Less smooth surfaces reflect light over a wider range of angles (because the light hits the bumps in the microsurface), so the reflections have less detail and spread across the surface in a more diffused pattern.
This property only appears when you unassign the Texture in the **Mask Map**. | | **Metallic Remapping** | Use this min-max slider to remap the metallic values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.
This property only appears when you assign a **Mask Map**. | | **Smoothness Remapping** | Use this min-max slider to remap the smoothness values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.
This property only appears when you assign a **Mask Map**. | | **Ambient Occlusion Remapping** | Use this min-max slider to remap the ambient occlusion values from the **Mask Map** to the range you specify. Rather than [clamping](https://docs.unity3d.com/ScriptReference/Mathf.Clamp.html) values to the new range, Unity condenses the original range down to the new range uniformly.
This property only appears when you assign a **Mask Map**. | | **Mask Map** | Assign a [channel-packed Texture](Glossary.md#ChannelPacking) with the following Material maps in its RGBA channels.
• **Red**: Stores the metallic map.
• **Green**: Stores the ambient occlusion map.
• **Blue**: Stores the detail mask map.
• **Alpha**: Stores the smoothness map.
For more information on channel-packed Textures and the mask map, see [mask map](Mask-Map-and-Detail-Map.md#MaskMap). | -| **Normal Map Space** | Use this drop-down to select the type of Normal Map space that this Material uses.
• **TangentSpace**: Defines the normal map in [tangent space](Glossary.md#TangentSpaceNormalMap). use this to tile a Texture on a Mesh. The normal map Texture must be BC7, BC5, or DXT5nm format.
• **ObjectSpace**: Defines the normal maps in [object space](Glossary.md#ObjectSpaceNormalMap). Use this for planar-mapping GameObjects like the terrain. The normal map must be an RGB Texture . | +| **Normal Map Space** | Use this drop-down to select the Normal Map space that this Material uses.
• **TangentSpace**: Defines the normal map in [tangent space](Glossary.md#TangentSpaceNormalMap). use this to tile a Texture on a Mesh. The normal map Texture must be BC7, BC5, or DXT5nm format.
• **ObjectSpace**: Defines the normal maps in [object space](Glossary.md#ObjectSpaceNormalMap). Use this for planar-mapping GameObjects like the terrain. The normal map must be an RGB Texture . | | **Normal Map** | Assign a Texture that defines the normal map for this Material in tangent space. Use the slider to modulate the normal intensity between 0 and 8.
This property only appears when you select **TangentSpace** from the **Normal Map Space** drop-down. | | **Normal Map OS** | Assign a Texture that defines the object space normal map for this Material. Use the handle to modulate the normal intensity between 0 and 8.
This property only appears when you select **ObjectSpace** from the **Normal Map Space** drop-down. | -| **Bent Normal Map** | Assign a Texture that defines the bent normal map for this Material in tangent space. HDRP uses bent normal maps to simulate more accurate ambient occlusion. Note: Bent normal maps only work with diffuse lighting.
This property only appears when you select **TangentSpace** from the **Normal Map Space** drop-down.. | +| **Bent Normal Map** | Assign a Texture that defines the bent normal map for this Material in tangent space. HDRP uses bent normal maps to simulate more accurate ambient occlusion. Note: Bent normal maps only work with diffuse lighting.
This property only appears when you select **TangentSpace** from the **Normal Map Space** drop-down.. | | **Bent Normal Map OS** | Assign a Texture that defines the bent normal map for this Material in object space. HDRP uses bent normal maps to simulate more accurate ambient occlusion. Note: Bent normal maps only work with diffuse lighting.
This property only appears when you select **ObjectSpace** from the **Normal Map Space** drop-down. | | **Coat Mask** | Assign a Texture that defines the coat mask for this Material. HDRP uses this mask to simulate a clear coat effect on the Material to mimic Materials like car paint or plastics. The Coat Mask value is 0 by default, but you can use the handle to modulate the clear Coat Mask effect using a value between 0 and 1. | -| **Base UV Mapping** | Use the drop-down to select the type of UV mapping that HDRP uses to map Textures to this Material’s surface.
• Unity manages four UV channels for a vertex: **UV0**, **UV1**, **UV2**, and **UV3**.
• **Planar:** A planar projection from top to bottom.
• **Triplanar**: A planar projection in three directions:
X-axis: Left to right
Y-axis: Top to bottom
Z-axis: Front to back

Unity blends these three projections together to produce the final result. | -| **Tiling** | Set an **X** and **Y** UV tile rate for all of the Textures in the **Surface Inputs** section. HDRP uses the **X** and **Y** values to tile these Textures across the Material’s surface, in object space. | -| **Offset** | Set an **X** and **Y** UV offset for all of the Textures in the **Surface Inputs** section. HDRP uses the **X** and **Y** values to offset these Textures across the Material’s surface, in object. | +| **Base UV Mapping** | Use the drop-down to select the UV mapping type that HDRP uses to map Textures to this Material’s surface.
• Unity manages four UV channels for a vertex: **UV0**, **UV1**, **UV2**, and **UV3**.
• **Planar:** A planar projection from top to bottom.Tessellation does not work when you use the Planar UV mapping type.
• **Triplanar**: A planar projection in three directions:
• X-axis: Left to right
• Y-axis: Top to bottom
• Z-axis: Front to back
Unity blends these three projections together to produce the final result. Tessellation does not work when you use the Triplanar UV mapping type. | +| **Tiling** | Set an **X** and **Y** UV tile rate for all the Textures in the **Surface Inputs** section. HDRP uses the **X** and **Y** values to tile these Textures across the Material’s surface, in object space. | +| **Offset** | Set an **X** and **Y** UV offset for all the Textures in the **Surface Inputs** section. HDRP uses the **X** and **Y** values to offset these Textures across the Material’s surface, in object. | ### Detail Inputs @@ -78,13 +78,13 @@ Unity exposes this section if you select **Transparent** from the **Surface Type | ------------------------------- | ------------------------------------------------------------ | | **Use Emission Intensity** | Enable the checkbox to use a separate LDR color and intensity value to set the emission color for this Material. Disable this checkbox to only use an HDR color to handle the color and emission color intensity. When enabled, this exposes the **Emission Intensity** property. | | **Emission Map** | Assign a Texture that this Material uses for emission. You can also use the color picker to select a color that HDRP multiplies by the Texture. If you do not set an emission texture then HDRP only uses the HDR color to calculate the final emissive color of the Material. You can set the intensity of the HDR color within the HDR color picker. | -| **Emission UV Mapping** | Use the drop-down to select the type of UV mapping that HDRP uses for the **Emission Map**.
• Unity manages four UV channels for a vertex: **UV0**, **UV1**, **UV2**, and **UV3**.
• **Planar:** A planar projection from top to bottom.
• **Triplanar**: A planar projection in three directions:
X-axis: Left to right
Y-axis: Top to bottom
Z-axis: Front to back

Unity blends these three projections together to produce the final result.
• **Same as Base**: Unity will use the **Base UV Mapping** selected in the **Surface Inputs**. | +| **Emission UV Mapping** | Use the drop-down to select the UV mapping type that HDRP uses for the **Emission Map**.
• Unity manages four UV channels for a vertex: **UV0**, **UV1**, **UV2**, and **UV3**.
• **Planar:** A planar projection from top to bottom. Tessellation does not work when you use the Planar UV mapping type.
• **Triplanar**: A planar projection in three directions:
• X-axis: Left to right
• Y-axis: Top to bottom
• Z-axis: Front to back
Unity blends these three projections together to produce the final result. Tessellation does not work when you use the Triplanar UV mapping type.
• **Same as Base**: Unity will use the **Base UV Mapping** selected in the **Surface Inputs**. | | **- Tiling** | Set an **X** and **Y** tile rate for the **Emission Map** UV. HDRP uses the **X** and **Y** values to tile the Texture assigned to the **Emission Map** across the Material’s surface, in object space. | | **- Offset** | Set an **X** and **Y** offset for the **Emission Map** UV. HDRP uses the **X** and **Y** values to offset the Texture assigned to the **Emission Map** across the Material’s surface, in object space. | | **Emission Intensity** | Set the overall strength of the emission effect for this Material.
Use the drop-down to select one of the following [physical light units](Physical-Light-Units.md) to use for intensity:
• [Nits](Physical-Light-Units.md#Nits)
• [EV100](Physical-Light-Units.md#EV) | | **Exposure Weight** | Use the slider to set how much effect the exposure has on the emission power. For example, if you create a neon tube, you would want to apply the emissive glow effect at every exposure. | | **Emission Multiply with Base** | Enable the checkbox to make HDRP use the base color of the Material when it calculates the final color of the emission. When enabled, HDRP multiplies the emission color by the base color to calculate the final emission color. | -| **Emission** | Toggles whether emission affects global illumination. | +| **Emission** | Toggles whether emission affects global illumination. | | **- Global Illumination** | The mode HDRP uses to determine how color emission interacts with global illumination.
• **Realtime**: Select this option to make emission affect the result of real-time global illumination.
• **Baked**: Select this option to make emission only affect global illumination during the baking process.
• **None**: Select this option to make emission not affect global illumination. | ### Advanced options diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Motion-Vectors.md b/com.unity.render-pipelines.high-definition/Documentation~/Motion-Vectors.md index 29e3bc56bfd..e85283fe073 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Motion-Vectors.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Motion-Vectors.md @@ -28,7 +28,7 @@ The options are: * **Camera Motion Only**: HDRP only calculates camera motion vectors for the area of the screen this GameObject fills. * **Per Object Motion**: HDRP calculates motion vectors for this GameObject if: * The GameObject moves and the camera does not. - * The camera moves and the GamaObject does not. + * The camera moves and the GameObject does not. * Both the GameObject and the camera move. * **Force No Motion**: HDRP does not calculate any motion vectors for the area of the screen this GameObject fills. diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-Reflection.md b/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-Reflection.md index c50fb470db8..df3c2c33818 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-Reflection.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-Reflection.md @@ -79,7 +79,7 @@ To calculate SSR, HDRP reads a color buffer with a blurred mipmap generated duri If a transparent material has **Receive SSR Transparent** enabled, HDRP always uses the **Approximation** algorithm to calculate SSR, even you select **PBR Accumulation**. - +When a transparent material has rendering pass set to **Low Resolution**, then **Receive SSR Transparent** can't be selected. ### Ray-traced reflection diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Post-Processing-Motion-Blur.md b/com.unity.render-pipelines.high-definition/Documentation~/Post-Processing-Motion-Blur.md index 0dc1669e6aa..2f0d717fa17 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Post-Processing-Motion-Blur.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Post-Processing-Motion-Blur.md @@ -6,7 +6,7 @@ The Motion Blur effect simulates the blur that occurs in an image when a real-wo The Motion Blur effect uses velocities from HDRP's velocity buffer. This means that for Motion Blur to have an effect, you must enable Motion Vectors in your Unity Project. For information on how to enable Motion Vectors, see the [Motion Vectors documentation](Motion-Vectors.md). -**Motion Blur** uses the [Volume](Volumes.md) framework, so to enable and modify **Motion Blur** properties, you must add a **Motion Blur** override to a [Volume](Volumes.md) in your Scene. To add **Motion Blur** to a Volume: +**Motion Blur** is enabled by default in **HDRP Global Settings**. However, if you want to modify **Motion Blur** properties without affecting the default settings, you must add a **Motion Blur** override to a [Volume](Volumes.md) in your Scene. To add **Motion Blur** to a Volume: 1. In the Scene or Hierarchy view, select a GameObject that contains a Volume component to view it in the Inspector. 2. In the Inspector, navigate to **Add Override > Post-processing** and click on **Motion Blur**. HDRP now applies **Motion Blur** to any Camera this Volume affects. diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Shadows-in-HDRP.md b/com.unity.render-pipelines.high-definition/Documentation~/Shadows-in-HDRP.md index acbf2049889..e89ae854060 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Shadows-in-HDRP.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Shadows-in-HDRP.md @@ -14,6 +14,7 @@ The number of shadow maps HDRP renders per Light depends on the **Type** of the - A Spot Light renders one shadow map. - A Point Light renders six shadow maps (the number of faces in a cubemap). +- An Area Light renders one shadow map. - A Directional Light renders one shadow map per cascade. Set the cascade count of Directional Lights from the [HD Shadow Settings](Override-Shadows.md) of your Scene’s [Volumes](Volumes.md). The default value is four cascades. HDRP can perform a dynamic rescale of shadow maps to maximize space usage in shadow atlases, but also to reduce the performance impact of lights that occupy a small portion of the screen. To do this, HDRP scales down a light's shadow map resolution depending on the size of the screen area the light covers. The smaller the area on the screen, the more HDRP scales the resolution down from the value set on the [Light component](Light-Component.md). To enable this feature, go the Shadow section of your Unity Project’s [HDRP Asset](HDRP-Asset.md) and enable the **Dynamic Rescale** property for the shadow atlas you want HDRP to dynamically rescale the shadow maps of. @@ -21,7 +22,7 @@ Note that HDRP does not support dynamic rescale for cached shadow maps. ## Shadow atlases -HDRP renders all real-time shadows for a frame using a shadow map atlas for all [punctual light](Glossary.md#PunctualLight) shadows, and another shadow map atlas for Directional Light shadows. +HDRP renders all real-time shadows for a frame using a shadow map atlas for all [punctual light](Glossary.md#PunctualLight) shadows, an atlas for area lights and another one for Directional Light shadows. Set the size of these atlases in your Unity Project’s [HDRP Asset](HDRP-Asset.md). The atlas size determines the maximum resolution of shadows in your Scene. diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Surface-Type.md b/com.unity.render-pipelines.high-definition/Documentation~/Surface-Type.md index ccfcb40c4c0..790942fac78 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Surface-Type.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Surface-Type.md @@ -23,10 +23,10 @@ If you set the **Surface Type** to **Transparent**, HDRP exposes options to set | **Sorting Priority** | Allows you to change the rendering order of overlaid transparent surfaces. For more information and an example of usage, see the [Material sorting documentation](Renderer-And-Material-Priority.md#SortingByMaterial). | | **Receive fog** | Enable the checkbox to allow fog to affect the transparent surface. When disabled, HDRP does not take this Material into account when it calculates the fog in the Scene. | | **Back Then Front Rendering** | Enable the checkbox to make HDRP render this Material in two separate draw calls. HDRP renders the back face in the first draw call and the front face in the second. | -| **Transparent depth prepass** | Enable the checkbox to add polygons from the transparent surface to the depth buffer to improve their sorting. HDRP performs this operation before the transparent lighting pass. | -| **Transparent depth postpass** | Enable the checkbox to add polygons from the transparent surface to the depth buffer so they affect post-processing. HDRP performs this operation after the lighting pass. Enabling this feature is useful when using post-processing effects that use depth information, like [motion blur](Post-Processing-Motion-Blur.md) or [depth of field](Post-Processing-Depth-of-Field.md). | -| **Transparent Writes Motion Vectors** | Enable the checkbox to make HDRP write motion vectors for transparent GameObjects that use this Material. This allows HDRP to process effects like motion blur for transparent objects. For more information on motion vectors, see the [motion vectors documentation](Motion-Vectors.md). | -| **Depth Write** | Enable the checkbox to make HDRP write depth values for transparent GameObjects that use this Material. | +| **Transparent depth prepass** | Enable the checkbox to add polygons from the transparent surface to the depth buffer to improve their sorting. HDRP performs this operation before the transparent lighting pass. Not supported when rendering pass is Low Resolution. | +| **Transparent depth postpass** | Enable the checkbox to add polygons from the transparent surface to the depth buffer so they affect post-processing. HDRP performs this operation after the lighting pass. Enabling this feature is useful when using post-processing effects that use depth information, like [motion blur](Post-Processing-Motion-Blur.md) or [depth of field](Post-Processing-Depth-of-Field.md). Not supported when rendering pass is Low Resolution. | +| **Transparent Writes Motion Vectors** | Enable the checkbox to make HDRP write motion vectors for transparent GameObjects that use this Material. This allows HDRP to process effects like motion blur for transparent objects. For more information on motion vectors, see the [motion vectors documentation](Motion-Vectors.md). Not supported when rendering pass is Low Resolution. | +| **Depth Write** | Enable the checkbox to make HDRP write depth values for transparent GameObjects that use this Material. Not supported when rendering pass is Low Resolution. | | **Depth Test** | Use the drop-down to select the comparison function to use for the depth test. | | **Cull Mode** | Use the drop-down to select the face to cull for transparent GameObjects that use this Material.
• **Front**: Culls the front face of the GameObject's Mesh.
• **Back**: Culls the back face of the GameObject's Mesh. | diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Tessellation.md b/com.unity.render-pipelines.high-definition/Documentation~/Tessellation.md index 567122f4410..84547d7818e 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Tessellation.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Tessellation.md @@ -1,6 +1,6 @@ # Tessellation -The **Tessellation** option control how Unity tessellates your Material's surface and smooths geometry. +The **Tessellation** options control how Unity tessellates your Material's surface and smooths geometry. If you enable this feature, HDRP exposes the following properties to control how Unity tessellates your Material's surface and smooths geometry: diff --git a/com.unity.render-pipelines.high-definition/Documentation~/hair-shader.md b/com.unity.render-pipelines.high-definition/Documentation~/hair-shader.md index 3fa2526aef6..51ac5508e1c 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/hair-shader.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/hair-shader.md @@ -3,7 +3,7 @@ The Hair shader is your starting point for rendering hair and fur in the High De ![](Images/HDRPFeatures-HairShader.png) -Under the hood, the Hair shader is a pre-configured Shader Graph. To learn more about the Hair shader implementation, or to create your own Hair shader variant, see the Shader Graph documentation about the [Hair Master Node](Master-Node-Hair.md). +Under the hood, the Hair shader is a pre-configured Shader Graph. To learn more about the Hair shader implementation, or to create your own Hair shader variant, see the Shader Graph documentation about the [Hair Master Node](master-stack-hair.md). ## Importing the Hair Sample diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDBlockFields.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDBlockFields.cs index c0bcf4648fb..238ef964014 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDBlockFields.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDBlockFields.cs @@ -32,7 +32,7 @@ public struct SurfaceDescription public static BlockFieldDescriptor Distortion = new BlockFieldDescriptor(SurfaceDescription.name, "Distortion", "SURFACEDESCRIPTION_DISTORTION", new Vector2Control(Vector2.zero), ShaderStage.Fragment); // TODO: Lit is Vector2(2.0f, -1.0f) public static BlockFieldDescriptor DistortionBlur = new BlockFieldDescriptor(SurfaceDescription.name, "DistortionBlur", "Distortion Blur", "SURFACEDESCRIPTION_DISTORTIONBLUR", - new FloatControl(1.0f), ShaderStage.Fragment); + new FloatControl(0.0f), ShaderStage.Fragment); public static BlockFieldDescriptor ShadowTint = new BlockFieldDescriptor(SurfaceDescription.name, "ShadowTint", "Shadow Tint", "SURFACEDESCRIPTION_SHADOWTINT", new ColorRGBAControl(Color.black), ShaderStage.Fragment); diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs index 79bf2d3d498..b21257d7798 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs @@ -69,13 +69,17 @@ protected override void CreatePropertyGUI() AddProperty(blendModeText, () => systemData.blendMode, (newValue) => systemData.blendMode = newValue); AddProperty(enableTransparentFogText, () => builtinData.transparencyFog, (newValue) => builtinData.transparencyFog = newValue); AddProperty(transparentZTestText, () => systemData.zTest, (newValue) => systemData.zTest = newValue); - AddProperty(zWriteEnableText, () => systemData.transparentZWrite, (newValue) => systemData.transparentZWrite = newValue); + if (renderingPassValue != HDRenderQueue.RenderQueueType.LowTransparent) + AddProperty(zWriteEnableText, () => systemData.transparentZWrite, (newValue) => systemData.transparentZWrite = newValue); AddProperty(transparentCullModeText, () => systemData.transparentCullMode, (newValue) => systemData.transparentCullMode = newValue); AddProperty(transparentSortPriorityText, () => systemData.sortPriority, (newValue) => systemData.sortPriority = HDRenderQueue.ClampsTransparentRangePriority(newValue)); AddProperty(transparentBackfaceEnableText, () => builtinData.backThenFrontRendering, (newValue) => builtinData.backThenFrontRendering = newValue); - AddProperty(transparentDepthPrepassEnableText, () => builtinData.transparentDepthPrepass, (newValue) => builtinData.transparentDepthPrepass = newValue); - AddProperty(transparentDepthPostpassEnableText, () => builtinData.transparentDepthPostpass, (newValue) => builtinData.transparentDepthPostpass = newValue); - AddProperty(transparentWritingMotionVecText, () => builtinData.transparentWritesMotionVec, (newValue) => builtinData.transparentWritesMotionVec = newValue); + if (renderingPassValue != HDRenderQueue.RenderQueueType.LowTransparent) + { + AddProperty(transparentDepthPrepassEnableText, () => builtinData.transparentDepthPrepass, (newValue) => builtinData.transparentDepthPrepass = newValue); + AddProperty(transparentDepthPostpassEnableText, () => builtinData.transparentDepthPostpass, (newValue) => builtinData.transparentDepthPostpass = newValue); + AddProperty(transparentWritingMotionVecText, () => builtinData.transparentWritesMotionVec, (newValue) => builtinData.transparentWritesMotionVec = newValue); + } if (lightingData != null) AddProperty(enableBlendModePreserveSpecularLightingText, () => lightingData.blendPreserveSpecular, (newValue) => lightingData.blendPreserveSpecular = newValue); @@ -110,7 +114,7 @@ protected override void CreatePropertyGUI() { AddProperty(supportDecalsText, () => lightingData.receiveDecals, (newValue) => lightingData.receiveDecals = newValue); - if (systemData.surfaceType == SurfaceType.Transparent) + if (systemData.surfaceType == SurfaceType.Transparent && renderingPassValue != HDRenderQueue.RenderQueueType.LowTransparent) AddProperty(receivesSSRTransparentText, () => lightingData.receiveSSRTransparent, (newValue) => lightingData.receiveSSRTransparent = newValue); else AddProperty(receivesSSRText, () => lightingData.receiveSSR, (newValue) => lightingData.receiveSSR = newValue); diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs index aa1ee5f2315..9d05a4a8c92 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LitSurfaceInputsUIBlock.cs @@ -231,7 +231,6 @@ internal class Styles Features m_Features; int m_LayerCount; int m_LayerIndex; - bool m_UseHeightBasedBlend; bool isLayeredLit => m_LayerCount > 1; @@ -625,7 +624,7 @@ void DrawLayerOptionsGUI() materialEditor.ShaderProperty(useMainLayerInfluence, Styles.useMainLayerInfluenceModeText); materialEditor.ShaderProperty(useHeightBasedBlend, Styles.useHeightBasedBlendText); - if (m_UseHeightBasedBlend) + if (useHeightBasedBlend.floatValue > 0.0f) { EditorGUI.indentLevel++; materialEditor.ShaderProperty(heightTransition, Styles.heightTransition); diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs index c7565f64cb6..c6a8a296032 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs @@ -545,7 +545,7 @@ protected void DrawSurfaceGUI() if (shaderHasBackThenFrontPass && transparentBackfaceEnable != null) materialEditor.ShaderProperty(transparentBackfaceEnable, Styles.transparentBackfaceEnableText); - if ((m_Features & Features.ShowPrePassAndPostPass) != 0) + if ((m_Features & Features.ShowPrePassAndPostPass) != 0 && !HDRenderQueue.k_RenderQueue_LowTransparent.Contains(renderQueue)) { bool shaderHasDepthPrePass = materials.All(m => m.FindPass(HDShaderPassNames.s_TransparentDepthPrepassStr) != -1); if (shaderHasDepthPrePass && transparentDepthPrepassEnable != null) @@ -556,10 +556,10 @@ protected void DrawSurfaceGUI() materialEditor.ShaderProperty(transparentDepthPostpassEnable, Styles.transparentDepthPostpassEnableText); } - if (transparentWritingMotionVec != null) + if (transparentWritingMotionVec != null && !HDRenderQueue.k_RenderQueue_LowTransparent.Contains(renderQueue)) materialEditor.ShaderProperty(transparentWritingMotionVec, Styles.transparentWritingMotionVecText); - if (transparentZWrite != null) + if (transparentZWrite != null && !HDRenderQueue.k_RenderQueue_LowTransparent.Contains(renderQueue)) materialEditor.ShaderProperty(transparentZWrite, Styles.zWriteEnableText); if (zTest != null) @@ -761,7 +761,7 @@ protected void DrawLitSurfaceOptions() materialEditor.ShaderProperty(supportDecals, Styles.supportDecalsText); } - if (receivesSSR != null && receivesSSRTransparent != null) + if (receivesSSR != null && receivesSSRTransparent != null && !HDRenderQueue.k_RenderQueue_LowTransparent.Contains(renderQueue)) { // Based on the surface type, display the right recieveSSR option if (surfaceTypeValue == SurfaceType.Transparent) diff --git a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/Outdoors/SkyandFogSettingsProfile.asset b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/Outdoors/SkyandFogSettingsProfile.asset index b60f94a79e6..2a7f356d5fa 100644 --- a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/Outdoors/SkyandFogSettingsProfile.asset +++ b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/Outdoors/SkyandFogSettingsProfile.asset @@ -13,12 +13,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -28,11 +25,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -45,14 +40,9 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 - m_SkyVersion: 1 - m_ObsoleteEarthPreset: - m_OverrideState: 0 - m_Value: 1 type: m_OverrideState: 0 m_Value: 1 @@ -65,66 +55,42 @@ MonoBehaviour: planetaryRadius: m_OverrideState: 0 m_Value: 6378100 - min: 0 planetCenterPosition: m_OverrideState: 0 m_Value: {x: 0, y: -6378100, z: 0} airDensityR: m_OverrideState: 0 m_Value: 0.04534 - min: 0 - max: 1 airDensityG: m_OverrideState: 0 m_Value: 0.10237241 - min: 0 - max: 1 airDensityB: m_OverrideState: 0 m_Value: 0.23264056 - min: 0 - max: 1 airTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 airMaximumAltitude: m_OverrideState: 0 m_Value: 55261.973 - min: 0 aerosolDensity: m_OverrideState: 0 m_Value: 0.01192826 - min: 0 - max: 1 aerosolTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 0.9, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 aerosolMaximumAltitude: m_OverrideState: 0 m_Value: 8289.296 - min: 0 aerosolAnisotropy: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 numberOfBounces: m_OverrideState: 0 - m_Value: 8 - min: 1 - max: 10 + m_Value: 3 groundTint: m_OverrideState: 1 m_Value: {r: 0.122641504, g: 0.1043775, b: 0.09313812, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 groundColorTexture: m_OverrideState: 0 m_Value: {fileID: 0} @@ -134,7 +100,6 @@ MonoBehaviour: groundEmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 planetRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -144,42 +109,31 @@ MonoBehaviour: spaceEmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 spaceRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} colorSaturation: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 alphaSaturation: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 alphaMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 horizonTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 zenithTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 horizonZenithShift: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 + m_SkyVersion: 1 + m_ObsoleteEarthPreset: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &-4151792930034644520 MonoBehaviour: m_ObjectHideFlags: 3 @@ -193,7 +147,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -206,32 +159,21 @@ MonoBehaviour: color: m_OverrideState: 0 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 maxFogDistance: m_OverrideState: 0 m_Value: 5000 - min: 0 mipFogMaxMip: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 0 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 0 m_Value: 1000 - min: 0 baseHeight: m_OverrideState: 0 m_Value: 0 @@ -241,61 +183,42 @@ MonoBehaviour: meanFreePath: m_OverrideState: 0 m_Value: 400 - min: 1 enableVolumetricFog: m_OverrideState: 1 m_Value: 1 albedo: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 depthExtent: m_OverrideState: 0 m_Value: 64 - min: 0.1 denoisingMode: m_OverrideState: 0 m_Value: 2 anisotropy: m_OverrideState: 1 m_Value: 0.65 - min: -1 - max: 1 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_FogControlMode: m_OverrideState: 0 m_Value: 0 screenResolutionPercentage: m_OverrideState: 0 m_Value: 12.5 - min: 6.25 - max: 100 volumeSliceCount: m_OverrideState: 0 m_Value: 64 - min: 1 - max: 1024 m_VolumetricFogBudget: m_OverrideState: 0 m_Value: 0.33 - min: 0 - max: 1 m_ResolutionDepthRatio: m_OverrideState: 0 m_Value: 0.666 - min: 0 - max: 1 directionalLightsOnly: m_OverrideState: 0 m_Value: 0 @@ -329,13 +252,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 4 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 @@ -352,7 +283,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 4 @@ -458,19 +388,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -495,4 +421,3 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 diff --git a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/OutdoorsDXR/SkyandFogSettingsProfile.asset b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/OutdoorsDXR/SkyandFogSettingsProfile.asset index b60f94a79e6..2a7f356d5fa 100644 --- a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/OutdoorsDXR/SkyandFogSettingsProfile.asset +++ b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/OutdoorsDXR/SkyandFogSettingsProfile.asset @@ -13,12 +13,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -28,11 +25,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -45,14 +40,9 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 - m_SkyVersion: 1 - m_ObsoleteEarthPreset: - m_OverrideState: 0 - m_Value: 1 type: m_OverrideState: 0 m_Value: 1 @@ -65,66 +55,42 @@ MonoBehaviour: planetaryRadius: m_OverrideState: 0 m_Value: 6378100 - min: 0 planetCenterPosition: m_OverrideState: 0 m_Value: {x: 0, y: -6378100, z: 0} airDensityR: m_OverrideState: 0 m_Value: 0.04534 - min: 0 - max: 1 airDensityG: m_OverrideState: 0 m_Value: 0.10237241 - min: 0 - max: 1 airDensityB: m_OverrideState: 0 m_Value: 0.23264056 - min: 0 - max: 1 airTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 airMaximumAltitude: m_OverrideState: 0 m_Value: 55261.973 - min: 0 aerosolDensity: m_OverrideState: 0 m_Value: 0.01192826 - min: 0 - max: 1 aerosolTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 0.9, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 aerosolMaximumAltitude: m_OverrideState: 0 m_Value: 8289.296 - min: 0 aerosolAnisotropy: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 numberOfBounces: m_OverrideState: 0 - m_Value: 8 - min: 1 - max: 10 + m_Value: 3 groundTint: m_OverrideState: 1 m_Value: {r: 0.122641504, g: 0.1043775, b: 0.09313812, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 groundColorTexture: m_OverrideState: 0 m_Value: {fileID: 0} @@ -134,7 +100,6 @@ MonoBehaviour: groundEmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 planetRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -144,42 +109,31 @@ MonoBehaviour: spaceEmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 spaceRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} colorSaturation: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 alphaSaturation: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 alphaMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 horizonTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 zenithTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 horizonZenithShift: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 + m_SkyVersion: 1 + m_ObsoleteEarthPreset: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &-4151792930034644520 MonoBehaviour: m_ObjectHideFlags: 3 @@ -193,7 +147,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -206,32 +159,21 @@ MonoBehaviour: color: m_OverrideState: 0 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 maxFogDistance: m_OverrideState: 0 m_Value: 5000 - min: 0 mipFogMaxMip: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 0 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 0 m_Value: 1000 - min: 0 baseHeight: m_OverrideState: 0 m_Value: 0 @@ -241,61 +183,42 @@ MonoBehaviour: meanFreePath: m_OverrideState: 0 m_Value: 400 - min: 1 enableVolumetricFog: m_OverrideState: 1 m_Value: 1 albedo: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 depthExtent: m_OverrideState: 0 m_Value: 64 - min: 0.1 denoisingMode: m_OverrideState: 0 m_Value: 2 anisotropy: m_OverrideState: 1 m_Value: 0.65 - min: -1 - max: 1 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_FogControlMode: m_OverrideState: 0 m_Value: 0 screenResolutionPercentage: m_OverrideState: 0 m_Value: 12.5 - min: 6.25 - max: 100 volumeSliceCount: m_OverrideState: 0 m_Value: 64 - min: 1 - max: 1024 m_VolumetricFogBudget: m_OverrideState: 0 m_Value: 0.33 - min: 0 - max: 1 m_ResolutionDepthRatio: m_OverrideState: 0 m_Value: 0.666 - min: 0 - max: 1 directionalLightsOnly: m_OverrideState: 0 m_Value: 0 @@ -329,13 +252,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 4 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 @@ -352,7 +283,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 4 @@ -458,19 +388,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -495,4 +421,3 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs b/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs index 7bd88783ce3..1b34852008e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs @@ -107,14 +107,12 @@ public enum DebugLightLayersMask static class DebugLightHierarchyExtensions { -#if DEBUG - [IgnoreWarning(1370)] //Ignore throwing exception warning on burst.. -#endif + [IgnoreWarning(1370)] //Ignore throwing exception warning on burst.. public static bool IsEnabledFor( - this DebugLightFilterMode mode, - GPULightType gpuLightType, - SpotLightShape spotLightShape - ) + this DebugLightFilterMode mode, + GPULightType gpuLightType, + SpotLightShape spotLightShape + ) { switch (gpuLightType) { diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowUtils.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowUtils.cs index f75f52f683b..c3e2337fd27 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowUtils.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowUtils.cs @@ -5,7 +5,7 @@ namespace UnityEngine.Rendering.HighDefinition // TODO remove every occurrence of ShadowSplitData in function parameters when we'll have scriptable culling static class HDShadowUtils { - public static readonly float k_MinShadowNearPlane = 0.0001f; + public static readonly float k_MinShadowNearPlane = 0.01f; public static readonly float k_MaxShadowNearPlane = 10.0f; public static float Asfloat(uint val) { unsafe { return *((float*)&val); } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Hair/HairPathTracing.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Hair/HairPathTracing.hlsl index 7d91fd35d70..c07744c733b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Hair/HairPathTracing.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Hair/HairPathTracing.hlsl @@ -8,7 +8,7 @@ // https://www.pbrt.org/hair.pdf float2 DemuxFloat(float x) { - uint64_t v = x * (1ull << 32); + uint64_t v = x * (((uint64_t)1) << 32); uint2 bits = uint2(Compact1By1(v), Compact1By1(v >> 1)); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitAPI.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitAPI.cs index ad4e1adc87e..343d9f2ed49 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitAPI.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitAPI.cs @@ -97,12 +97,22 @@ static public void SetupLayersMappingKeywords(Material material) // All Validate functions must be static. It allows to automatically update the shaders with a script if code changes internal static void ValidateMaterial(Material material) { + MaterialId materialId = material.GetMaterialId(); + if (material.HasProperty(kMaterialID)) + { + if (materialId != MaterialId.LitStandard && materialId != MaterialId.LitSSS && materialId != MaterialId.LitTranslucent) + { + materialId = MaterialId.LitStandard; + material.SetFloat(kMaterialID, (float)materialId); + } + } + BaseLitAPI.SetupBaseLitKeywords(material); BaseLitAPI.SetupBaseLitMaterialPass(material); SetupLayersMappingKeywords(material); bool receiveSSR = material.GetSurfaceType() == SurfaceType.Opaque ? (material.HasProperty(kReceivesSSR) ? material.GetInt(kReceivesSSR) != 0 : false) : (material.HasProperty(kReceivesSSRTransparent) ? material.GetInt(kReceivesSSRTransparent) != 0 : false); - BaseLitAPI.SetupStencil(material, receiveSSR, material.GetMaterialId() == MaterialId.LitSSS); + BaseLitAPI.SetupStencil(material, receiveSSR, materialId == MaterialId.LitSSS); for (int i = 0; i < kMaxLayerCount; ++i) { @@ -177,7 +187,6 @@ internal static void ValidateMaterial(Material material) } CoreUtils.SetKeyword(material, "_DENSITY_MODE", useDensityModeEnable); - MaterialId materialId = material.GetMaterialId(); CoreUtils.SetKeyword(material, "_MATERIAL_FEATURE_SUBSURFACE_SCATTERING", materialId == MaterialId.LitSSS); CoreUtils.SetKeyword(material, "_MATERIAL_FEATURE_TRANSMISSION", materialId == MaterialId.LitTranslucent || (materialId == MaterialId.LitSSS && material.GetFloat(kTransmissionEnable) > 0.0f)); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph b/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph index 93016f95bd6..ef56b533940 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Nature/SpeedTree8.shadergraph @@ -208,33 +208,6 @@ { "m_Id": "d2424291c0f7420f9a0660b7051f84dc" }, - { - "m_Id": "fa323d4bae5143cc9fe1800551d7a848" - }, - { - "m_Id": "f467da04bb444463b72f53b3f66c0abb" - }, - { - "m_Id": "b69999c2c95d45b0b83f148e520eb8fb" - }, - { - "m_Id": "8d32abe58e6e40b0a4fc031a38667c4c" - }, - { - "m_Id": "db6cf405b16549c09ffd857c4038ed05" - }, - { - "m_Id": "5e1872b31dae4c5babc052603013756c" - }, - { - "m_Id": "3c0ce6bb9d7b4b0ca739d80d08d01ec2" - }, - { - "m_Id": "7f05288565444593974a63457ca1488c" - }, - { - "m_Id": "23a893b4f0f14c3081a0e3d8d8af329d" - }, { "m_Id": "397ebd2291d549ae81cd390ada59d916" }, @@ -270,6 +243,15 @@ }, { "m_Id": "2aee7981909e441b83ee82aeac14e4bc" + }, + { + "m_Id": "e631dbcd0e184c3f8b6a2b0cac818247" + }, + { + "m_Id": "dd2c9056a0914875b03207bf07d5f46b" + }, + { + "m_Id": "34aad7bfcbc241b1ac61ccda07a63586" } ], "m_GroupDatas": [ @@ -386,20 +368,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "23a893b4f0f14c3081a0e3d8d8af329d" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" - }, - "m_SlotId": 2064554629 - } - }, { "m_OutputSlot": { "m_Node": { @@ -473,29 +441,29 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "34df1d5101bbd9819c8fecf4422f7f84" + "m_Id": "34aad7bfcbc241b1ac61ccda07a63586" }, - "m_SlotId": 2 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "4700338116c44a85bff15bb374054167" + "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" }, - "m_SlotId": 1313628562 + "m_SlotId": 2064554629 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "3c0ce6bb9d7b4b0ca739d80d08d01ec2" + "m_Id": "34df1d5101bbd9819c8fecf4422f7f84" }, - "m_SlotId": 0 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" + "m_Id": "4700338116c44a85bff15bb374054167" }, - "m_SlotId": 2074262670 + "m_SlotId": 1313628562 } }, { @@ -610,20 +578,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "5e1872b31dae4c5babc052603013756c" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "b69999c2c95d45b0b83f148e520eb8fb" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -722,20 +676,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "7f05288565444593974a63457ca1488c" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" - }, - "m_SlotId": -1960380622 - } - }, { "m_OutputSlot": { "m_Node": { @@ -750,20 +690,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "8d32abe58e6e40b0a4fc031a38667c4c" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "fa323d4bae5143cc9fe1800551d7a848" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -1047,15 +973,29 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "db6cf405b16549c09ffd857c4038ed05" + "m_Id": "dd2c9056a0914875b03207bf07d5f46b" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "f467da04bb444463b72f53b3f66c0abb" + "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" + }, + "m_SlotId": -1960380622 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e631dbcd0e184c3f8b6a2b0cac818247" }, "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4412f1dc4aa7492f86114fbffca3cf80" + }, + "m_SlotId": 2074262670 } }, { @@ -1115,15 +1055,6 @@ }, { "m_Id": "c5bd883ee36b4a0eb5a4824a41fc7849" - }, - { - "m_Id": "fa323d4bae5143cc9fe1800551d7a848" - }, - { - "m_Id": "f467da04bb444463b72f53b3f66c0abb" - }, - { - "m_Id": "b69999c2c95d45b0b83f148e520eb8fb" } ] }, @@ -1146,22 +1077,22 @@ "m_Id": "1d30375bc1f1466a828deeea4d35e628" }, { - "m_Id": "5fb1efbf157f4947af2cd277bd4b3681" + "m_Id": "49549d29c563458a95e74b23cbab720d" }, { - "m_Id": "49549d29c563458a95e74b23cbab720d" + "m_Id": "b7c7273c74724bf29ecf76693309c154" }, { "m_Id": "4fcc11cb34d2413b9282f84bd1143d08" }, { - "m_Id": "1ced7446383043f4a4f7f185909614b2" + "m_Id": "2632ef431c2048d597d0f022ece8bf5f" }, { - "m_Id": "b7c7273c74724bf29ecf76693309c154" + "m_Id": "1ced7446383043f4a4f7f185909614b2" }, { - "m_Id": "2632ef431c2048d597d0f022ece8bf5f" + "m_Id": "5fb1efbf157f4947af2cd277bd4b3681" } ] }, @@ -1191,8 +1122,8 @@ "m_ObjectId": "003b4ef77bba4db8a2543888cf83d33c", "m_Title": "Normals", "m_Position": { - "x": -1671.0, - "y": 423.0 + "x": -1400.6668701171875, + "y": 410.00006103515627 } } @@ -1353,10 +1284,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 168.0000457763672, - "y": 705.3333129882813, - "width": 185.33335876464845, - "height": 34.0 + "x": 156.00001525878907, + "y": 619.3333129882813, + "width": 184.66664123535157, + "height": 36.0 } }, "m_Slots": [ @@ -1523,29 +1454,6 @@ ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "0bddee461ecf4ba88db97f6f213782fc", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1644,10 +1552,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -462.66668701171877, - "y": 765.3333740234375, - "width": 186.6667022705078, - "height": 251.33338928222657 + "x": -506.6667175292969, + "y": 771.3333129882813, + "width": 184.66668701171876, + "height": 254.66668701171876 } }, "m_Slots": [ @@ -1763,10 +1671,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -149.33338928222657, - "y": 734.0, - "width": 171.3333282470703, - "height": 142.0 + "x": -193.33334350585938, + "y": 740.0, + "width": 172.00001525878907, + "height": 144.0 } }, "m_Slots": [ @@ -1897,10 +1805,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": 518.6666870117188, + "y": 678.6666259765625, + "width": 200.0, + "height": 42.66668701171875 } }, "m_Slots": [ @@ -2021,41 +1929,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", - "m_ObjectId": "23a893b4f0f14c3081a0e3d8d8af329d", - "m_Group": { - "m_Id": "003b4ef77bba4db8a2543888cf83d33c" - }, - "m_Name": "BitangentWS (Custom Interpolator)", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1582.0001220703125, - "y": 625.3333129882813, - "width": 247.3333740234375, - "height": 94.00000762939453 - } - }, - "m_Slots": [ - { - "m_Id": "90ddfdf80526456a883f8c39cea7a4bb" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "customBlockNodeName": "BitangentWS", - "serializedType": 3 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -2091,10 +1964,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": 521.3333740234375, + "y": 591.3333129882813, + "width": 200.0, + "height": 42.66668701171875 } }, "m_Slots": [ @@ -2176,6 +2049,29 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "28d19100999142d5a69106ddd102bb0e", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -2251,10 +2147,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -508.0001525878906, + "x": -542.6666259765625, "y": 500.66668701171877, - "width": 134.66665649414063, - "height": 118.00000762939453 + "width": 136.6666259765625, + "height": 119.99993896484375 } }, "m_Slots": [ @@ -2378,10 +2274,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1302.666748046875, - "y": 540.0000610351563, - "width": 150.6666259765625, - "height": 34.000003814697269 + "x": -1343.33349609375, + "y": 526.6666259765625, + "width": 148.6666259765625, + "height": 36.00006103515625 } }, "m_Slots": [ @@ -2414,10 +2310,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -732.6665649414063, - "y": 806.0000610351563, - "width": 279.9999694824219, - "height": 34.0 + "x": -776.6666870117188, + "y": 812.0000610351563, + "width": 274.0, + "height": 35.99993896484375 } }, "m_Slots": [ @@ -2453,29 +2349,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "2f68a42c62aa4c978744b485cd563652", - "m_Id": 0, - "m_DisplayName": "NormalWS", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "NormalWS", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2545,6 +2418,40 @@ "m_IsEditable": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BitangentVectorNode", + "m_ObjectId": "34aad7bfcbc241b1ac61ccda07a63586", + "m_Group": { + "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + }, + "m_Name": "Bitangent Vector", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1638.666748046875, + "y": 522.6666259765625, + "width": 207.3333740234375, + "height": 134.66668701171876 + } + }, + "m_Slots": [ + { + "m_Id": "86c1302684fe4368a6f48a32a907eb72" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2691,55 +2598,20 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", - "m_ObjectId": "3c0ce6bb9d7b4b0ca739d80d08d01ec2", + "m_Type": "UnityEditor.ShaderGraph.BranchNode", + "m_ObjectId": "3cb505b1436e4dc790ef1e1bdfbe7818", "m_Group": { - "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + "m_Id": "b6fa1dd6439d4637857c11b7f865748a" }, - "m_Name": "NormalWS (Custom Interpolator)", + "m_Name": "Branch", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1567.33349609375, - "y": 719.3333740234375, - "width": 232.666748046875, - "height": 94.00000762939453 - } - }, - "m_Slots": [ - { - "m_Id": "dc114caec7614bb7bc00309d195c197a" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "customBlockNodeName": "NormalWS", - "serializedType": 3 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BranchNode", - "m_ObjectId": "3cb505b1436e4dc790ef1e1bdfbe7818", - "m_Group": { - "m_Id": "b6fa1dd6439d4637857c11b7f865748a" - }, - "m_Name": "Branch", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 258.66668701171877, - "y": 734.0, - "width": 171.33334350585938, - "height": 142.0 + "x": 214.66665649414063, + "y": 740.0, + "width": 171.99996948242188, + "height": 144.0 } }, "m_Slots": [ @@ -2778,10 +2650,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -308.6667175292969, - "y": 848.0, - "width": 143.33334350585938, - "height": 34.0 + "x": -352.6667175292969, + "y": 854.0, + "width": 141.33335876464845, + "height": 36.0 } }, "m_Slots": [ @@ -2857,10 +2729,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1131.33349609375, - "y": 482.0000915527344, - "width": 335.3333740234375, - "height": 214.00001525878907 + "x": -1172.0, + "y": 468.6667175292969, + "width": 329.33319091796877, + "height": 239.99996948242188 } }, "m_Slots": [ @@ -2971,8 +2843,8 @@ "m_ObjectId": "44c44bd9998f4636a5f80a1c44b97fae", "m_Title": "Billboard", "m_Position": { - "x": -532.6668701171875, - "y": 417.3334045410156 + "x": -568.0, + "y": 417.9999694824219 } } @@ -3239,29 +3111,6 @@ "m_SerializedDescriptor": "SurfaceDescription.Emission" } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "4bc6b5a827cd40b5b41e366607c31f37", - "m_Id": 0, - "m_DisplayName": "TangentWS", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "TangentWS", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -3321,10 +3170,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": 516.6666870117188, + "y": 604.6666259765625, + "width": 200.0, + "height": 42.66668701171875 } }, "m_Slots": [ @@ -3343,29 +3192,6 @@ "m_SerializedDescriptor": "SurfaceDescription.Smoothness" } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "4fdb6984495047e1abf9f95ae8a957af", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.KeywordNode", @@ -3561,29 +3387,6 @@ "m_Value": true } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "5ae0a9e6792347b2973921ff54a74f90", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3713,40 +3516,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BitangentVectorNode", - "m_ObjectId": "5e1872b31dae4c5babc052603013756c", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Bitangent Vector", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 198.6667022705078, - "y": -110.0000228881836, - "width": 206.0, - "height": 131.33334350585938 - } - }, - "m_Slots": [ - { - "m_Id": "0bddee461ecf4ba88db97f6f213782fc" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 2, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Space": 2 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3783,10 +3552,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": 516.6666870117188, + "y": 704.6666259765625, + "width": 200.0, + "height": 42.666748046875 } }, "m_Slots": [ @@ -3998,10 +3767,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 353.3333435058594, - "y": 633.3333129882813, - "width": 135.33331298828126, - "height": 118.0 + "x": 341.33331298828127, + "y": 547.3333129882813, + "width": 136.66671752929688, + "height": 120.0 } }, "m_Slots": [ @@ -4148,10 +3917,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -304.0001220703125, + "x": -338.6667175292969, "y": 506.66668701171877, - "width": 144.6666717529297, - "height": 136.0 + "width": 147.33334350585938, + "height": 138.66668701171876 } }, "m_Slots": [ @@ -4265,10 +4034,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -237.33331298828126, - "y": 920.6665649414063, - "width": 118.00000762939453, - "height": 94.00006103515625 + "x": -281.3333740234375, + "y": 926.6666259765625, + "width": 118.66665649414063, + "height": 96.00006103515625 } }, "m_Slots": [ @@ -4639,41 +4408,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CustomInterpolatorNode", - "m_ObjectId": "7f05288565444593974a63457ca1488c", - "m_Group": { - "m_Id": "003b4ef77bba4db8a2543888cf83d33c" - }, - "m_Name": "TangentWS (Custom Interpolator)", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1574.666748046875, - "y": 531.3333740234375, - "width": 240.0, - "height": 94.00000762939453 - } - }, - "m_Slots": [ - { - "m_Id": "ecbd9c270eb347d5ba9d0b180defce80" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "customBlockNodeName": "TangentWS", - "serializedType": 3 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ComparisonNode", @@ -4824,6 +4558,29 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "86c1302684fe4368a6f48a32a907eb72", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5061,63 +4818,6 @@ "m_SupportVFX": false } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.NormalVectorNode", - "m_ObjectId": "8d32abe58e6e40b0a4fc031a38667c4c", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Normal Vector", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 198.6667022705078, - "y": -373.9999694824219, - "width": 206.0, - "height": 130.6666717529297 - } - }, - "m_Slots": [ - { - "m_Id": "4fdb6984495047e1abf9f95ae8a957af" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 2, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Space": 2 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "90ddfdf80526456a883f8c39cea7a4bb", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -5130,10 +4830,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1334.666748046875, - "y": 514.0, - "width": 182.6666259765625, - "height": 34.000003814697269 + "x": -1375.33349609375, + "y": 500.66668701171877, + "width": 180.0, + "height": 35.99993896484375 } }, "m_Slots": [ @@ -6050,48 +5750,14 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "b69999c2c95d45b0b83f148e520eb8fb", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.CustomInterpolator", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "c86b27c5aa114d4398b98b21c90a1c96" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.BitangentWS#3" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", "m_ObjectId": "b6fa1dd6439d4637857c11b7f865748a", "m_Title": "Misc contains: Smoothness(R) Metallic (G) Ambient Occlusion (B)", "m_Position": { - "x": -757.9998168945313, - "y": 672.0 + "x": -802.0, + "y": 678.6666259765625 } } @@ -6148,10 +5814,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": 520.6666870117188, + "y": 512.6666259765625, + "width": 200.0, + "height": 42.66668701171875 } }, "m_Slots": [ @@ -6780,10 +6446,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -457.33331298828127, - "y": 731.3333129882813, - "width": 171.33334350585938, - "height": 34.0 + "x": -501.3333740234375, + "y": 737.3333740234375, + "width": 169.33334350585938, + "height": 35.99993896484375 } }, "m_Slots": [ @@ -6804,29 +6470,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "c86b27c5aa114d4398b98b21c90a1c96", - "m_Id": 0, - "m_DisplayName": "BitangentWS", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "BitangentWS", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -7082,10 +6725,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 58.666744232177737, - "y": 822.0, - "width": 126.66667175292969, - "height": 118.00000762939453 + "x": 14.666621208190918, + "y": 828.0, + "width": 127.33332061767578, + "height": 120.0 } }, "m_Slots": [ @@ -7109,6 +6752,29 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "d2724633a49b415082f993d4842ee6a1", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7233,10 +6899,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -99.33332061767578, - "y": 882.0, - "width": 120.66666412353516, - "height": 149.33331298828126 + "x": -143.33334350585938, + "y": 888.0000610351563, + "width": 120.6666259765625, + "height": 150.66668701171876 } }, "m_Slots": [ @@ -7290,63 +6956,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.TangentVectorNode", - "m_ObjectId": "db6cf405b16549c09ffd857c4038ed05", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Tangent Vector", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 198.6667022705078, - "y": -240.66665649414063, - "width": 206.0, - "height": 130.66665649414063 - } - }, - "m_Slots": [ - { - "m_Id": "5ae0a9e6792347b2973921ff54a74f90" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_DismissedVersion": 0, - "m_PreviewMode": 2, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Space": 2 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "dc114caec7614bb7bc00309d195c197a", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -7374,6 +6983,40 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentVectorNode", + "m_ObjectId": "dd2c9056a0914875b03207bf07d5f46b", + "m_Group": { + "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + }, + "m_Name": "Tangent Vector", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1638.666748046875, + "y": 388.0, + "width": 207.3333740234375, + "height": 134.6666259765625 + } + }, + "m_Slots": [ + { + "m_Id": "d2724633a49b415082f993d4842ee6a1" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", @@ -7541,6 +7184,40 @@ "m_DefaultValue": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalVectorNode", + "m_ObjectId": "e631dbcd0e184c3f8b6a2b0cac818247", + "m_Group": { + "m_Id": "003b4ef77bba4db8a2543888cf83d33c" + }, + "m_Name": "Normal Vector", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1638.666748046875, + "y": 657.3333129882813, + "width": 207.3333740234375, + "height": 134.666748046875 + } + }, + "m_Slots": [ + { + "m_Id": "28d19100999142d5a69106ddd102bb0e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7597,29 +7274,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "ecbd9c270eb347d5ba9d0b180defce80", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.SystemData", @@ -7777,10 +7431,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -112.00004577636719, - "y": 476.6667785644531, - "width": 332.66668701171877, - "height": 166.0 + "x": -146.6666717529297, + "y": 476.6666564941406, + "width": 330.6666259765625, + "height": 168.00003051757813 } }, "m_Slots": [ @@ -7837,40 +7491,6 @@ "m_DropdownSelectedEntries": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "f467da04bb444463b72f53b3f66c0abb", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.CustomInterpolator", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "4bc6b5a827cd40b5b41e366607c31f37" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.TangentWS#3" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -8017,40 +7637,6 @@ "m_DefaultType": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "fa323d4bae5143cc9fe1800551d7a848", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.CustomInterpolator", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "2f68a42c62aa4c978744b485cd563652" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.NormalWS#3" -} - { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/VTBufferManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Material/VTBufferManager.cs index 8574f5ba9d8..0a69e1ad656 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/VTBufferManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/VTBufferManager.cs @@ -130,7 +130,6 @@ public void Resolve(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle in Debug.Assert(data.lowresWidth <= data.resolver.CurrentWidth && data.lowresHeight <= data.resolver.CurrentHeight); Debug.Assert(data.lowresWidth <= lowresBuffer.referenceSize.x && data.lowresHeight <= lowresBuffer.referenceSize.y); - string mainFunction = (buffer.isMSAAEnabled) ? "KMainMSAA" : "KMain"; int inputID = (buffer.isMSAAEnabled) ? HDShaderIDs._InputTextureMSAA : HDShaderIDs._InputTexture; ctx.cmd.SetComputeTextureParam(data.downsampleCS, data.downsampleKernel, inputID, buffer); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs index e7b6f6e2254..3c2f700c210 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs @@ -1214,7 +1214,7 @@ class DebugViewMaterialData public bool clearDepth; } - TextureHandle RenderDebugViewMaterial(RenderGraph renderGraph, CullingResults cull, HDCamera hdCamera, BuildGPULightListOutput lightLists, DBufferOutput dbuffer, GBufferOutput gbuffer, TextureHandle depthBuffer) + TextureHandle RenderDebugViewMaterial(RenderGraph renderGraph, CullingResults cull, HDCamera hdCamera, BuildGPULightListOutput lightLists, DBufferOutput dbuffer, GBufferOutput gbuffer, TextureHandle depthBuffer, TextureHandle vtFeedbackBuffer) { bool msaa = hdCamera.msaaEnabled; @@ -1259,6 +1259,9 @@ TextureHandle RenderDebugViewMaterial(RenderGraph renderGraph, CullingResults cu { passData.frameSettings = hdCamera.frameSettings; passData.outputColor = builder.UseColorBuffer(output, 0); +#if ENABLE_VIRTUALTEXTURES + builder.UseColorBuffer(vtFeedbackBuffer, 1); +#endif passData.outputDepth = builder.UseDepthBuffer(CreateDepthBuffer(renderGraph, true, hdCamera.msaaSamples), DepthAccess.ReadWrite); // When rendering debug material we shouldn't rely on a depth prepass for optimizing the alpha clip test. As it is control on the material inspector side diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs index 9dee36c7303..579d73d6256 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs @@ -3197,7 +3197,7 @@ TextureHandle LensFlareDataDrivenPass(RenderGraph renderGraph, HDCamera hdCamera passData.parameters = PrepareLensFlareParameters(hdCamera); passData.viewport = postProcessViewportSize; passData.hdCamera = hdCamera; - passData.depthBuffer = depthBuffer; + passData.depthBuffer = builder.ReadTexture(depthBuffer); passData.occlusion = builder.ReadTexture(occlusionHandle); TextureHandle dest = GetPostprocessUpsampledOutputHandle(renderGraph, "Lens Flare Destination"); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs index 9ab7cf9daef..e63d306e874 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs @@ -240,6 +240,18 @@ PrepassOutput RenderPrepass(RenderGraph renderGraph, DecalNormalPatch(renderGraph, hdCamera, ref result); + if (shouldRenderMotionVectorAfterGBuffer) + { + // See the call RenderObjectsMotionVectors() above and comment + RenderObjectsMotionVectors(renderGraph, cullingResults, hdCamera, decalBuffer, result); + } + + // In case we don't have MSAA, we always run camera motion vectors when is safe to assume Object MV are rendered + if (!needCameraMVBeforeResolve) + { + RenderCameraMotionVectors(renderGraph, hdCamera, result.depthBuffer, result.resolvedMotionVectorsBuffer); + } + // After Depth and Normals/roughness including decals bool depthBufferModified = RenderCustomPass(renderGraph, hdCamera, colorBuffer, result, customPassCullingResults, cullingResults, CustomPassInjectionPoint.AfterOpaqueDepthAndNormal, aovRequest, aovBuffers); @@ -264,18 +276,6 @@ PrepassOutput RenderPrepass(RenderGraph renderGraph, // In both forward and deferred, everything opaque should have been rendered at this point so we can safely copy the depth buffer for later processing. GenerateDepthPyramid(renderGraph, hdCamera, mip1FromDownsampleForLowResTrans, ref result); - if (shouldRenderMotionVectorAfterGBuffer) - { - // See the call RenderObjectsMotionVectors() above and comment - RenderObjectsMotionVectors(renderGraph, cullingResults, hdCamera, decalBuffer, result); - } - - // In case we don't have MSAA, we always run camera motion vectors when is safe to assume Object MV are rendered - if (!needCameraMVBeforeResolve) - { - RenderCameraMotionVectors(renderGraph, hdCamera, result.depthBuffer, result.resolvedMotionVectorsBuffer); - } - // NOTE: Currently we profiled that generating the HTile for SSR and using it is not worth it the optimization. // However if the generated HTile will be used for something else but SSR, this should be made NOT resolve only and // re-enabled in the shader. diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 2adf5920002..0196b215232 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -75,6 +75,7 @@ void RecordRenderGraph(RenderRequest renderRequest, TextureHandle rayCountTexture = RayCountManager.CreateRayCountTexture(m_RenderGraph); #if ENABLE_VIRTUALTEXTURES TextureHandle vtFeedbackBuffer = VTBufferManager.CreateVTFeedbackBuffer(m_RenderGraph, hdCamera.msaaSamples); + bool resolveVirtualTextureFeedback = true; #else TextureHandle vtFeedbackBuffer = TextureHandle.nullHandle; #endif @@ -98,6 +99,10 @@ void RecordRenderGraph(RenderRequest renderRequest, StartXRSinglePass(m_RenderGraph, hdCamera); RenderFullScreenDebug(m_RenderGraph, colorBuffer, prepassOutput.depthBuffer, cullingResults, hdCamera); + +#if ENABLE_VIRTUALTEXTURES + resolveVirtualTextureFeedback = false; // Could be handled but not needed for fullscreen debug pass currently +#endif } else if (m_CurrentDebugDisplaySettings.IsDebugMaterialDisplayEnabled() || m_CurrentDebugDisplaySettings.IsMaterialValidationEnabled() || CoreUtils.IsSceneLightingDisabled(hdCamera.camera)) { @@ -112,7 +117,7 @@ void RecordRenderGraph(RenderRequest renderRequest, // Stop Single Pass is after post process. StartXRSinglePass(m_RenderGraph, hdCamera); - colorBuffer = RenderDebugViewMaterial(m_RenderGraph, cullingResults, hdCamera, gpuLightListOutput, prepassOutput.dbuffer, prepassOutput.gbuffer, prepassOutput.depthBuffer); + colorBuffer = RenderDebugViewMaterial(m_RenderGraph, cullingResults, hdCamera, gpuLightListOutput, prepassOutput.dbuffer, prepassOutput.gbuffer, prepassOutput.depthBuffer, vtFeedbackBuffer); colorBuffer = ResolveMSAAColor(m_RenderGraph, hdCamera, colorBuffer); } else if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.RayTracing) && hdCamera.volumeStack.GetComponent().enable.value && hdCamera.camera.cameraType != CameraType.Preview && GetRayTracingState() && GetRayTracingClusterState()) @@ -132,6 +137,10 @@ void RecordRenderGraph(RenderRequest renderRequest, { Debug.LogWarning("Path Tracing is not supported with XR single-pass rendering."); } + +#if ENABLE_VIRTUALTEXTURES + resolveVirtualTextureFeedback = false; +#endif } else { @@ -248,14 +257,17 @@ void RecordRenderGraph(RenderRequest renderRequest, // Render gizmos that should be affected by post processes RenderGizmos(m_RenderGraph, hdCamera, GizmoSubset.PreImageEffects); + } #if ENABLE_VIRTUALTEXTURES - // Note: This pass rely on availability of vtFeedbackBuffer buffer (i.e it need to be write before we read it here) - // We don't write it when doing debug mode, FullScreenDebug mode or path tracer. Thus why this pass is call here. + // Note: This pass rely on availability of vtFeedbackBuffer buffer (i.e it need to be write before we read it here) + // We don't write it when FullScreenDebug mode or path tracer. + if (resolveVirtualTextureFeedback) + { hdCamera.ResolveVirtualTextureFeedback(m_RenderGraph, vtFeedbackBuffer); PushFullScreenVTFeedbackDebugTexture(m_RenderGraph, vtFeedbackBuffer, msaa); -#endif } +#endif // At this point, the color buffer has been filled by either debug views are regular rendering so we can push it here. var colorPickerTexture = PushColorPickerDebugTexture(m_RenderGraph, colorBuffer); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index e908685c238..78bf42c6efc 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -89,7 +89,7 @@ internal static HDRenderPipeline currentPipeline /// /// Specifes which ray count value should be returned. /// The approximated ray count for a frame - public uint GetRaysPerFrame(RayCountValues rayValues) { return m_RayCountManager.GetRaysPerFrame(rayValues); } + public uint GetRaysPerFrame(RayCountValues rayValues) { return m_RayCountManager != null ? m_RayCountManager.GetRaysPerFrame(rayValues) : 0; } // Renderer Bake configuration can vary depends on if shadow mask is enabled or no PerObjectData m_CurrentRendererConfigurationBakedLighting = HDUtils.k_RendererConfigurationBakedLighting; @@ -587,7 +587,7 @@ void SetRenderingFeatures() if (UnityEditor.PlayerSettings.colorSpace == ColorSpace.Gamma) { - Debug.LogError("High Definition Render Pipeline doesn't support Gamma mode, change to Linear mode (HDRP isn't set up properly. Go to Windows > RenderPipeline > HDRP Wizard to fix your settings)."); + Debug.LogError("High Definition Render Pipeline doesn't support Gamma mode, change to Linear mode (HDRP isn't set up properly. Go to Window > Rendering > HDRP Wizard to fix your settings)."); } #endif diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs index 161f358d903..029b0543f91 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs @@ -383,9 +383,15 @@ void RenderSky(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle skyBuff passData.skyManager = m_SkyManager; builder.SetRenderFunc( - (RenderSkyPassData data, RenderGraphContext context) => + (RenderSkyPassData data, RenderGraphContext ctx) => { - data.skyManager.RenderSky(data.hdCamera, data.sunLight, data.colorBuffer, data.depthTexture, data.debugDisplaySettings, context.cmd); + // Override the exposure texture, as we need a neutral value for this render + ctx.cmd.SetGlobalTexture(HDShaderIDs._ExposureTexture, m_EmptyExposureTexture); + + data.skyManager.RenderSky(data.hdCamera, data.sunLight, data.colorBuffer, data.depthTexture, data.debugDisplaySettings, ctx.cmd); + + // Restore the regular exposure texture + ctx.cmd.SetGlobalTexture(HDShaderIDs._ExposureTexture, GetExposureTexture(hdCamera)); }); } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/Shaders/PathTracingMain.raytrace b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/Shaders/PathTracingMain.raytrace index 265376c2cfa..98d180ef56d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/Shaders/PathTracingMain.raytrace +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/Shaders/PathTracingMain.raytrace @@ -45,8 +45,8 @@ void MissCamera(inout PathIntersection pathIntersection : SV_RayPayload) } bool skyEnabled = _EnvLightSkyEnabled && _RaytracingCameraSkyEnabled; - float4 missColor = skyEnabled ? _SkyCameraTexture[COORD_TEXTURE2D_X(pathIntersection.pixelCoord)] : _RaytracingCameraClearColor; - pathIntersection.value = missColor.rgb * GetInverseCurrentExposureMultiplier(); + float4 missColor = skyEnabled ? _SkyCameraTexture[COORD_TEXTURE2D_X(pathIntersection.pixelCoord)] : _RaytracingCameraClearColor * GetInverseCurrentExposureMultiplier(); + pathIntersection.value = missColor.rgb; pathIntersection.alpha = missColor.a; ApplyFogAttenuation(WorldRayOrigin(), WorldRayDirection(), pathIntersection.value, pathIntersection.alpha); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDDiffuseDenoiser.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDDiffuseDenoiser.cs index 1b6876aa1b5..e0f4889c6cd 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDDiffuseDenoiser.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDDiffuseDenoiser.cs @@ -34,7 +34,7 @@ public void Init(HDRenderPipelineRuntimeResources rpResources, HDRenderPipeline // Data required for the online initialization m_DenoiserInitialized = false; m_OwnenScrambledTexture = rpResources.textures.owenScrambledRGBATex; - m_PointDistribution = new ComputeBuffer(16 * 2 * 4, sizeof(float)); + m_PointDistribution = new ComputeBuffer(16 * 4, 2 * sizeof(float)); } public void Release() diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/Shadows/RaytracingShadow.compute b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/Shadows/RaytracingShadow.compute index ce7edddd241..f1f8bd43e18 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/Shadows/RaytracingShadow.compute +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/Shadows/RaytracingShadow.compute @@ -576,12 +576,11 @@ void RaytracingPointShadowSample(uint3 dispatchThreadId : SV_DispatchThreadID, u float rayLength = length(rayDirection); rayDirection = rayDirection / rayLength; - // If this ray is under the surface, no need to shoot it - float lightRange2 = lightData.range * lightData.range; - if (dot(normalData.normalWS, rayDirection) < 0.0 || dist2 > lightRange2) - { - samplePDF = -1.0; - } + // If the normal of this pixel cannot face the light, we invalidate it + samplePDF = dot(normalData.normalWS, rayDirection) > 0.0 ? samplePDF : -1.0; + + // If this pixel is beyond the range of the light, we invalidate it + samplePDF = dist2 < (lightData.range * lightData.range) ? samplePDF : -2.0; // Output the direction to the target uav _RaytracingDirectionBuffer[COORD_TEXTURE2D_X(currentCoord)] = float4(rayDirection, samplePDF); @@ -650,15 +649,14 @@ void RaytracingSpotShadowSample(uint3 dispatchThreadId : SV_DispatchThreadID, ui float rayLength = length(rayDirection); rayDirection = rayDirection / rayLength; - // If this ray is under the surface, no need to shoot it - float lightRange2 = lightData.range * lightData.range; - if (dot(normalData.normalWS, rayDirection) < 0.0 || dist2 > lightRange2) - { - samplePDF = -1.0; - } - // If the direction is going out of the cone, we invalidate this ray (to avoid casting useless rays) - samplePDF = dot(-rayDirection, lightData.forward) > cos(_RaytracingSpotAngle * 0.5f) ? samplePDF : -1.0; + samplePDF = dot(-rayDirection, lightData.forward) > cos(_RaytracingSpotAngle * 0.5f) ? samplePDF : -2.0; + + // If the normal of this pixel cannot face the light, we invalidate it + samplePDF = dot(normalData.normalWS, rayDirection) > 0.0 ? samplePDF : -1.0; + + // If this pixel is beyond the range of the light, we invalidate it + samplePDF = dist2 < (lightData.range * lightData.range) ? samplePDF : -2.0; // Output the direction to the target uav _RaytracingDirectionBuffer[COORD_TEXTURE2D_X(currentCoord)] = float4(rayDirection, samplePDF); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/Shadows/RaytracingShadow.raytrace b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/Shadows/RaytracingShadow.raytrace index 29b820ee86e..4085dc267eb 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/Shadows/RaytracingShadow.raytrace +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/Shadows/RaytracingShadow.raytrace @@ -537,20 +537,22 @@ void RayGenShadowSegmentSingle() // Read the ray distance float rayDistance = LOAD_TEXTURE2D_X(_RayTracingLengthBuffer, currentPixelCoord).x; - // If the distance is negative, it means the rays is a visible intersection. - if (rayDistance < 0.0) + // Fetch the ray direction + float4 rayDirection = LOAD_TEXTURE2D_X(_RaytracingDirectionBuffer, currentPixelCoord); + + // Read the previous integration value + float previousValue = _RaytracedShadowIntegration[COORD_TEXTURE2D_X(currentPixelCoord)]; + + // If we are inside the light (spot or point), we consider that we have no occlusion and end the execution. + if (rayDistance < 0.0 || rayDirection.w == -2.0) { // Read the previous value and add one - float previousValue = _RaytracedShadowIntegration[COORD_TEXTURE2D_X(currentPixelCoord)]; _RaytracedShadowIntegration[COORD_TEXTURE2D_X(currentPixelCoord)] = previousValue + 1.0 / (float)_RaytracingNumSamples; _VelocityBuffer[COORD_TEXTURE2D_X(currentPixelCoord)] = 1.0; return; } - // Fetch the ray direction - float4 rayDirection = LOAD_TEXTURE2D_X(_RaytracingDirectionBuffer, currentPixelCoord); - - // If the PDF is negative, means the ray means a hit (no need to shoot it) + // If this point doesn't see the light, we set it to black if (rayDirection.w < 0.0) return; // Make sure it is taken into account in the ray counters @@ -595,7 +597,6 @@ void RayGenShadowSegmentSingle() TraceRay(_RaytracingAccelerationStructure, RAY_FLAG_CULL_FRONT_FACING_TRIANGLES | RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH, RAYTRACINGRENDERERFLAG_CAST_SHADOW, 0, 1, 0, rayDescriptor, rayIntersection); // Add the contribution of this sample - float previousValue = _RaytracedShadowIntegration[COORD_TEXTURE2D_X(currentPixelCoord)]; float previousVelocityValue = _VelocityBuffer[COORD_TEXTURE2D_X(currentPixelCoord)].x; float previousDistanceValue = _RaytracingDistanceBufferRW[COORD_TEXTURE2D_X(currentPixelCoord)].x; @@ -626,20 +627,23 @@ void RayGenSemiTransparentShadowSegmentSingle() // Read the ray distance float rayDistance = LOAD_TEXTURE2D_X(_RayTracingLengthBuffer, currentPixelCoord).x; - // If the distance is negative, it means the rays is a visible intersection. - if (rayDistance < 0.0) + // Fetch the ray direction + float4 rayDirection = LOAD_TEXTURE2D_X(_RaytracingDirectionBuffer, currentPixelCoord); + + // Read the previous integration value + float previousValue = _RaytracedShadowIntegration[COORD_TEXTURE2D_X(currentPixelCoord)]; + + // If we are inside the light (spot or point), we consider that we have no occlusion and end the execution. + if (rayDistance < 0.0 || rayDirection.w == -2.0) { // Read the previous value and add one - float previousValue = _RaytracedShadowIntegration[COORD_TEXTURE2D_X(currentPixelCoord)]; _RaytracedShadowIntegration[COORD_TEXTURE2D_X(currentPixelCoord)] = previousValue + 1.0 / (float)_RaytracingNumSamples; + _VelocityBuffer[COORD_TEXTURE2D_X(currentPixelCoord)] = 1.0; return; } - // Fetch the ray direction - float4 rayDirection = LOAD_TEXTURE2D_X(_RaytracingDirectionBuffer, currentPixelCoord); - - // If the PDF is negative, means the ray means a hit (no need to shoot it) - if (rayDirection.w < 0.0) return; + // If this point doesn't see the light, we set it to black + if (rayDirection.w <= 0.0) return; // Make sure it is taken into account in the ray counters if (_RayCountEnabled > 0) @@ -698,7 +702,6 @@ void RayGenSemiTransparentShadowSegmentSingle() } // Add the contribution of this sample - float previousValue = _RaytracedShadowIntegration[COORD_TEXTURE2D_X(currentPixelCoord)]; float previousVelocityValue = _VelocityBuffer[COORD_TEXTURE2D_X(currentPixelCoord)].x; float previousDistanceValue = _RaytracingDistanceBufferRW[COORD_TEXTURE2D_X(currentPixelCoord)].x; _RaytracedShadowIntegration[COORD_TEXTURE2D_X(currentPixelCoord)] = previousValue + Luminance(rayIntersection.color) / (float)_RaytracingNumSamples; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs index e5fa2c6732d..b55426f5f8b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs @@ -182,7 +182,7 @@ public enum FrameSettingsField /// When enabled, HDRP processes a post-processing render pass for Cameras using these Frame Settings. [FrameSettingsField(0, displayedName: "Post-process", customOrderInGroup: 18, tooltip: "When enabled, HDRP processes a post-processing render pass for Cameras using these Frame Settings.")] Postprocess = 15, - /// When enabled, HDRP render user written post processes. + /// When enabled, HDRP renders user written post processes. [FrameSettingsField(0, displayedName: "Custom Post-process", positiveDependencies: new[] { Postprocess }, customOrderInGroup: 19, tooltip: "When enabled on a Camera, HDRP render user written post processes.")] CustomPostProcess = 39, /// When enabled, HDRP replace NaN values with black pixels for Cameras using these Frame Settings. diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Hair.shadergraph b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Hair.shadergraph index f2419fa42d6..d6cd63c3be0 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Hair.shadergraph +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Hair.shadergraph @@ -1,5 +1,5 @@ { - "m_SGVersion": 2, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "0d4f1785e3f944a281c554a6ec5aac7b", "m_Properties": [ @@ -74,6 +74,12 @@ } ], "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "739d977e4e924b299265e7cd460cc37e" + } + ], "m_Nodes": [ { "m_Id": "e1d3a60351964fcd9ec01e3a99ea3880" @@ -1272,10 +1278,12 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "HDRP", - "m_ConcretePrecision": 0, + "m_GraphPrecision": 0, + "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "" }, @@ -1293,7 +1301,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -1330,6 +1337,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1362,6 +1371,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1415,11 +1426,14 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -1429,7 +1443,6 @@ "m_Id": 0, "m_DisplayName": "Alpha Clip Threshold Depth Prepass", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1447,7 +1460,6 @@ "m_Id": 0, "m_DisplayName": "Transmission Rim", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1465,7 +1477,6 @@ "m_Id": 0, "m_DisplayName": "Alpha Clip Threshold", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AlphaClipThreshold", "m_StageCapability": 2, @@ -1481,7 +1492,6 @@ "m_Id": 0, "m_DisplayName": "Tangent", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Tangent", "m_StageCapability": 1, @@ -1506,7 +1516,6 @@ "m_Id": 0, "m_DisplayName": "Specular Tint", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SpecularTint", "m_StageCapability": 2, @@ -1521,7 +1530,13 @@ "z": 0.0 }, "m_Labels": [], - "m_ColorMode": 0 + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -1531,7 +1546,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1557,11 +1571,17 @@ "m_GuidSerialized": "439dfb93-a294-4e23-bf72-d387b4bed6fa" }, "m_Name": "AO Use Lightmap UV", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Boolean_9609B74F", "m_OverrideReferenceName": "_LightmapUV", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": false } @@ -1592,6 +1612,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1607,7 +1629,6 @@ "m_Id": 0, "m_DisplayName": "Rim Transmission Intensity", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RimTransmissionIntensity", "m_StageCapability": 2, @@ -1651,6 +1672,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1663,7 +1686,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1731,6 +1753,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1744,7 +1768,6 @@ "m_Id": 0, "m_DisplayName": "Transmittance", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Transmittance", "m_StageCapability": 2, @@ -1774,7 +1797,6 @@ "m_Id": -1319696916, "m_DisplayName": "UV Tile and Offset", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvST", "m_StageCapability": 3, @@ -1800,7 +1822,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1849,6 +1870,8 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1862,7 +1885,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1909,7 +1931,9 @@ "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HairData", "m_ObjectId": "0eb5e9427f59433bbe0bcd4f9b198087", "m_MaterialType": 0, - "m_UseLightFacingNormal": false + "m_ScatteringMode": 0, + "m_ColorParameterization": 0, + "m_GeometryType": 0 } { @@ -1919,7 +1943,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1987,6 +2010,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2002,7 +2027,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2051,7 +2075,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -2069,7 +2092,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2095,7 +2117,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2144,7 +2165,6 @@ "m_Id": 0, "m_DisplayName": "Alpha Clip Threshold Depth Prepass", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AlphaClipThresholdDepthPrepass", "m_StageCapability": 2, @@ -2160,7 +2180,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -2204,6 +2223,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2219,7 +2240,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2263,6 +2283,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2318,11 +2340,14 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 1, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2333,16 +2358,24 @@ "m_GuidSerialized": "d5937b9c-e726-47e2-9096-c64bd42839d2" }, "m_Name": "AO Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_E48D0DF2", "m_OverrideReferenceName": "_MaskMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"355608f109270dc4bb6156ba0601da8d\",\"type\":3}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -2354,7 +2387,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2379,10 +2411,10 @@ "m_Id": 0, "m_DisplayName": "Smoothness Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2392,7 +2424,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -2414,6 +2445,7 @@ "m_TransparentWritesMotionVec": true, "m_AlphaToMask": false, "m_DepthOffset": false, + "m_ConservativeDepthOffset": false, "m_TransparencyFog": true, "m_AlphaTestShadow": true, "m_BackThenFrontRendering": true, @@ -2448,6 +2480,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2463,7 +2497,6 @@ "m_Id": 1, "m_DisplayName": "X", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, @@ -2511,6 +2544,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2526,10 +2561,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2579,11 +2614,14 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2593,7 +2631,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2667,6 +2704,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2679,10 +2718,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2692,7 +2731,6 @@ "m_Id": 0, "m_DisplayName": "Secondary Specular Tint", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SecondarySpecularTint", "m_StageCapability": 2, @@ -2707,7 +2745,13 @@ "z": 0.0 }, "m_Labels": [], - "m_ColorMode": 0 + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -2736,6 +2780,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2749,7 +2795,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2767,7 +2812,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2811,6 +2855,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2845,6 +2891,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2858,7 +2906,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2901,18 +2948,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "340703d105f5445fa9071fa6fb1e196b", "m_Guid": { "m_GuidSerialized": "8cdbfb43-feb7-4816-9cea-ca9952679ecb" }, "m_Name": "Base UV Scale Transform", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector4_84AAB3AE", "m_OverrideReferenceName": "_uvBaseST", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -2948,6 +3001,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2961,7 +3016,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -2977,10 +3031,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -2995,7 +3049,6 @@ "m_Id": 1, "m_DisplayName": "Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Strength", "m_StageCapability": 3, @@ -3013,7 +3066,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3062,7 +3114,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -3111,7 +3162,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 1, @@ -3130,18 +3180,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "3955439a550a451c8279e8001cdcd973", "m_Guid": { "m_GuidSerialized": "08ee1c25-529f-4fca-8392-271b44871553" }, "m_Name": "Alpha Clip Threshold Shadows", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_CAFF147E", "m_OverrideReferenceName": "_AlphaThresholdShadow", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -3152,18 +3208,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "396c340765b8478d937f256ac87c8a86", "m_Guid": { "m_GuidSerialized": "45256b52-4919-4436-824f-6f9e813fe9b1" }, "m_Name": "Normal Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_2B87C9F0", "m_OverrideReferenceName": "_NormalScale", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -3180,7 +3242,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3254,6 +3315,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3285,6 +3348,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3300,7 +3365,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -3325,7 +3389,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -3390,6 +3453,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3421,6 +3486,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3436,7 +3503,6 @@ "m_Id": 0, "m_DisplayName": "Secondary Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SecondarySmoothness", "m_StageCapability": 2, @@ -3452,7 +3518,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -3512,7 +3577,6 @@ "m_Id": 1, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -3534,10 +3598,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -3547,10 +3611,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -3600,11 +3664,14 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -3614,7 +3681,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -3639,7 +3705,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3712,6 +3777,8 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3725,10 +3792,10 @@ "m_Id": 0, "m_DisplayName": "AO Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -3757,6 +3824,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3772,7 +3841,6 @@ "m_Id": 0, "m_DisplayName": "Secondary Specular Multiplier", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3790,7 +3858,6 @@ "m_Id": 0, "m_DisplayName": "Specular Shift", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3808,7 +3875,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -3851,6 +3917,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3882,6 +3950,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3895,7 +3965,6 @@ "m_Id": 0, "m_DisplayName": "Normal (Tangent Space)", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "NormalTS", "m_StageCapability": 2, @@ -3920,7 +3989,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3969,7 +4037,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -3987,7 +4054,6 @@ "m_Id": 3, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -4005,7 +4071,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -4056,6 +4121,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -4068,7 +4135,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -4086,7 +4152,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -4104,7 +4169,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -4153,7 +4217,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4179,7 +4242,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4228,7 +4290,6 @@ "m_Id": 4, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -4246,7 +4307,6 @@ "m_Id": 0, "m_DisplayName": "Normal Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4264,7 +4324,6 @@ "m_Id": 0, "m_DisplayName": "Alpha Clip Threshold Depth Postpass", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4307,6 +4366,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -4338,6 +4399,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4353,7 +4416,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -4406,6 +4468,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -4418,7 +4482,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -4467,7 +4530,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -4516,7 +4578,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -4565,7 +4626,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BaseColor", "m_StageCapability": 2, @@ -4580,7 +4640,13 @@ "z": 0.0 }, "m_Labels": [], - "m_ColorMode": 0 + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -4590,7 +4656,6 @@ "m_Id": 1, "m_DisplayName": "X", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, @@ -4608,7 +4673,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -4650,6 +4714,84 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "739d977e4e924b299265e7cd460cc37e", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "7454317b6c6b4ef6b2a51478f9c541ba" + }, + { + "m_Id": "b7a42964d4cb42bdb75f175c4f3c9da6" + }, + { + "m_Id": "8c60779426cc490b8d97b1f1a1388d77" + }, + { + "m_Id": "9154c3c6411645eea93945fb39e3c7f1" + }, + { + "m_Id": "ea829be01a7f4ee9b31b2f9e40e53794" + }, + { + "m_Id": "3955439a550a451c8279e8001cdcd973" + }, + { + "m_Id": "340703d105f5445fa9071fa6fb1e196b" + }, + { + "m_Id": "e03d6acc11764e8681759398850b02a8" + }, + { + "m_Id": "396c340765b8478d937f256ac87c8a86" + }, + { + "m_Id": "1aea263d78ab46599dfd9f92178355ca" + }, + { + "m_Id": "04b95d988fee4b808f9ddbae78d297f4" + }, + { + "m_Id": "bac3b779c50d41be9f5404776a52617a" + }, + { + "m_Id": "ec26979e230c4de3afafcadf636713aa" + }, + { + "m_Id": "f81665c35c714382a5f81c2c4cf86327" + }, + { + "m_Id": "776b4c30334746239491bcd71aba4b7c" + }, + { + "m_Id": "ef452e55dad7406ba530baf0097777c7" + }, + { + "m_Id": "c90cbe93e6984e079c06c2d2c9a2e7b1" + }, + { + "m_Id": "d919e06b1ea443c5bd0d5f590e595d13" + }, + { + "m_Id": "7e709f6676c74ef4ae9638b35ab46067" + }, + { + "m_Id": "f5ed299748154016bec78637f5283ea8" + }, + { + "m_Id": "977e9f31cbef42b1bfbe006d5e0193a9" + }, + { + "m_Id": "ede9e2ec23234abfb209e7704db35f46" + }, + { + "m_Id": "962a14c48d3a48f39f834438f61e4ccb" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -4658,16 +4800,24 @@ "m_GuidSerialized": "6343a65d-92e9-4ea6-a610-b17eff7c3712" }, "m_Name": "Base Color Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_1DA0BB85", "m_OverrideReferenceName": "_BaseColorMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"0697ae22221206446aa716c9d674c3ba\",\"type\":3}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -4679,10 +4829,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4692,7 +4842,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4735,18 +4884,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "776b4c30334746239491bcd71aba4b7c", "m_Guid": { "m_GuidSerialized": "4005f9a0-1e7b-4422-9591-2d7900dc14a5" }, "m_Name": "Smoothness Max", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_A659E432", "m_OverrideReferenceName": "_SmoothnessMax", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.699999988079071, "m_FloatType": 1, @@ -4763,7 +4918,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4808,6 +4962,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4823,7 +4979,6 @@ "m_Id": 0, "m_DisplayName": "Specular Multiplier", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4841,10 +4996,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -4878,6 +5033,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4912,6 +5069,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4919,18 +5078,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "7e709f6676c74ef4ae9638b35ab46067", "m_Guid": { "m_GuidSerialized": "7bad42e8-0c76-4876-8271-807c4aeaf174" }, "m_Name": "Secondary Specular Multiplier", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_CB3E2EAA", "m_OverrideReferenceName": "_SecondarySpecular", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -4966,6 +5131,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4979,7 +5146,6 @@ "m_Id": 0, "m_DisplayName": "Secondary Specular Shift", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4997,7 +5163,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5046,7 +5211,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5071,7 +5235,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -5108,6 +5271,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5123,10 +5288,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -5145,6 +5310,7 @@ "m_TransparentWritesMotionVec": false, "m_AlphaToMask": false, "m_DepthOffset": false, + "m_ConservativeDepthOffset": false, "m_TransparencyFog": true, "m_AlphaTestShadow": false, "m_BackThenFrontRendering": false, @@ -5160,7 +5326,6 @@ "m_Id": 2, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, @@ -5197,6 +5362,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5210,7 +5377,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -5257,6 +5423,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5272,7 +5440,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5317,6 +5484,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5324,18 +5493,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8c60779426cc490b8d97b1f1a1388d77", "m_Guid": { "m_GuidSerialized": "1c11679b-cbb6-4fa9-8f37-996c04d07707" }, "m_Name": "Alpha Clip Threshold", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_15C6E93B", "m_OverrideReferenceName": "_AlphaClipThreshold", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 1, @@ -5352,7 +5527,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -5382,8 +5556,16 @@ "m_SupportLodCrossFade": false, "m_DoubleSidedMode": 1, "m_DOTSInstancing": false, - "m_Version": 0, - "m_FirstTimeMigrationExecuted": true, + "m_CustomVelocity": false, + "m_Tessellation": false, + "m_TessellationMode": 0, + "m_TessellationFactorMinDistance": 20.0, + "m_TessellationFactorMaxDistance": 50.0, + "m_TessellationFactorTriangleSize": 100.0, + "m_TessellationShapeFactor": 0.75, + "m_TessellationBackFaceCullEpsilon": -0.25, + "m_TessellationMaxDisplacement": 0.009999999776482582, + "m_Version": 1, "inspectorFoldoutMask": 1 } @@ -5394,7 +5576,6 @@ "m_Id": 0, "m_DisplayName": "Secondary Specular Shift", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SecondarySpecularShift", "m_StageCapability": 2, @@ -5410,7 +5591,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5438,7 +5618,6 @@ "m_Id": 0, "m_DisplayName": "AO Use Lightmap UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5472,6 +5651,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5479,18 +5660,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "9154c3c6411645eea93945fb39e3c7f1", "m_Guid": { "m_GuidSerialized": "d91fd1a5-e079-4844-b874-c9c0ca592f79" }, "m_Name": "Alpha Clip Threshold Depth Prepass", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_AD26FB16", "m_OverrideReferenceName": "_AlphaClipThresholdDepthPrepass", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.8999999761581421, "m_FloatType": 1, @@ -5532,6 +5719,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -5563,6 +5752,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5576,7 +5767,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -5648,7 +5838,8 @@ "m_Id": "d27a4b142de94d0bb54774719e878fbe" } ], - "m_CustomEditorGUI": "" + "m_CustomEditorGUI": "", + "m_SupportVFX": false } { @@ -5659,28 +5850,40 @@ "m_GuidSerialized": "f92728bc-dfc4-4fa9-aafe-4ae8d350dd77" }, "m_Name": "Alpha Clipping", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Boolean_F3E030FB", "m_OverrideReferenceName": "_Alpha", "m_GeneratePropertyBlock": false, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": true } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "977e9f31cbef42b1bfbe006d5e0193a9", "m_Guid": { "m_GuidSerialized": "b732a011-0ef7-4d90-a9ef-b5c7601d2c35" }, "m_Name": "Transmission Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Color_634902EC", "m_OverrideReferenceName": "_TransmissionColor", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 1.0, @@ -5688,6 +5891,7 @@ "b": 0.6274510025978088, "a": 1.0 }, + "isMainColor": false, "m_ColorMode": 1 } @@ -5698,7 +5902,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -5724,7 +5927,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -5750,7 +5952,6 @@ "m_Id": -1533382448, "m_DisplayName": "UV Channel Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvMask", "m_StageCapability": 3, @@ -5776,7 +5977,6 @@ "m_Id": 0, "m_DisplayName": "Hair Strand Direction", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "HairStrandDirection", "m_StageCapability": 2, @@ -5800,7 +6000,6 @@ "m_Id": 0, "m_DisplayName": "Transmission Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5826,7 +6025,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -5894,6 +6092,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5926,6 +6126,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5939,10 +6141,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -5957,7 +6159,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness UV Scale Transform", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5983,7 +6184,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -6001,7 +6201,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -6052,6 +6251,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -6064,7 +6265,6 @@ "m_Id": 1, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, @@ -6082,7 +6282,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -6100,7 +6299,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -6125,7 +6323,6 @@ "m_Id": 0, "m_DisplayName": "Specular Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -6151,7 +6348,6 @@ "m_Id": 0, "m_DisplayName": "Specular Shift", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SpecularShift", "m_StageCapability": 2, @@ -6186,6 +6382,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6220,6 +6418,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6252,6 +6452,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6267,7 +6469,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness Min", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -6313,6 +6514,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -6336,7 +6539,6 @@ "m_Id": -1319696916, "m_DisplayName": "UV Tile and Offset", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvST", "m_StageCapability": 3, @@ -6362,7 +6564,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -6411,10 +6612,10 @@ "m_Id": 0, "m_DisplayName": "Normal Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -6438,7 +6639,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -6483,6 +6683,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6492,18 +6694,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "b7a42964d4cb42bdb75f175c4f3c9da6", "m_Guid": { "m_GuidSerialized": "cdb23723-972f-4d49-9f82-4ac5e80e2d1d" }, "m_Name": "Base Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Color_22DC9E2D", "m_OverrideReferenceName": "_BaseColor", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 0.5, @@ -6511,6 +6719,7 @@ "b": 0.5, "a": 1.0 }, + "isMainColor": false, "m_ColorMode": 0 } @@ -6521,7 +6730,6 @@ "m_Id": 1, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -6543,7 +6751,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -6561,7 +6768,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -6617,6 +6823,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -6629,7 +6837,6 @@ "m_Id": 0, "m_DisplayName": "Base UV Scale Transform", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -6656,16 +6863,24 @@ "m_GuidSerialized": "156dbcf4-f428-4daf-ad4c-002c5e38047c" }, "m_Name": "Smoothness Mask", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_C1E96520", "m_OverrideReferenceName": "_SmoothnessMask", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"355608f109270dc4bb6156ba0601da8d\",\"type\":3}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -6696,6 +6911,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6730,6 +6947,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6745,7 +6964,6 @@ "m_Id": -1533382448, "m_DisplayName": "UV Channel Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvMask", "m_StageCapability": 3, @@ -6796,6 +7014,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -6808,7 +7028,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness Max", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -6826,7 +7045,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -6900,6 +7118,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -6912,7 +7132,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -6930,7 +7149,6 @@ "m_Id": 0, "m_DisplayName": "Alpha Clip Threshold Depth Postpass", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AlphaClipThresholdDepthPostpass", "m_StageCapability": 2, @@ -6957,7 +7175,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -7001,6 +7218,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -7054,11 +7273,14 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -7068,7 +7290,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -7105,6 +7326,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -7112,18 +7335,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "c90cbe93e6984e079c06c2d2c9a2e7b1", "m_Guid": { "m_GuidSerialized": "30baad2a-79b4-4e7a-a0a0-359486015c37" }, "m_Name": "Specular Multiplier", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_DB18215D", "m_OverrideReferenceName": "_Specular", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -7140,7 +7369,6 @@ "m_Id": 0, "m_DisplayName": "Alpha Clip Threshold Shadow", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AlphaClipThresholdShadow", "m_StageCapability": 2, @@ -7156,7 +7384,6 @@ "m_Id": 0, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Occlusion", "m_StageCapability": 2, @@ -7183,7 +7410,7 @@ "m_Group": { "m_Id": "" }, - "m_Name": "UV Combine", + "m_Name": "UVCombine", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -7196,18 +7423,20 @@ }, "m_Slots": [ { - "m_Id": "0c9c79c276b9495d859ed7e4cf48edf2" + "m_Id": "9b7ec406bb3241a3a9d568a1a46fe68a" }, { - "m_Id": "422accb22cba4ae89a98c6b310f298af" + "m_Id": "0c9c79c276b9495d859ed7e4cf48edf2" }, { - "m_Id": "9b7ec406bb3241a3a9d568a1a46fe68a" + "m_Id": "422accb22cba4ae89a98c6b310f298af" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -7219,7 +7448,9 @@ "m_PropertyIds": [ -1533382448, -1319696916 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -7229,7 +7460,7 @@ "m_Group": { "m_Id": "" }, - "m_Name": "UV Combine", + "m_Name": "UVCombine", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -7242,18 +7473,20 @@ }, "m_Slots": [ { - "m_Id": "b22483ba7b304b72b425dc0edee85479" + "m_Id": "bd8b55925f3a48429d83c1be9630403c" }, { - "m_Id": "b8178181816e46258bb82c33b9dd283f" + "m_Id": "b22483ba7b304b72b425dc0edee85479" }, { - "m_Id": "bd8b55925f3a48429d83c1be9630403c" + "m_Id": "b8178181816e46258bb82c33b9dd283f" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -7265,7 +7498,9 @@ "m_PropertyIds": [ -1533382448, -1319696916 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -7294,6 +7529,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -7326,6 +7563,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -7339,7 +7578,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -7407,6 +7645,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -7420,7 +7660,6 @@ "m_Id": 0, "m_DisplayName": "Bent Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BentNormal", "m_StageCapability": 2, @@ -7445,7 +7684,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -7463,7 +7701,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -7481,7 +7718,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -7506,7 +7742,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -7532,7 +7767,6 @@ "m_Id": 1, "m_DisplayName": "X", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, @@ -7562,8 +7796,16 @@ "m_SupportLodCrossFade": false, "m_DoubleSidedMode": 0, "m_DOTSInstancing": false, + "m_CustomVelocity": false, + "m_Tessellation": false, + "m_TessellationMode": 0, + "m_TessellationFactorMinDistance": 20.0, + "m_TessellationFactorMaxDistance": 50.0, + "m_TessellationFactorTriangleSize": 100.0, + "m_TessellationShapeFactor": 0.75, + "m_TessellationBackFaceCullEpsilon": -0.25, + "m_TessellationMaxDisplacement": 0.009999999776482582, "m_Version": 0, - "m_FirstTimeMigrationExecuted": false, "inspectorFoldoutMask": 0 } @@ -7599,6 +7841,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -7611,7 +7855,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -7679,6 +7922,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -7713,6 +7958,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -7720,18 +7967,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "d919e06b1ea443c5bd0d5f590e595d13", "m_Guid": { "m_GuidSerialized": "f6b1080a-6719-4e29-8e2d-7479348c4ef3" }, "m_Name": "Specular Shift", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_2ED6936D", "m_OverrideReferenceName": "_SpecularShift", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -7748,7 +8001,6 @@ "m_Id": 0, "m_DisplayName": "Specular Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -7775,16 +8027,24 @@ "m_GuidSerialized": "f713fd50-191c-4103-85a2-925a51d5dd5b" }, "m_Name": "Normal Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_272FF350", "m_OverrideReferenceName": "_NormalMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 3 } @@ -7796,10 +8056,10 @@ "m_Id": 0, "m_DisplayName": "Base Color Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -7834,6 +8094,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -7846,7 +8108,6 @@ "m_Id": 0, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 1, @@ -7871,7 +8132,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -7903,7 +8163,6 @@ "m_Id": 0, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -7919,7 +8178,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -7968,7 +8226,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -7986,7 +8243,6 @@ "m_Id": 0, "m_DisplayName": "Alpha Clip Threshold", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -7998,18 +8254,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "ea829be01a7f4ee9b31b2f9e40e53794", "m_Guid": { "m_GuidSerialized": "2fbe22fb-2883-4e21-974b-0e58cf6fa5a8" }, "m_Name": "Alpha Clip Threshold Depth Postpass", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_4B895F81", "m_OverrideReferenceName": "_AlphaClipThresholdDepthPostpass", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.6000000238418579, "m_FloatType": 1, @@ -8045,6 +8307,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -8054,18 +8318,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "ec26979e230c4de3afafcadf636713aa", "m_Guid": { "m_GuidSerialized": "2ae5ee18-50bd-44b6-a382-b6103c28a191" }, "m_Name": "Smoothness UV Scale Transform", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector4_B1E8AD59", "m_OverrideReferenceName": "_uvSmoothnessST", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 20.0, @@ -8082,7 +8352,6 @@ "m_Id": 0, "m_DisplayName": "Alpha Clip Threshold Shadows", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -8124,6 +8393,8 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -8137,7 +8408,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -8149,18 +8419,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "ede9e2ec23234abfb209e7704db35f46", "m_Guid": { "m_GuidSerialized": "05d86d4b-2f71-4057-a9d1-94a47098b6bb" }, "m_Name": "Transmission Rim", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_61510805", "m_OverrideReferenceName": "_TransmissionRim", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.20000000298023225, "m_FloatType": 1, @@ -8177,7 +8453,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -8202,7 +8477,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -8245,18 +8519,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "ef452e55dad7406ba530baf0097777c7", "m_Guid": { "m_GuidSerialized": "b4a05d66-058e-4286-b129-93c8a70a29f0" }, "m_Name": "Specular Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Color_4A6C7251", "m_OverrideReferenceName": "_SpecularColor", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 0.6039215922355652, @@ -8264,6 +8544,7 @@ "b": 0.0, "a": 1.0 }, + "isMainColor": false, "m_ColorMode": 0 } @@ -8293,6 +8574,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -8327,6 +8610,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -8340,7 +8625,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -8389,7 +8673,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -8401,18 +8684,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f5ed299748154016bec78637f5283ea8", "m_Guid": { "m_GuidSerialized": "ee3a9099-a106-4e67-9881-37e1e2767167" }, "m_Name": "Secondary Specular Shift", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_80025A86", "m_OverrideReferenceName": "_SecondarySpecularShift", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.8999999761581421, "m_FloatType": 1, @@ -8429,10 +8718,10 @@ "m_Id": 0, "m_DisplayName": "AO Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -8442,7 +8731,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -8461,18 +8749,24 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f81665c35c714382a5f81c2c4cf86327", "m_Guid": { "m_GuidSerialized": "e4dc662e-3747-4770-96eb-43812b6540e3" }, "m_Name": "Smoothness Min", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_4F7BB2EA", "m_OverrideReferenceName": "_SmoothnessMin", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.30000001192092898, "m_FloatType": 1, @@ -8489,7 +8783,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -8507,7 +8800,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -8533,7 +8825,6 @@ "m_Id": 0, "m_DisplayName": "Emission", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Emission", "m_StageCapability": 2, @@ -8548,7 +8839,13 @@ "z": 0.0 }, "m_Labels": [], - "m_ColorMode": 1 + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } } { @@ -8558,10 +8855,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -8595,6 +8892,8 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -8610,7 +8909,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -8625,7 +8923,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.cs index 52c0c81b2df..616e13df028 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.cs @@ -113,7 +113,7 @@ public partial class PhysicallyBasedSky : SkySettings /// Number of scattering events. [Tooltip("Sets the number of scattering events. This increases the quality of the sky visuals but also increases the pre-computation time.")] - public ClampedIntParameter numberOfBounces = new ClampedIntParameter(8, 1, 10); + public ClampedIntParameter numberOfBounces = new ClampedIntParameter(3, 1, 10); /// Ground tint. [Tooltip("Specifies a color that HDRP uses to tint the Ground Color Texture.")]