diff --git a/Assets/Demo/Demo00/Demo00.unity b/Assets/Demo/Demo00/Demo00.unity index 97edac29..97a5e18f 100644 --- a/Assets/Demo/Demo00/Demo00.unity +++ b/Assets/Demo/Demo00/Demo00.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0.99999905, b: 0.99999905, a: 1} + m_IndirectSpecularColor: {r: 0.9730332, g: 0.9417315, b: 0.6662969, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -150,6 +150,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1248727153} - {fileID: 1242875463} @@ -249,6 +250,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 8 @@ -265,6 +267,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -295,6 +298,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -318,6 +322,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &42319438 ParticleSystem: @@ -326,19 +334,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 42319435} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -888,6 +896,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -5069,6 +5078,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 331956200} m_Father: {fileID: 626305889} @@ -5108,6 +5118,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 84577749} m_RootOrder: 0 @@ -5233,6 +5244,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -9} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 0 @@ -5249,6 +5261,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5279,6 +5292,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -5302,6 +5316,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &366776676 ParticleSystem: @@ -5310,19 +5328,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 366776673} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -5872,6 +5890,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -10035,6 +10054,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1714139759} m_Father: {fileID: 626305889} @@ -10073,6 +10093,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -2} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 7 @@ -10089,6 +10110,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10119,6 +10141,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -10137,11 +10160,15 @@ ParticleSystemRenderer: m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_VertexStreams: 00010304052226 + m_VertexStreams: 0001030405 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &495422427 ParticleSystem: @@ -10150,19 +10177,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 495422424} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -10712,6 +10739,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -14895,6 +14923,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 4 @@ -14911,6 +14940,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14941,6 +14971,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -14964,6 +14995,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &503684456 ParticleSystem: @@ -14972,19 +15007,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 503684453} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -15534,6 +15569,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -19719,6 +19755,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -19751,6 +19788,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -19783,6 +19821,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 11 @@ -19799,6 +19838,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19829,6 +19869,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -19847,11 +19888,15 @@ ParticleSystemRenderer: m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_VertexStreams: 00010304052226 + m_VertexStreams: 0001030405 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &602547372 ParticleSystem: @@ -19860,19 +19905,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 602547369} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -20422,6 +20467,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -24603,6 +24649,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 84577749} - {fileID: 446988454} @@ -24660,6 +24707,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -24708,6 +24756,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.8} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1367124670} m_RootOrder: 0 @@ -24738,6 +24787,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1004028872} m_Father: {fileID: 626305889} @@ -24777,6 +24827,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1646864575} m_RootOrder: 0 @@ -24902,6 +24953,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -7} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 2 @@ -24918,6 +24970,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -24948,6 +25001,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -24971,6 +25025,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &849266461 ParticleSystem: @@ -24979,19 +25037,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 849266458} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -25541,6 +25599,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -29722,6 +29781,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29770,6 +29830,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.5, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -29864,6 +29925,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 626305889} - {fileID: 17555144} @@ -29904,6 +29966,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 743838942} m_RootOrder: 0 @@ -30029,6 +30092,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1248727153} m_RootOrder: 0 @@ -30104,6 +30168,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 17555144} m_RootOrder: 1 @@ -30183,6 +30248,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1136235192} m_Father: {fileID: 17555144} @@ -30259,6 +30325,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 9 @@ -30275,6 +30342,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -30305,6 +30373,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -30328,6 +30397,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1285446347 ParticleSystem: @@ -30336,19 +30409,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1285446344} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -30898,6 +30971,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -35134,6 +35208,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 2.65, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 631318906} m_Father: {fileID: 0} @@ -35219,6 +35294,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -35249,6 +35325,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 5 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -35272,6 +35349,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1490628208 ParticleSystem: @@ -35280,19 +35361,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490628206} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -35842,6 +35923,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -39989,6 +40071,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 6} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 366776674} - {fileID: 1715150590} @@ -40033,6 +40116,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 10 @@ -40049,6 +40133,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -40079,6 +40164,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -40102,6 +40188,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1592160092 ParticleSystem: @@ -40110,19 +40200,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1592160089} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -40672,6 +40762,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -44907,6 +44998,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 770594682} m_Father: {fileID: 626305889} @@ -44946,7 +45038,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -44961,6 +45053,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -44994,6 +45087,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 446988454} m_RootOrder: 0 @@ -45119,6 +45213,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 1 @@ -45135,6 +45230,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -45165,6 +45261,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -45188,6 +45285,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1715150592 ParticleSystem: @@ -45196,19 +45297,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1715150589} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -45758,6 +45859,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -49905,6 +50007,7 @@ GameObject: m_Component: - component: {fileID: 1978209574} - component: {fileID: 1978209573} + - component: {fileID: 1978209575} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -49984,10 +50087,31 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, 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: 50, y: -30, z: 0} +--- !u!114 &1978209575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978209572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} --- !u!1 &1978467645 GameObject: m_ObjectHideFlags: 0 @@ -50016,6 +50140,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -4} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 5 @@ -50032,6 +50157,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -50062,6 +50188,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -50085,6 +50212,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1978467648 ParticleSystem: @@ -50093,19 +50224,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1978467645} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -50655,6 +50786,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -54838,6 +54970,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 6 @@ -54854,6 +54987,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -54884,6 +55018,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -54907,6 +55042,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &2032297348 ParticleSystem: @@ -54915,19 +55054,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2032297345} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -55477,6 +55616,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -59660,6 +59800,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -6} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1490628209} m_RootOrder: 3 @@ -59676,6 +59817,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -59706,6 +59848,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -59729,6 +59872,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &2077796967 ParticleSystem: @@ -59737,19 +59884,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2077796964} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 1 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -60299,6 +60446,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: diff --git a/Assets/Demo/Demo00/Materials/mat_demo_dissolve_edgeemission.mat b/Assets/Demo/Demo00/Materials/mat_demo_dissolve_edgeemission.mat index f486cd73..3a833d71 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_dissolve_edgeemission.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_dissolve_edgeemission.mat @@ -2,16 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_dissolve_edgeemission m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _DISSOLVE_TRANSITION_ENABLED - _EMISSION_AREA_ALPHA _EMISSION_COLOR_MAP _EMISSION_MAP_MODE_2D _TINT_AREA_ALL - _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _DISSOLVE_TRANSITION_ENABLED + - _EMISSION_AREA_ALPHA + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _PARALLAX_MAP_MODE_2D + - _TINT_AREA_ALL + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -102,6 +110,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -114,6 +130,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -126,8 +146,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaTransitionMapChannelsX: 0 - _AlphaTransitionMapMode: 0 - _AlphaTransitionMapOffsetXCoord: 0 - _AlphaTransitionMapOffsetYCoord: 0 @@ -168,15 +190,21 @@ Material: - _EmissionColorType: 2 - _EmissionIntensity: 2.91 - _EmissionIntensityCoord: 0 + - _EmissionMapChannelsX: 0 - _EmissionMapMode: 0 + - _EmissionMapOffsetXCoord: 0 + - _EmissionMapOffsetYCoord: 0 - _EmissionMapProgress: 0 - _EmissionMapProgressCoord: 0 - _EmissionMapSliceCount: 4 - _EnvironmentReflections: 1 - _FlowIntensity: 0 - _FlowIntensityCoord: 0 + - _FlowMapChannelsX: 0 + - _FlowMapChannelsY: 1 - _FlowMapOffsetXCoord: 0 - _FlowMapOffsetYCoord: 0 + - _FlowMapTarget: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -192,6 +220,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -221,8 +258,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 0.5849056, g: 0.5849056, b: 0.5849056, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_distortion.mat b/Assets/Demo/Demo00/Materials/mat_demo_distortion.mat index 0aa3a7b4..cd0e1939 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_distortion.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_distortion.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_distortion m_Shader: {fileID: 4800000, guid: f16a2dd74da8941d6a883c14b1f26710, type: 3} - m_ShaderKeywords: _FLOW_MAP_ENABLED + m_ValidKeywords: + - _FLOW_MAP_TARGET_BASE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -83,13 +85,17 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaTransitionMapChannelsX: 0 - _AlphaTransitionMapOffsetXCoord: 0 - _AlphaTransitionMapOffsetYCoord: 0 - _AlphaTransitionMode: 0 - _AlphaTransitionProgress: 0 - _AlphaTransitionProgressCoord: 0 + - _BaseMapChannelsX: 0 + - _BaseMapChannelsY: 1 - _BaseMapMirrorSampling: 0 - _BaseMapOffsetXCoord: 0 - _BaseMapOffsetYCoord: 0 @@ -115,8 +121,11 @@ Material: - _EnvironmentReflections: 1 - _FlowIntensity: 5.64 - _FlowIntensityCoord: 0 + - _FlowMapChannelsX: 0 + - _FlowMapChannelsY: 1 - _FlowMapOffsetXCoord: 0 - _FlowMapOffsetYCoord: 0 + - _FlowMapTarget: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -133,6 +142,7 @@ Material: - _SrcBlend: 1 - _Surface: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_fade_edgeemission.mat b/Assets/Demo/Demo00/Materials/mat_demo_fade_edgeemission.mat index 43fa0864..ecd0a641 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_fade_edgeemission.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_fade_edgeemission.mat @@ -2,16 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_fade_edgeemission m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_AREA_ALPHA - _EMISSION_COLOR_MAP _EMISSION_MAP_MODE_2D _FADE_TRANSITION_ENABLED _TINT_AREA_ALL - _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_AREA_ALPHA + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _FADE_TRANSITION_ENABLED + - _PARALLAX_MAP_MODE_2D + - _TINT_AREA_ALL + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -102,6 +110,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -114,6 +130,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -126,8 +146,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaTransitionMapChannelsX: 0 - _AlphaTransitionMapMode: 0 - _AlphaTransitionMapOffsetXCoord: 0 - _AlphaTransitionMapOffsetYCoord: 0 @@ -168,15 +190,21 @@ Material: - _EmissionColorType: 2 - _EmissionIntensity: 2.91 - _EmissionIntensityCoord: 0 + - _EmissionMapChannelsX: 0 - _EmissionMapMode: 0 + - _EmissionMapOffsetXCoord: 0 + - _EmissionMapOffsetYCoord: 0 - _EmissionMapProgress: 0 - _EmissionMapProgressCoord: 0 - _EmissionMapSliceCount: 4 - _EnvironmentReflections: 1 - _FlowIntensity: 0 - _FlowIntensityCoord: 0 + - _FlowMapChannelsX: 0 + - _FlowMapChannelsY: 1 - _FlowMapOffsetXCoord: 0 - _FlowMapOffsetYCoord: 0 + - _FlowMapTarget: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -192,6 +220,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -221,8 +258,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 0.5849056, g: 0.5849056, b: 0.5849056, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_flowmap.mat b/Assets/Demo/Demo00/Materials/mat_demo_flowmap.mat index f408a0ec..4fdd1d7a 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_flowmap.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_flowmap.mat @@ -15,15 +15,22 @@ MonoBehaviour: version: 4 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_flowmap m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _FLOW_MAP_ENABLED _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _FLOW_MAP_TARGET_BASE + - _PARALLAX_MAP_MODE_2D + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -114,6 +121,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -126,6 +141,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -138,8 +157,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaTransitionMapChannelsX: 0 - _AlphaTransitionMapMode: 0 - _AlphaTransitionMapOffsetXCoord: 0 - _AlphaTransitionMapOffsetYCoord: 0 @@ -179,15 +200,21 @@ Material: - _EmissionColorType: 0 - _EmissionIntensity: 1 - _EmissionIntensityCoord: 0 + - _EmissionMapChannelsX: 0 - _EmissionMapMode: 0 + - _EmissionMapOffsetXCoord: 0 + - _EmissionMapOffsetYCoord: 0 - _EmissionMapProgress: 0 - _EmissionMapProgressCoord: 0 - _EmissionMapSliceCount: 4 - _EnvironmentReflections: 1 - _FlowIntensity: 1 - _FlowIntensityCoord: 0 + - _FlowMapChannelsX: 0 + - _FlowMapChannelsY: 1 - _FlowMapOffsetXCoord: 1 - _FlowMapOffsetYCoord: 1 + - _FlowMapTarget: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -203,6 +230,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -231,8 +267,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_flowmap_lit.mat b/Assets/Demo/Demo00/Materials/mat_demo_flowmap_lit.mat index c330c4c8..830fe9f1 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_flowmap_lit.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_flowmap_lit.mat @@ -15,15 +15,25 @@ MonoBehaviour: version: 4 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_flowmap_lit m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _FLOW_MAP_TARGET_BASE _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _FLOW_MAP_TARGET_BASE + - _PARALLAX_MAP_MODE_2D + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_SETUP + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -106,6 +116,30 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MetallicMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -114,10 +148,42 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SmoothnessMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SmoothnessMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SmoothnessMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecularMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecularMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecularMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TintMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -126,6 +192,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -138,6 +208,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -210,8 +281,19 @@ Material: - _LuminanceTransparencySharpness: 0.5 - _LuminanceTransparencySharpnessCoord: 0 - _Metallic: 0 + - _MetallicMapChannelsX: 0 + - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -221,10 +303,12 @@ Material: - _RimTransparencySharpness: 0.5 - _RimTransparencySharpnessCoord: 0 - _Smoothness: 0.5 + - _SmoothnessMapChannelsX: 3 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 - _SoftParticlesIntensity: 1 - _SpecularHighlights: 1 + - _SpecularMapChannelsX: 0 - _SrcBlend: 1 - _Surface: 0 - _TintAreaMode: 0 @@ -240,13 +324,22 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _TintColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Demo/Demo00/Materials/mat_demo_greadientmap.mat b/Assets/Demo/Demo00/Materials/mat_demo_greadientmap.mat index 63901621..70e083ad 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_greadientmap.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_greadientmap.mat @@ -2,15 +2,22 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_greadientmap m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_BASECOLOR - _EMISSION_MAP_MODE_2D _GRADIENT_MAP_ENABLED _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _GRADIENT_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -101,6 +108,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -113,6 +128,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -125,8 +144,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaTransitionMapChannelsX: 0 - _AlphaTransitionMapMode: 0 - _AlphaTransitionMapOffsetXCoord: 0 - _AlphaTransitionMapOffsetYCoord: 0 @@ -167,15 +188,21 @@ Material: - _EmissionColorType: 1 - _EmissionIntensity: 1.2 - _EmissionIntensityCoord: 1 + - _EmissionMapChannelsX: 0 - _EmissionMapMode: 0 + - _EmissionMapOffsetXCoord: 0 + - _EmissionMapOffsetYCoord: 0 - _EmissionMapProgress: 0 - _EmissionMapProgressCoord: 0 - _EmissionMapSliceCount: 4 - _EnvironmentReflections: 1 - _FlowIntensity: 0 - _FlowIntensityCoord: 0 + - _FlowMapChannelsX: 0 + - _FlowMapChannelsY: 1 - _FlowMapOffsetXCoord: 0 - _FlowMapOffsetYCoord: 0 + - _FlowMapTarget: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -191,6 +218,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -220,8 +256,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 1 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_greyscale.mat b/Assets/Demo/Demo00/Materials/mat_demo_greyscale.mat index 90dafc52..03221abf 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_greyscale.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_greyscale.mat @@ -2,15 +2,23 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_greyscale m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _GREYSCALE_ENABLED _TINT_COLOR_ENABLED _TRANSPARENCY_BY_LUMINANCE + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _GREYSCALE_ENABLED + - _PARALLAX_MAP_MODE_2D + - _TINT_COLOR_ENABLED + - _TRANSPARENCY_BY_LUMINANCE + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -101,6 +109,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -113,6 +129,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -125,8 +145,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaTransitionMapChannelsX: 0 - _AlphaTransitionMapMode: 0 - _AlphaTransitionMapOffsetXCoord: 0 - _AlphaTransitionMapOffsetYCoord: 0 @@ -167,15 +189,21 @@ Material: - _EmissionColorType: 0 - _EmissionIntensity: 1.2 - _EmissionIntensityCoord: 0 + - _EmissionMapChannelsX: 0 - _EmissionMapMode: 0 + - _EmissionMapOffsetXCoord: 0 + - _EmissionMapOffsetYCoord: 0 - _EmissionMapProgress: 0 - _EmissionMapProgressCoord: 0 - _EmissionMapSliceCount: 4 - _EnvironmentReflections: 1 - _FlowIntensity: 0 - _FlowIntensityCoord: 0 + - _FlowMapChannelsX: 0 + - _FlowMapChannelsY: 1 - _FlowMapOffsetXCoord: 0 - _FlowMapOffsetYCoord: 0 + - _FlowMapTarget: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -191,6 +219,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -220,8 +257,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_mirror_rotation_doublesided.mat b/Assets/Demo/Demo00/Materials/mat_demo_mirror_rotation_doublesided.mat index 6d8e8fa0..5336b0e3 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_mirror_rotation_doublesided.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_mirror_rotation_doublesided.mat @@ -2,16 +2,23 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_mirror_rotation_doublesided m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _BASE_MAP_ROTATION_ENABLED - _BASE_SAMPLER_STATE_LINEAR_MIRROR _EMISSION_COLOR_BASECOLOR _EMISSION_MAP_MODE_2D - _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _BASE_MAP_ROTATION_ENABLED + - _BASE_SAMPLER_STATE_LINEAR_MIRROR + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _PARALLAX_MAP_MODE_2D + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -102,6 +109,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -114,6 +129,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -126,8 +145,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaTransitionMapChannelsX: 0 - _AlphaTransitionMapMode: 0 - _AlphaTransitionMapOffsetXCoord: 0 - _AlphaTransitionMapOffsetYCoord: 0 @@ -168,15 +189,21 @@ Material: - _EmissionColorType: 1 - _EmissionIntensity: 0 - _EmissionIntensityCoord: 0 + - _EmissionMapChannelsX: 0 - _EmissionMapMode: 0 + - _EmissionMapOffsetXCoord: 0 + - _EmissionMapOffsetYCoord: 0 - _EmissionMapProgress: 0 - _EmissionMapProgressCoord: 0 - _EmissionMapSliceCount: 4 - _EnvironmentReflections: 1 - _FlowIntensity: 0 - _FlowIntensityCoord: 0 + - _FlowMapChannelsX: 0 + - _FlowMapChannelsY: 1 - _FlowMapOffsetXCoord: 0 - _FlowMapOffsetYCoord: 0 + - _FlowMapTarget: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -192,6 +219,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -221,8 +257,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_randomrotation.mat b/Assets/Demo/Demo00/Materials/mat_demo_randomrotation.mat index 49e99913..c5404002 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_randomrotation.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_randomrotation.mat @@ -2,15 +2,22 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_randomrotation m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _BASE_MAP_ROTATION_ENABLED - _EMISSION_COLOR_BASECOLOR _EMISSION_MAP_MODE_2D _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _BASE_MAP_ROTATION_ENABLED + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _PARALLAX_MAP_MODE_2D + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -101,6 +108,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -113,6 +128,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -125,6 +144,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -198,6 +218,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -227,8 +256,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_tex2darr_emission.mat b/Assets/Demo/Demo00/Materials/mat_demo_tex2darr_emission.mat index d140b324..6f9d9a14 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_tex2darr_emission.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_tex2darr_emission.mat @@ -2,15 +2,22 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_tex2darr_emission m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D_ARRAY _EMISSION_AREA_ALL - _EMISSION_COLOR_BASECOLOR _EMISSION_MAP_MODE_2D _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D_ARRAY + - _EMISSION_AREA_ALL + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _PARALLAX_MAP_MODE_2D + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -101,6 +108,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -113,6 +128,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -125,6 +144,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -198,6 +218,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -227,8 +256,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_tex3d_emission.mat b/Assets/Demo/Demo00/Materials/mat_demo_tex3d_emission.mat index 571052ae..86b784f0 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_tex3d_emission.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_tex3d_emission.mat @@ -2,15 +2,22 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_tex3d_emission m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_3D _EMISSION_AREA_ALL - _EMISSION_COLOR_BASECOLOR _EMISSION_MAP_MODE_2D _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_3D + - _EMISSION_AREA_ALL + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _PARALLAX_MAP_MODE_2D + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -101,6 +108,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -113,6 +128,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -125,6 +144,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -198,6 +218,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -227,8 +256,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_textureemission_rimtransparency.mat b/Assets/Demo/Demo00/Materials/mat_demo_textureemission_rimtransparency.mat index 16e993aa..0aed44ee 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_textureemission_rimtransparency.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_textureemission_rimtransparency.mat @@ -2,16 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_textureemission_rimtransparency m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_AREA_MAP - _EMISSION_COLOR_COLOR _EMISSION_MAP_MODE_2D _TINT_AREA_ALL _TINT_COLOR_ENABLED - _TRANSPARENCY_BY_RIM + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_AREA_MAP + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _PARALLAX_MAP_MODE_2D + - _TINT_AREA_ALL + - _TINT_COLOR_ENABLED + - _TRANSPARENCY_BY_RIM + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -102,6 +110,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -114,6 +130,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -126,6 +146,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -199,6 +220,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -228,8 +258,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_tintmap3d.mat b/Assets/Demo/Demo00/Materials/mat_demo_tintmap3d.mat index 03d94d9e..b7532caf 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_tintmap3d.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_tintmap3d.mat @@ -2,21 +2,29 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_tintmap3d m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_BASECOLOR - _EMISSION_MAP_MODE_2D _TINT_AREA_ALL _TINT_MAP_3D_ENABLED + m_ValidKeywords: + - _ALPHATEST_ENABLED + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _PARALLAX_MAP_MODE_2D + - _TINT_AREA_ALL + - _TINT_MAP_3D_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Transparent + RenderType: TransparentCutout disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -101,6 +109,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -113,6 +129,10 @@ Material: m_Texture: {fileID: 11700000, guid: 4cd912d6be39142cb96b7d79f9f04c57, type: 3} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -125,8 +145,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaTransitionMapChannelsX: 0 - _AlphaTransitionMapMode: 0 - _AlphaTransitionMapOffsetXCoord: 0 - _AlphaTransitionMapOffsetYCoord: 0 @@ -147,8 +169,8 @@ Material: - _BaseMapSamplerStateOverride: 0 - _BaseMapSliceCount: 25 - _Blend: 0 - - _BlendDst: 10 - - _BlendSrc: 5 + - _BlendDst: 0 + - _BlendSrc: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -167,15 +189,21 @@ Material: - _EmissionColorType: 1 - _EmissionIntensity: 0 - _EmissionIntensityCoord: 0 + - _EmissionMapChannelsX: 0 - _EmissionMapMode: 0 + - _EmissionMapOffsetXCoord: 0 + - _EmissionMapOffsetYCoord: 0 - _EmissionMapProgress: 0 - _EmissionMapProgressCoord: 0 - _EmissionMapSliceCount: 4 - _EnvironmentReflections: 1 - _FlowIntensity: 0 - _FlowIntensityCoord: 0 + - _FlowMapChannelsX: 0 + - _FlowMapChannelsY: 1 - _FlowMapOffsetXCoord: 0 - _FlowMapOffsetYCoord: 0 + - _FlowMapTarget: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -191,9 +219,18 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _RenderType: 2 + - _RenderType: 1 - _RimTransparencyEnabled: 0 - _RimTransparencyProgress: 0.5 - _RimTransparencyProgressCoord: 0 @@ -220,8 +257,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 - - _ZWrite: 0 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteOverride: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo00/Materials/mat_demo_uvscroll_doublesided.mat b/Assets/Demo/Demo00/Materials/mat_demo_uvscroll_doublesided.mat index 2371d72a..bdc2db1f 100644 --- a/Assets/Demo/Demo00/Materials/mat_demo_uvscroll_doublesided.mat +++ b/Assets/Demo/Demo00/Materials/mat_demo_uvscroll_doublesided.mat @@ -2,15 +2,21 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_demo_uvscroll_doublesided m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_BASECOLOR - _EMISSION_MAP_MODE_2D _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _PARALLAX_MAP_MODE_2D + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -101,6 +107,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -113,6 +127,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -125,8 +143,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaTransitionMapChannelsX: 0 - _AlphaTransitionMapMode: 0 - _AlphaTransitionMapOffsetXCoord: 0 - _AlphaTransitionMapOffsetYCoord: 0 @@ -167,15 +187,21 @@ Material: - _EmissionColorType: 1 - _EmissionIntensity: 0 - _EmissionIntensityCoord: 0 + - _EmissionMapChannelsX: 0 - _EmissionMapMode: 0 + - _EmissionMapOffsetXCoord: 0 + - _EmissionMapOffsetYCoord: 0 - _EmissionMapProgress: 0 - _EmissionMapProgressCoord: 0 - _EmissionMapSliceCount: 4 - _EnvironmentReflections: 1 - _FlowIntensity: 0 - _FlowIntensityCoord: 0 + - _FlowMapChannelsX: 0 + - _FlowMapChannelsY: 1 - _FlowMapOffsetXCoord: 0 - _FlowMapOffsetYCoord: 0 + - _FlowMapTarget: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -191,6 +217,15 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -220,8 +255,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo01/Materials/mat_test_00.mat b/Assets/Demo/Demo01/Materials/mat_test_00.mat index feef4391..3d263415 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_00.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_00.mat @@ -2,17 +2,27 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_00 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED - _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +137,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +181,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +197,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +274,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 0 @@ -281,8 +313,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo01/Materials/mat_test_01.mat b/Assets/Demo/Demo01/Materials/mat_test_01.mat index 66f93290..761b4c89 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_01.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_01.mat @@ -2,17 +2,29 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_01 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_MAP - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED - _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _SPECULAR_MAP_ENABLED _SPECULAR_SETUP _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_MAP_ENABLED + - _SPECULAR_SETUP + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +139,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +183,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +199,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +276,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 0 @@ -281,8 +315,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo01/Materials/mat_test_02.mat b/Assets/Demo/Demo01/Materials/mat_test_02.mat index bf3a6645..fc40e290 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_02.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_02.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_02 m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} - m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -76,6 +79,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -139,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/Assets/Demo/Demo01/Materials/mat_test_03.mat b/Assets/Demo/Demo01/Materials/mat_test_03.mat index 784f0023..9f470a94 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_03.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_03.mat @@ -2,14 +2,18 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_03 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _SPECULAR_SETUP + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _SPECULAR_SETUP + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -76,6 +80,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -139,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/Assets/Demo/Demo01/Materials/mat_test_04.mat b/Assets/Demo/Demo01/Materials/mat_test_04.mat index 7702e1ec..745d33e8 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_04.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_04.mat @@ -2,16 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_04 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED - _SPECULAR_HIGHLIGHTS_ENABLED _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -126,6 +135,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -162,6 +179,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -174,6 +195,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -250,6 +272,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 0 @@ -280,8 +311,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo01/Materials/mat_test_05.mat b/Assets/Demo/Demo01/Materials/mat_test_05.mat index 484abd1e..fa85ac84 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_05.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_05.mat @@ -2,17 +2,27 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_05 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED - _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED _SPECULAR_SETUP - _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_SETUP + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +137,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -163,6 +181,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +197,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +274,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 0 @@ -281,8 +313,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo01/Materials/mat_test_06.mat b/Assets/Demo/Demo01/Materials/mat_test_06.mat index f8f9e21f..921d596b 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_06.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_06.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_06 m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} - m_ShaderKeywords: _NORMALMAP + m_ValidKeywords: + - _NORMALMAP + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -76,6 +78,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -139,4 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/Assets/Demo/Demo01/Materials/mat_test_07.mat b/Assets/Demo/Demo01/Materials/mat_test_07.mat index 211ff950..fe282927 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_07.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_07.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_07 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _NORMALMAP _SPECULAR_SETUP + m_ValidKeywords: + - _NORMALMAP + - _SPECULAR_SETUP + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -76,6 +79,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -139,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/Assets/Demo/Demo01/Materials/mat_test_08.mat b/Assets/Demo/Demo01/Materials/mat_test_08.mat index a8234cbc..fab15018 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_08.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_08.mat @@ -2,16 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_08 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _RECEIVE_SHADOWS_ENABLED - _SPECULAR_HIGHLIGHTS_ENABLED _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -126,6 +134,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -162,6 +178,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -174,6 +194,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -250,6 +271,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 0 @@ -280,8 +310,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo01/Materials/mat_test_09.mat b/Assets/Demo/Demo01/Materials/mat_test_09.mat index ec96c2c7..68d05549 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_09.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_09.mat @@ -2,16 +2,26 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_09 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED - _RECEIVE_SHADOWS_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED _SPECULAR_SETUP _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_SETUP + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -126,6 +136,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -162,6 +180,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -174,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -250,6 +273,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 0 @@ -280,8 +312,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo01/Materials/mat_test_10.mat b/Assets/Demo/Demo01/Materials/mat_test_10.mat index 08051d81..30bb774e 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_10.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_10.mat @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_10 m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -76,6 +77,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -139,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/Assets/Demo/Demo01/Materials/mat_test_12.mat b/Assets/Demo/Demo01/Materials/mat_test_12.mat index bddbf9c3..4c1d7665 100644 --- a/Assets/Demo/Demo01/Materials/mat_test_12.mat +++ b/Assets/Demo/Demo01/Materials/mat_test_12.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_12 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _SPECULAR_SETUP + m_ValidKeywords: + - _SPECULAR_SETUP + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -76,6 +78,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -139,4 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/Assets/Demo/Demo02/Materials/mat_test_00.mat b/Assets/Demo/Demo02/Materials/mat_test_00.mat index 2adca7f2..673ff4d1 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_00.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_00.mat @@ -2,17 +2,28 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_00 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_AREA_ALPHA - _EMISSION_COLOR_MAP _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _FLOW_MAP_TARGET_BASE - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_AREA_ALPHA + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _FLOW_MAP_TARGET_BASE + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +138,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +182,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +198,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -263,6 +287,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 0 @@ -295,8 +328,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_01.mat b/Assets/Demo/Demo02/Materials/mat_test_01.mat index 3ecafe0a..914d0e79 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_01.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_01.mat @@ -2,17 +2,27 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_01 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _DISSOLVE_TRANSITION_ENABLED - _EMISSION_COLOR_COLOR _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _DISSOLVE_TRANSITION_ENABLED + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +137,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +181,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +197,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -263,6 +286,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -295,8 +327,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_02.mat b/Assets/Demo/Demo02/Materials/mat_test_02.mat index e95e4c4e..dc7acda1 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_02.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_02.mat @@ -2,17 +2,27 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_02 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _FADE_TRANSITION_ENABLED - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _FADE_TRANSITION_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +137,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +181,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +197,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -263,6 +286,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -295,8 +327,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_03.mat b/Assets/Demo/Demo02/Materials/mat_test_03.mat index a312f3a5..af27b5f6 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_03.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_03.mat @@ -2,16 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_03 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _RECEIVE_SHADOWS_ENABLED - _SPECULAR_HIGHLIGHTS_ENABLED _TINT_AREA_ALL _TINT_MAP_3D_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_AREA_ALL + - _TINT_MAP_3D_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -126,6 +135,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -162,6 +179,10 @@ Material: m_Texture: {fileID: 11700000, guid: 4cd912d6be39142cb96b7d79f9f04c57, type: 3} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -174,6 +195,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -250,6 +272,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 0 @@ -280,8 +311,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_04.mat b/Assets/Demo/Demo02/Materials/mat_test_04.mat index e8c79a3c..9af38a31 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_04.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_04.mat @@ -2,17 +2,28 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_04 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED - _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _TINT_AREA_ALL _TINT_MAP_3D_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_AREA_ALL + - _TINT_MAP_3D_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +138,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +182,10 @@ Material: m_Texture: {fileID: 11700000, guid: 4cd912d6be39142cb96b7d79f9f04c57, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +198,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +275,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 0 @@ -281,8 +314,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_05.mat b/Assets/Demo/Demo02/Materials/mat_test_05.mat index 36eae4ee..0393d6fd 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_05.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_05.mat @@ -2,17 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_05 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_3D _EMISSION_AREA_ALL - _EMISSION_COLOR_BASECOLOR _EMISSION_MAP_MODE_2D _ENVIRONMENTREFLECTIONS_OFF _ENVIRONMENT_REFLECTIONS_ENABLED - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED - _SPECULARHIGHLIGHTS_OFF _SPECULAR_HIGHLIGHTS_ENABLED _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_3D + - _EMISSION_AREA_ALL + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_COLOR_ENABLED + m_InvalidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +140,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +184,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +200,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +277,15 @@ Material: - _NormalMapBumpScale: 2 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +316,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_06.mat b/Assets/Demo/Demo02/Materials/mat_test_06.mat index 544bee62..c07920c7 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_06.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_06.mat @@ -2,17 +2,27 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_06 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D_ARRAY _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED - _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _TINT_MAP_3D_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D_ARRAY + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_MAP_3D_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +137,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +181,10 @@ Material: m_Texture: {fileID: 11700000, guid: 4cd912d6be39142cb96b7d79f9f04c57, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +197,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +274,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +313,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_07.mat b/Assets/Demo/Demo02/Materials/mat_test_07.mat index 9f1da2bd..811b35f7 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_07.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_07.mat @@ -2,17 +2,28 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_07 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _DISSOLVE_TRANSITION_ENABLED - _EMISSION_COLOR_MAP _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED - _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _TINT_MAP_3D_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _DISSOLVE_TRANSITION_ENABLED + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_MAP_3D_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +138,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 1f34690b69ccacd419884c756529487d, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +182,10 @@ Material: m_Texture: {fileID: 11700000, guid: 4cd912d6be39142cb96b7d79f9f04c57, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +198,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +275,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +314,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_08.mat b/Assets/Demo/Demo02/Materials/mat_test_08.mat index 9fbfa7af..2aed3ef9 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_08.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_08.mat @@ -2,17 +2,28 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_08 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_MAP - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _FADE_TRANSITION_ENABLED - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED - _SPECULAR_HIGHLIGHTS_ENABLED _TINT_MAP_3D_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _FADE_TRANSITION_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_MAP_3D_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +138,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 1f34690b69ccacd419884c756529487d, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +182,10 @@ Material: m_Texture: {fileID: 11700000, guid: 4cd912d6be39142cb96b7d79f9f04c57, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +198,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +275,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +314,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_09.mat b/Assets/Demo/Demo02/Materials/mat_test_09.mat index 45216f17..3bca13a2 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_09.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_09.mat @@ -2,17 +2,31 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_09 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHATEST_ENABLED _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D - _DISSOLVE_TRANSITION_ENABLED _EMISSION_AREA_ALPHA _EMISSION_COLOR_MAP _EMISSION_MAP_MODE_2D - _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _SMOOTHNESS_MAP_ENABLED - _SPECULAR_HIGHLIGHTS_ENABLED _SPECULAR_MAP_ENABLED _TINT_AREA_ALL _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHATEST_ENABLED + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _DISSOLVE_TRANSITION_ENABLED + - _EMISSION_AREA_ALPHA + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_MAP_ENABLED + - _TINT_AREA_ALL + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -127,6 +141,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +185,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +201,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -253,6 +280,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 1 @@ -290,8 +326,16 @@ Material: - _TransparentBlendMode: 0 - _UseUIAlphaClip: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 0.5849056, g: 0.5849056, b: 0.5849056, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_10.mat b/Assets/Demo/Demo02/Materials/mat_test_10.mat index af5e5c17..cdc26d76 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_10.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_10.mat @@ -2,17 +2,29 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_10 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_3D _EMISSION_AREA_ALL - _EMISSION_COLOR_BASECOLOR _EMISSION_MAP_MODE_2D _ENVIRONMENTREFLECTIONS_OFF _ENVIRONMENT_REFLECTIONS_ENABLED - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SPECULARHIGHLIGHTS_OFF - _SPECULAR_HIGHLIGHTS_ENABLED _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_3D + - _EMISSION_AREA_ALL + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_COLOR_ENABLED + m_InvalidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +139,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +183,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +199,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +276,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +315,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_11.mat b/Assets/Demo/Demo02/Materials/mat_test_11.mat index e66bc202..cec49b20 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_11.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_11.mat @@ -2,17 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_11 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_BASECOLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENTREFLECTIONS_OFF _ENVIRONMENT_REFLECTIONS_ENABLED - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED - _SPECULARHIGHLIGHTS_OFF _SPECULAR_HIGHLIGHTS_ENABLED _TINT_COLOR_ENABLED _TRANSPARENCY_BY_RIM + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _TINT_COLOR_ENABLED + - _TRANSPARENCY_BY_RIM + m_InvalidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +140,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +184,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +200,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +277,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +316,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_12.mat b/Assets/Demo/Demo02/Materials/mat_test_12.mat index ff55cc4c..7eb83275 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_12.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_12.mat @@ -2,18 +2,32 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_12 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_3D _EMISSION_AREA_ALL - _EMISSION_COLOR_BASECOLOR _EMISSION_MAP_MODE_2D _ENVIRONMENTREFLECTIONS_OFF _ENVIRONMENT_REFLECTIONS_ENABLED - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED - _SPECULARHIGHLIGHTS_OFF _SPECULAR_HIGHLIGHTS_ENABLED _SPECULAR_MAP_ENABLED _SPECULAR_SETUP - _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_3D + - _EMISSION_AREA_ALL + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_MAP_ENABLED + - _SPECULAR_SETUP + - _TINT_COLOR_ENABLED + m_InvalidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -128,6 +142,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -164,6 +186,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -176,6 +202,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -252,6 +279,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -282,8 +318,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_13.mat b/Assets/Demo/Demo02/Materials/mat_test_13.mat index f4cd107c..c78b80d5 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_13.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_13.mat @@ -2,17 +2,31 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_13 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_3D _EMISSION_AREA_ALL - _EMISSION_COLOR_BASECOLOR _EMISSION_MAP_MODE_2D _ENVIRONMENTREFLECTIONS_OFF _ENVIRONMENT_REFLECTIONS_ENABLED - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SPECULARHIGHLIGHTS_OFF - _SPECULAR_HIGHLIGHTS_ENABLED _SPECULAR_MAP_ENABLED _SPECULAR_SETUP _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_3D + - _EMISSION_AREA_ALL + - _EMISSION_COLOR_BASECOLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_MAP_ENABLED + - _SPECULAR_SETUP + - _TINT_COLOR_ENABLED + m_InvalidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +141,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +185,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +201,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +278,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +317,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_14.mat b/Assets/Demo/Demo02/Materials/mat_test_14.mat index 30b26117..187ebe35 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_14.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_14.mat @@ -2,17 +2,29 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_14 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D_ARRAY _EMISSION_COLOR_COLOR - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED - _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _SPECULAR_MAP_ENABLED _SPECULAR_SETUP _TINT_MAP_3D_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D_ARRAY + - _EMISSION_COLOR_COLOR + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_MAP_ENABLED + - _SPECULAR_SETUP + - _TINT_MAP_3D_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +139,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +183,10 @@ Material: m_Texture: {fileID: 11700000, guid: 4cd912d6be39142cb96b7d79f9f04c57, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +199,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +276,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +315,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_15.mat b/Assets/Demo/Demo02/Materials/mat_test_15.mat index c54f2eb5..a291e54e 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_15.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_15.mat @@ -2,17 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_15 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _DISSOLVE_TRANSITION_ENABLED - _EMISSION_COLOR_MAP _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED - _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED _SPECULAR_HIGHLIGHTS_ENABLED - _SPECULAR_MAP_ENABLED _SPECULAR_SETUP _TINT_MAP_3D_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _DISSOLVE_TRANSITION_ENABLED + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_MAP_ENABLED + - _SPECULAR_SETUP + - _TINT_MAP_3D_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +140,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 1f34690b69ccacd419884c756529487d, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +184,10 @@ Material: m_Texture: {fileID: 11700000, guid: 4cd912d6be39142cb96b7d79f9f04c57, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +200,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +277,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +316,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_16.mat b/Assets/Demo/Demo02/Materials/mat_test_16.mat index 148fac1b..82940f82 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_16.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_16.mat @@ -2,17 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_16 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D _EMISSION_COLOR_MAP - _EMISSION_MAP_MODE_2D _ENVIRONMENT_REFLECTIONS_ENABLED _FADE_TRANSITION_ENABLED - _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _RECEIVE_SHADOWS_ENABLED _SMOOTHNESS_MAP_ENABLED - _SPECULAR_HIGHLIGHTS_ENABLED _SPECULAR_MAP_ENABLED _SPECULAR_SETUP _TINT_MAP_3D_ENABLED + m_ValidKeywords: + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _FADE_TRANSITION_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _RECEIVE_SHADOWS_ENABLED + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_MAP_ENABLED + - _SPECULAR_SETUP + - _TINT_MAP_3D_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -127,6 +140,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 1f34690b69ccacd419884c756529487d, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +184,10 @@ Material: m_Texture: {fileID: 11700000, guid: 4cd912d6be39142cb96b7d79f9f04c57, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +200,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -251,6 +277,15 @@ Material: - _NormalMapBumpScale: 3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 2 @@ -281,8 +316,16 @@ Material: - _TintRimSharpnessCoord: 0 - _TransparentBlendMode: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Demo/Demo02/Materials/mat_test_17.mat b/Assets/Demo/Demo02/Materials/mat_test_17.mat index 6489f2a1..9e15dd6c 100644 --- a/Assets/Demo/Demo02/Materials/mat_test_17.mat +++ b/Assets/Demo/Demo02/Materials/mat_test_17.mat @@ -2,17 +2,31 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_test_17 m_Shader: {fileID: 4800000, guid: 65654f079f6f340b09f954eb6366ad5a, type: 3} - m_ShaderKeywords: _ALPHATEST_ENABLED _ALPHA_TRANSITION_MAP_MODE_2D _BASE_MAP_MODE_2D - _DISSOLVE_TRANSITION_ENABLED _EMISSION_AREA_ALPHA _EMISSION_COLOR_MAP _EMISSION_MAP_MODE_2D - _ENVIRONMENT_REFLECTIONS_ENABLED _METALLIC_MAP_ENABLED _NORMAL_MAP_ENABLED _SMOOTHNESS_MAP_ENABLED - _SPECULAR_HIGHLIGHTS_ENABLED _SPECULAR_MAP_ENABLED _SPECULAR_SETUP _TINT_COLOR_ENABLED + m_ValidKeywords: + - _ALPHATEST_ENABLED + - _ALPHA_TRANSITION_MAP_MODE_2D + - _BASE_MAP_MODE_2D + - _DISSOLVE_TRANSITION_ENABLED + - _EMISSION_AREA_ALPHA + - _EMISSION_COLOR_MAP + - _EMISSION_MAP_MODE_2D + - _ENVIRONMENT_REFLECTIONS_ENABLED + - _METALLIC_MAP_ENABLED + - _NORMAL_MAP_ENABLED + - _PARALLAX_MAP_MODE_2D + - _SMOOTHNESS_MAP_ENABLED + - _SPECULAR_HIGHLIGHTS_ENABLED + - _SPECULAR_MAP_ENABLED + - _SPECULAR_SETUP + - _TINT_COLOR_ENABLED + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -127,6 +141,14 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap2DArray: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap3D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SmoothnessMap: m_Texture: {fileID: 2800000, guid: 568737f2009916e40b4682067d4a56b8, type: 3} m_Scale: {x: 1, y: 1} @@ -163,6 +185,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _VertexDeformationMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -175,6 +201,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _AlphaTransitionMapChannelsX: 0 @@ -253,6 +280,15 @@ Material: - _NormalMapBumpScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ParallaxMapChannel: 0 + - _ParallaxMapMode: 0 + - _ParallaxMapOffsetXCoord: 0 + - _ParallaxMapOffsetYCoord: 0 + - _ParallaxMapProgress: 0 + - _ParallaxMapProgressCoord: 0 + - _ParallaxMapSliceCount: 4 + - _ParallaxMapTarget: 1 + - _ParallaxStrength: 0.3 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RenderType: 1 @@ -290,8 +326,16 @@ Material: - _TransparentBlendMode: 0 - _UseUIAlphaClip: 0 - _VertexAlphaMode: 0 + - _VertexDeformationEnabled: 0 + - _VertexDeformationIntensity: 0.1 + - _VertexDeformationIntensityCoord: 0 + - _VertexDeformationMapChannel: 0 + - _VertexDeformationMapOffsetXCoord: 0 + - _VertexDeformationMapOffsetYCoord: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteOverride: -1 m_Colors: - _BaseColor: {r: 0.5849056, g: 0.5849056, b: 0.5849056, a: 1} - _BaseMapRotationOffsets: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Nova/Runtime/Core/Scripts/ApplyDistortionPass.cs b/Assets/Nova/Runtime/Core/Scripts/ApplyDistortionPass.cs index 72f39624..b990053a 100644 --- a/Assets/Nova/Runtime/Core/Scripts/ApplyDistortionPass.cs +++ b/Assets/Nova/Runtime/Core/Scripts/ApplyDistortionPass.cs @@ -11,32 +11,24 @@ namespace Nova.Runtime.Core.Scripts public sealed class ApplyDistortionPass : ScriptableRenderPass { private const string RenderPassName = nameof(ApplyDistortionPass); - private const string SrcToDestProfilingSamplerName = "SrcToDest"; - private readonly bool _applyToSceneView; private readonly int _distortionBufferPropertyId = Shader.PropertyToID("_ScreenSpaceUvTexture"); private readonly int _mainTexPropertyId = Shader.PropertyToID("_MainTex"); private readonly Material _material; - private readonly ProfilingSampler _srcToDestProfilingSampler; private readonly ProfilingSampler _renderPassProfilingSampler; - private ScriptableRenderer _renderer; private RenderTargetIdentifier _distortedUvBufferIdentifier; - private RenderTargetHandle _tempRenderTargetHandle; public ApplyDistortionPass(bool applyToSceneView, Shader shader) { _applyToSceneView = applyToSceneView; - _srcToDestProfilingSampler = new ProfilingSampler(SrcToDestProfilingSamplerName); _renderPassProfilingSampler = new ProfilingSampler(RenderPassName); - _tempRenderTargetHandle.Init("_TempRT"); _material = CoreUtils.CreateEngineMaterial(shader); renderPassEvent = RenderPassEvent.BeforeRenderingPostProcessing; } - public void Setup(ScriptableRenderer renderer, RenderTargetIdentifier distortedUvBufferIdentifier) + public void Setup(RenderTargetIdentifier distortedUvBufferIdentifier) { - _renderer = renderer; _distortedUvBufferIdentifier = distortedUvBufferIdentifier; } @@ -51,25 +43,20 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData { return; } + + #if UNITY_2022_1_OR_NEWER + var source = renderingData.cameraData.renderer.cameraColorTargetHandle.nameID; + #else + var source = renderingData.cameraData.renderer.cameraColorTarget; + #endif var cmd = CommandBufferPool.Get(); cmd.Clear(); using (new ProfilingScope(cmd, _renderPassProfilingSampler)) { - var source = _renderer.cameraColorTarget; - var tempTargetDescriptor = renderingData.cameraData.cameraTargetDescriptor; - tempTargetDescriptor.depthBufferBits = 0; - cmd.GetTemporaryRT(_tempRenderTargetHandle.id, tempTargetDescriptor); - - using (new ProfilingScope(cmd, _srcToDestProfilingSampler)) - { - cmd.SetGlobalTexture(_mainTexPropertyId, source); - cmd.SetGlobalTexture(_distortionBufferPropertyId, _distortedUvBufferIdentifier); - Blit(cmd, source, _tempRenderTargetHandle.Identifier(), _material); - } - - Blit(cmd, _tempRenderTargetHandle.Identifier(), source); - cmd.ReleaseTemporaryRT(_tempRenderTargetHandle.id); + cmd.SetGlobalTexture(_mainTexPropertyId, source); + cmd.SetGlobalTexture(_distortionBufferPropertyId, _distortedUvBufferIdentifier); + Blit(cmd, ref renderingData, _material); } context.ExecuteCommandBuffer(cmd); diff --git a/Assets/Nova/Runtime/Core/Scripts/DistortedUvBufferPass.cs b/Assets/Nova/Runtime/Core/Scripts/DistortedUvBufferPass.cs index 48168c24..9b963a73 100644 --- a/Assets/Nova/Runtime/Core/Scripts/DistortedUvBufferPass.cs +++ b/Assets/Nova/Runtime/Core/Scripts/DistortedUvBufferPass.cs @@ -2,7 +2,6 @@ // Copyright 2021 CyberAgent, Inc. // -------------------------------------------------------------- -using System; using UnityEngine; using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; @@ -15,10 +14,13 @@ public sealed class DistortedUvBufferPass : ScriptableRenderPass private readonly ProfilingSampler _profilingSampler = new ProfilingSampler(ProfilerTag); private readonly RenderQueueRange _renderQueueRange = RenderQueueRange.all; private readonly ShaderTagId _shaderTagId; - private Func _getCameraDepthTargetIdentifier; private FilteringSettings _filteringSettings; + #if UNITY_2022_1_OR_NEWER + private RTHandle _renderTargetRTHandle; + #else private RenderTargetIdentifier _renderTargetIdentifier; + #endif public DistortedUvBufferPass(string lightMode) { @@ -27,18 +29,29 @@ public DistortedUvBufferPass(string lightMode) _shaderTagId = new ShaderTagId(lightMode); } - public void Setup(RenderTargetIdentifier renderTargetIdentifier, - Func getCameraDepthTargetIdentifier) + #if UNITY_2022_1_OR_NEWER + public void Setup(RTHandle renderTargetRTHandle) + { + _renderTargetRTHandle = renderTargetRTHandle; + } + #else + public void Setup(RenderTargetIdentifier renderTargetIdentifier) { _renderTargetIdentifier = renderTargetIdentifier; - _getCameraDepthTargetIdentifier = getCameraDepthTargetIdentifier; } + #endif - public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor) + public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData) { - ConfigureTarget(_renderTargetIdentifier, _getCameraDepthTargetIdentifier.Invoke()); + var renderer = renderingData.cameraData.renderer; + #if UNITY_2022_1_OR_NEWER + ConfigureTarget(_renderTargetRTHandle, renderer.cameraDepthTargetHandle); + #else + ConfigureTarget(_renderTargetIdentifier, renderer.cameraDepthTarget); + #endif ConfigureClear(ClearFlag.Color, Color.gray); } + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) { var cmd = CommandBufferPool.Get(); @@ -51,7 +64,14 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData var drawingSettings = CreateDrawingSettings(_shaderTagId, ref renderingData, SortingCriteria.CommonTransparent); + + #if UNITY_2023_1_OR_NEWER + var param = new RendererListParams(renderingData.cullResults, drawingSettings, _filteringSettings); + var renderList = context.CreateRendererList(ref param); + cmd.DrawRendererList(renderList); + #else context.DrawRenderers(renderingData.cullResults, ref drawingSettings, ref _filteringSettings); + #endif } context.ExecuteCommandBuffer(cmd); CommandBufferPool.Release(cmd); diff --git a/Assets/Nova/Runtime/Core/Scripts/ScreenSpaceDistortion.cs b/Assets/Nova/Runtime/Core/Scripts/ScreenSpaceDistortion.cs index cecf2986..cdd40dab 100644 --- a/Assets/Nova/Runtime/Core/Scripts/ScreenSpaceDistortion.cs +++ b/Assets/Nova/Runtime/Core/Scripts/ScreenSpaceDistortion.cs @@ -19,6 +19,10 @@ public sealed class ScreenSpaceDistortion : ScriptableRendererFeature private ApplyDistortionPass _applyDistortionPass; private DistortedUvBufferPass _distortedUvBufferPass; + + #if UNITY_2022_1_OR_NEWER + private RTHandle _distortedUvBufferRTHandle; + #endif public override void Create() { @@ -31,22 +35,36 @@ public override void Create() public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { - if (_applyDistortionShader == null || renderingData.cameraData.cameraType == CameraType.Reflection) return; - var cameraTargetDesciptor = renderingData.cameraData.cameraTargetDescriptor; + if (_applyDistortionShader == null + || renderingData.cameraData.cameraType == CameraType.Reflection + || renderingData.cameraData.cameraType == CameraType.Preview) + return; var distortedUvBufferFormat = SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.RGHalf) ? RenderTextureFormat.RGHalf : RenderTextureFormat.DefaultHDR; - var distortedUvBuffer = RenderTexture.GetTemporary(cameraTargetDesciptor.width, - cameraTargetDesciptor.height, 0, distortedUvBufferFormat, RenderTextureReadWrite.Default, - cameraTargetDesciptor.msaaSamples); + + #if UNITY_2022_1_OR_NEWER + var desc = renderingData.cameraData.cameraTargetDescriptor; + desc.depthBufferBits = 0; + desc.colorFormat = distortedUvBufferFormat; + RenderingUtils.ReAllocateIfNeeded(ref _distortedUvBufferRTHandle, desc); + _distortedUvBufferPass.Setup(_distortedUvBufferRTHandle); + _applyDistortionPass.Setup(_distortedUvBufferRTHandle); + #else + var cameraTargetDescriptor = renderingData.cameraData.cameraTargetDescriptor; + var distortedUvBuffer = RenderTexture.GetTemporary(cameraTargetDescriptor.width, + cameraTargetDescriptor.height, 0, distortedUvBufferFormat, RenderTextureReadWrite.Default, + cameraTargetDescriptor.msaaSamples); var distortedUvBufferIdentifier = new RenderTargetIdentifier(distortedUvBuffer); - - _distortedUvBufferPass.Setup(distortedUvBufferIdentifier, () => renderer.cameraDepthTarget); - _applyDistortionPass.Setup(renderer, distortedUvBufferIdentifier); + _distortedUvBufferPass.Setup(distortedUvBufferIdentifier); + _applyDistortionPass.Setup(distortedUvBufferIdentifier); + #endif renderer.EnqueuePass(_distortedUvBufferPass); renderer.EnqueuePass(_applyDistortionPass); + #if !UNITY_2022_1_OR_NEWER RenderTexture.ReleaseTemporary(distortedUvBuffer); + #endif } } } \ No newline at end of file diff --git a/Assets/Nova/Runtime/Core/Shaders/ParticlesApplyDistortion.shader b/Assets/Nova/Runtime/Core/Shaders/ParticlesApplyDistortion.shader index 63e265d8..497984d4 100644 --- a/Assets/Nova/Runtime/Core/Shaders/ParticlesApplyDistortion.shader +++ b/Assets/Nova/Runtime/Core/Shaders/ParticlesApplyDistortion.shader @@ -5,16 +5,20 @@ Shader "Hidden/Nova/Particles/ApplyDistortion" Pass { HLSLPROGRAM - #pragma vertex vert + #pragma vertex Vert #pragma fragment frag #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" - + #if UNITY_VERSION >= 202200 + #include "Packages/com.unity.render-pipelines.core/Runtime/Utilities/Blit.hlsl" + #endif + TEXTURE2D(_MainTex); SAMPLER(sampler_MainTex); TEXTURE2D(_ScreenSpaceUvTexture); SAMPLER(sampler_ScreenSpaceUvTexture); half4 _TintColor; + #if UNITY_VERSION < 202200 struct Attributes { float4 positionOS : POSITION; @@ -28,7 +32,7 @@ Shader "Hidden/Nova/Particles/ApplyDistortion" UNITY_VERTEX_OUTPUT_STEREO }; - Varyings vert(Attributes IN) + Varyings Vert(Attributes IN) { Varyings OUT; UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT); @@ -36,13 +40,19 @@ Shader "Hidden/Nova/Particles/ApplyDistortion" OUT.uv = IN.uv; return OUT; } - + #endif + half4 frag(Varyings IN) : SV_Target { UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(IN); - half2 dist = SAMPLE_TEXTURE2D(_ScreenSpaceUvTexture, sampler_ScreenSpaceUvTexture, IN.uv).xy; + #if UNITY_VERSION >= 202200 + const float2 uv = IN.texcoord; + #else + const float2 uv = IN.uv; + #endif + half2 dist = SAMPLE_TEXTURE2D(_ScreenSpaceUvTexture, sampler_ScreenSpaceUvTexture, uv).xy; dist = dist.xy * 2.0 - 1.0; - half4 col = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, IN.uv + dist); + half4 col = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, uv + dist); return col; } ENDHLSL diff --git a/Assets/Nova/Runtime/Core/Shaders/ParticlesDistortion.hlsl b/Assets/Nova/Runtime/Core/Shaders/ParticlesDistortion.hlsl index 6159812c..fc40bc3f 100644 --- a/Assets/Nova/Runtime/Core/Shaders/ParticlesDistortion.hlsl +++ b/Assets/Nova/Runtime/Core/Shaders/ParticlesDistortion.hlsl @@ -30,6 +30,7 @@ SAMPLER(sampler_FlowMap); TEXTURE2D(_AlphaTransitionMap); SAMPLER(sampler_AlphaTransitionMap); +CBUFFER_START(UnityPerMaterial) float4 _BaseMap_ST; DECLARE_CUSTOM_COORD(_BaseMapOffsetXCoord); DECLARE_CUSTOM_COORD(_BaseMapOffsetYCoord); @@ -64,5 +65,6 @@ float _SoftParticlesIntensity; float _DepthFadeNear; float _DepthFadeFar; float _DepthFadeWidth; +CBUFFER_END #endif diff --git a/Assets/Nova/package.json b/Assets/Nova/package.json index df593d49..8f7912b3 100644 --- a/Assets/Nova/package.json +++ b/Assets/Nova/package.json @@ -1,8 +1,8 @@ { "name": "jp.co.cyberagent.nova", "displayName": "NOVA Shader", - "version": "1.5.1", - "unity": "2020.3", + "version": "2.0.0", + "unity": "2021.3", "license": "MIT", "dependencies": { }, diff --git a/Assets/Samples/Materials/Common/mat_bg_buttom.mat b/Assets/Samples/Materials/Common/mat_bg_buttom.mat old mode 100755 new mode 100644 index b19b4e44..a505e0b2 --- a/Assets/Samples/Materials/Common/mat_bg_buttom.mat +++ b/Assets/Samples/Materials/Common/mat_bg_buttom.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_bg_buttom m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + m_ValidKeywords: + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -84,6 +86,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -169,7 +172,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.3773585, g: 0.3773585, b: 0.3773585, a: 1} - - _Color: {r: 0.16981131, g: 0.14277947, b: 0.14017443, a: 1} + - _Color: {r: 0.37735847, g: 0.37735847, b: 0.37735847, a: 1} - _EmissionColor: {r: 0.028301895, g: 0.028301895, b: 0.028301895, a: 1} - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} @@ -187,4 +190,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 5 diff --git a/Assets/Samples/Textures/tex_eff_hit07.png.meta b/Assets/Samples/Textures/tex_eff_hit07.png.meta index c4cb9d9b..2199232e 100755 --- a/Assets/Samples/Textures/tex_eff_hit07.png.meta +++ b/Assets/Samples/Textures/tex_eff_hit07.png.meta @@ -1,13 +1,21 @@ fileFormatVersion: 2 guid: 959ed56fae613134abd6197e029e427d TextureImporter: - fileIDToRecycleName: - 21300000: full - 21300002: player_button - 21300004: friend_button - 21300006: icon + internalIDToNameTable: + - first: + 213: 21300000 + second: full + - first: + 213: 21300002 + second: player_button + - first: + 213: 21300004 + second: friend_button + - first: + 213: 21300006 + second: icon externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -27,6 +35,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,9 +45,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -58,11 +68,16 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -73,7 +88,8 @@ TextureImporter: allowsAlphaSplitting: 1 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -84,7 +100,8 @@ TextureImporter: allowsAlphaSplitting: 1 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -95,7 +112,8 @@ TextureImporter: allowsAlphaSplitting: 1 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,6 +124,19 @@ TextureImporter: allowsAlphaSplitting: 1 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 1 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -125,6 +156,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 21300000 vertices: [] indices: edges: [] @@ -145,6 +177,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 21300002 vertices: [] indices: edges: [] @@ -165,6 +198,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 21300004 vertices: [] indices: edges: [] @@ -185,6 +219,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 21300006 vertices: [] indices: edges: [] @@ -205,6 +240,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 4533478452115948628 vertices: [] indices: edges: [] @@ -213,10 +249,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: c9ee55bd0aefa854dad311546ced5076 + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] + nameFileIdTable: + fit: 4533478452115948628 + friend_button: 21300004 + full: 21300000 + icon: 21300006 + player_button: 21300002 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Samples/Textures/tex_eff_hit_common_flash_chiri.png.meta b/Assets/Samples/Textures/tex_eff_hit_common_flash_chiri.png.meta index 88b7cae9..d88561f5 100755 --- a/Assets/Samples/Textures/tex_eff_hit_common_flash_chiri.png.meta +++ b/Assets/Samples/Textures/tex_eff_hit_common_flash_chiri.png.meta @@ -1,13 +1,21 @@ fileFormatVersion: 2 guid: d612fc2aa131c7c44bb2ba8cd3bb0c49 TextureImporter: - fileIDToRecycleName: - 21300000: full - 21300002: player_button - 21300004: friend_button - 21300006: icon + internalIDToNameTable: + - first: + 213: 21300000 + second: full + - first: + 213: 21300002 + second: player_button + - first: + 213: 21300004 + second: friend_button + - first: + 213: 21300006 + second: icon externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -27,6 +35,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,9 +45,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -58,11 +68,16 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -73,7 +88,8 @@ TextureImporter: allowsAlphaSplitting: 1 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -84,7 +100,8 @@ TextureImporter: allowsAlphaSplitting: 1 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -95,7 +112,8 @@ TextureImporter: allowsAlphaSplitting: 1 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,6 +124,19 @@ TextureImporter: allowsAlphaSplitting: 1 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 1 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -125,6 +156,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 21300000 vertices: [] indices: edges: [] @@ -145,6 +177,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 21300002 vertices: [] indices: edges: [] @@ -165,6 +198,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 21300004 vertices: [] indices: edges: [] @@ -185,6 +219,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 21300006 vertices: [] indices: edges: [] @@ -205,6 +240,7 @@ TextureImporter: tessellationDetail: -1 bones: [] spriteID: + internalID: 4533478452115948628 vertices: [] indices: edges: [] @@ -213,10 +249,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: c9ee55bd0aefa854dad311546ced5076 + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] + nameFileIdTable: + fit: 4533478452115948628 + friend_button: 21300004 + full: 21300000 + icon: 21300006 + player_button: 21300002 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Settings/UniversalRenderPipelineAsset.asset b/Assets/Settings/UniversalRenderPipelineAsset.asset index 49a53b96..f67830dd 100644 --- a/Assets/Settings/UniversalRenderPipelineAsset.asset +++ b/Assets/Settings/UniversalRenderPipelineAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRenderPipelineAsset m_EditorClassIdentifier: - k_AssetVersion: 6 - k_AssetPreviousVersion: 5 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,9 +23,13 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 + m_StoreActionsOptimization: 0 m_SupportsHDR: 1 m_MSAA: 1 m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 2048 @@ -33,21 +37,34 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 0 m_AdditionalLightsShadowmapResolution: 512 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 + m_ReflectionProbeBlending: 0 + m_ReflectionProbeBoxProjection: 0 m_ShadowDistance: 50 m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 m_Cascade3Split: {x: 0.1, y: 0.3} m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 0 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 + m_AdditionalLightsCookieResolution: 2048 + m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightLayers: 0 m_DebugLevel: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_UseFastSRGBLinearConversion: 0 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 diff --git a/Assets/Settings/UniversalRenderPipelineAsset_Renderer.asset b/Assets/Settings/UniversalRenderPipelineAsset_Renderer.asset index 8369f155..d0242c6c 100644 --- a/Assets/Settings/UniversalRenderPipelineAsset_Renderer.asset +++ b/Assets/Settings/UniversalRenderPipelineAsset_Renderer.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0f2c1c759f67e47d8ae1bdab3b5816e7, type: 3} - m_Name: NewScreenSpaceDistortion + m_Name: ScreenSpaceDistortion m_EditorClassIdentifier: m_Active: 1 _applyToSceneView: 1 @@ -27,9 +27,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} m_Name: UniversalRenderPipelineAsset_Renderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} m_RendererFeatures: - {fileID: -7769100557704814416} m_RendererFeatureMap: b020b789349c2e94 + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: @@ -37,11 +40,14 @@ MonoBehaviour: copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - tileDepthInfoPS: {fileID: 0} - tileDeferredPS: {fileID: 0} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} + m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -57,4 +63,9 @@ MonoBehaviour: zFailOperation: 0 m_ShadowTransparentReceive: 1 m_RenderingMode: 0 + m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 + m_ClusteredRendering: 0 + m_TileSize: 32 + m_IntermediateTextureMode: 1 diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset new file mode 100644 index 00000000..a996a2e6 --- /dev/null +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -0,0 +1,27 @@ +%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: 2ec995e51a6e251468d2a3fd8a686257, type: 3} + m_Name: UniversalRenderPipelineGlobalSettings + m_EditorClassIdentifier: + k_AssetVersion: 2 + lightLayerName0: Light Layer default + lightLayerName1: Light Layer 1 + lightLayerName2: Light Layer 2 + lightLayerName3: Light Layer 3 + lightLayerName4: Light Layer 4 + lightLayerName5: Light Layer 5 + lightLayerName6: Light Layer 6 + lightLayerName7: Light Layer 7 + m_StripDebugVariants: 1 + m_StripUnusedPostProcessingVariants: 0 + m_StripUnusedVariants: 1 + supportRuntimeDebugDisplay: 0 diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset.meta b/Assets/UniversalRenderPipelineGlobalSettings.asset.meta new file mode 100644 index 00000000..9283a20c --- /dev/null +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd7078034d8ef4468bfd26b6280bb334 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index ee14dd8b..6220c25e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,13 @@ { "dependencies": { - "com.unity.collab-proxy": "1.15.1", - "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.11", - "com.unity.ide.vscode": "1.2.4", - "com.unity.render-pipelines.universal": "10.7.0", - "com.unity.test-framework": "1.1.29", + "com.unity.collab-proxy": "2.0.7", + "com.unity.ide.rider": "3.0.25", + "com.unity.ide.visualstudio": "2.0.21", + "com.unity.ide.vscode": "1.2.5", + "com.unity.render-pipelines.universal": "12.1.12", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.4.8", + "com.unity.timeline": "1.6.5", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 05b1ba75..df7cafd2 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -6,16 +6,22 @@ "source": "embedded", "dependencies": {} }, - "com.unity.collab-proxy": { - "version": "1.15.1", - "depth": 0, + "com.unity.burst": { + "version": "1.8.4", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0", - "com.unity.services.core": "1.0.1" + "com.unity.mathematics": "1.2.1" }, "url": "https://packages.unity.com" }, + "com.unity.collab-proxy": { + "version": "2.0.7", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, @@ -24,16 +30,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.25", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.11", + "version": "2.0.21", "depth": 0, "source": "registry", "dependencies": { @@ -42,76 +48,58 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.4", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.1.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", + "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "10.7.0", + "version": "12.1.12", "depth": 1, - "source": "registry", + "source": "builtin", "dependencies": { "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, "com.unity.render-pipelines.universal": { - "version": "10.7.0", + "version": "12.1.12", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.mathematics": "1.1.0", - "com.unity.render-pipelines.core": "10.7.0", - "com.unity.shadergraph": "10.7.0" - }, - "url": "https://packages.unity.com" + "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.8.4", + "com.unity.render-pipelines.core": "12.1.12", + "com.unity.shadergraph": "12.1.12" + } }, "com.unity.searcher": { - "version": "4.3.2", + "version": "4.9.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.services.core": { - "version": "1.0.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { - "version": "10.7.0", + "version": "12.1.12", "depth": 1, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "10.7.0", - "com.unity.searcher": "4.3.2" - }, - "url": "https://packages.unity.com" + "com.unity.render-pipelines.core": "12.1.12", + "com.unity.searcher": "4.9.1" + } }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -131,7 +119,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.8", + "version": "1.6.5", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 2f740db3..989d04f2 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -41,8 +41,9 @@ GraphicsSettings: - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] + m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: bf41d8c8ed3134831b238d7129721e20, type: 2} + m_CustomRenderPipeline: {fileID: 0} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 @@ -62,6 +63,10 @@ GraphicsSettings: m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 1 - m_LightsUseColorTemperature: 0 + m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 + m_SRPDefaultSettings: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: cd7078034d8ef4468bfd26b6280bb334, type: 2} + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0 diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index fac8f8dd..a28ee5a5 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 24 productGUID: 4109ff31495ed44fea5b0712f316e59b AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -121,6 +121,7 @@ PlayerSettings: switchNVNOtherPoolsGranularity: 16777216 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -145,21 +146,24 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 D3DHDRBitDepth: 0 m_ColorGamuts: 0000000003000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Standalone: com.DefaultCompany.NovaShader buildNumber: Standalone: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -174,10 +178,10 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -215,6 +219,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -375,6 +380,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -416,11 +422,13 @@ PlayerSettings: m_Automatic: 1 - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 0 m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -434,6 +442,7 @@ PlayerSettings: m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -452,6 +461,7 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -527,7 +537,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -569,6 +578,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -581,8 +591,11 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -689,18 +702,31 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: Standalone: 0 il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Lumin: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 @@ -708,7 +734,7 @@ PlayerSettings: assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: - Standalone: 3 + Standalone: 6 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_Lightweight @@ -737,6 +763,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -780,6 +807,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -787,4 +815,6 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 24993f71..cd32c298 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.23f1 -m_EditorVersionWithRevision: 2020.3.23f1 (c5d91304a876) +m_EditorVersion: 2021.3.30f1 +m_EditorVersionWithRevision: 2021.3.30f1 (b4360d7cdac4) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 0c117b03..1c50efc4 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 2 + m_CurrentQuality: 0 m_QualitySettings: - serializedVersion: 2 name: Low @@ -27,6 +27,7 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.4 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -40,7 +41,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: a31e9f9f9c9d4b9429ed0d1234e22103, type: 2} + customRenderPipeline: {fileID: 11400000, guid: bf41d8c8ed3134831b238d7129721e20, type: 2} excludedTargetPlatforms: [] - serializedVersion: 2 name: Medium @@ -63,6 +64,7 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 1 + realtimeGICPUUsage: 25 lodBias: 0.7 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -76,7 +78,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: d847b876476d3d6468f5dfcd34266f96, type: 2} + customRenderPipeline: {fileID: 11400000, guid: bf41d8c8ed3134831b238d7129721e20, type: 2} excludedTargetPlatforms: [] - serializedVersion: 2 name: High @@ -99,6 +101,7 @@ QualitySettings: realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 vSyncCount: 1 + realtimeGICPUUsage: 25 lodBias: 1 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -112,13 +115,14 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} + customRenderPipeline: {fileID: 11400000, guid: bf41d8c8ed3134831b238d7129721e20, type: 2} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 1 Lumin: 2 Nintendo Switch: 2 PS4: 2 + Server: 0 Stadia: 2 Standalone: 2 WebGL: 1 diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset new file mode 100644 index 00000000..9b28428b --- /dev/null +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: de02f9e1d18f588468e474319d09a723, type: 3} + m_Name: + m_EditorClassIdentifier: + customInterpolatorErrorThreshold: 32 + customInterpolatorWarningThreshold: 16 diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 3077404f..c1f118ad 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 4 + m_LastMaterialVersion: 5 diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config new file mode 100644 index 00000000..e69de29b diff --git a/README.md b/README.md index 827c11fb..549f33a8 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ For more information, please refer to the following documents, [Samples](Assets/ ### Requirements This library is compatible with the following environments. -* Unity 2020.3 or higher +* Unity 2021.3 or higher * Universal Render Pipeline * Shader Model 3.5 diff --git a/README_JA.md b/README_JA.md index 1f944b60..1013d5f4 100644 --- a/README_JA.md +++ b/README_JA.md @@ -87,7 +87,7 @@ #### 要件 本ライブラリは以下の環境に対応しています。 -* Unity 2020.3 以上 +* Unity 2021.3 以上 * Universal Render Pipeline * Shader Model 3.5