Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/alelievr/HDRP-Custom-Passes
Browse files Browse the repository at this point in the history 
# Conflicts:
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Black Metal_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Black Plastic_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Black_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/BlueWindow_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Blue_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/BrownDark_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/BrownLight_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Brown_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/DarkBlue_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/DarkCyan_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/DarkGray_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/DarkerGray_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/DeepBlue_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Gold_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Gray_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/GreenBlack_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/GreenDark_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Green_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Khaki Damp.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Khaki Dark.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Khaki Darker.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Khaki_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/LightBlue_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/LightGray_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Machine Blue Dark_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Machine Blue Light_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Machine Blue_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Machine Green Dark_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Machine Green Light_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Machine Green_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Machine Orange Dark_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Machine Orange Light_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/MachineOrange_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Orange_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Red_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/White_snaps002.mat
#	Assets/AssetStoreOriginals/_SNAPS_PrototypingAssets/SciFi_Industrial/Materials/Yellow_snaps002.mat
#	Assets/CustomPasses/AR/MilkBox.mat
#	Assets/CustomPasses/Glass/DepthBase.mat
#	Assets/CustomPasses/Glitch/Glitch.mat
#	Assets/CustomPasses/Glitch/Shader Graphs_Test.mat
#	Assets/CustomPasses/Liquid/NormalTestFX.vfx
#	Assets/CustomPasses/Liquid/Shader Graphs_ScreenSpaceDebugNormal.mat
#	Assets/CustomPasses/Liquid/Shader Graphs_ScreenSpaceWater.mat
#	Assets/CustomPasses/Liquid/Shader Graphs_ScreenSpaceWater_Glowing.mat
#	Assets/CustomPasses/Liquid/Shader Graphs_ScreenSpaceWater_White.mat
#	Assets/CustomPasses/Liquid/Shader Graphs_UnlitNormal.mat
#	Assets/CustomPasses/Liquid/TransparentTest 1.mat
#	Assets/CustomPasses/Liquid/TransparentTest.mat
#	Assets/CustomPasses/SeeThrough/SeeThroughExample.mat
#	Assets/CustomPasses/TIPS/Resources/Shader Graphs_TIPS_Effect 2.mat
#	Assets/CustomPasses/TIPS/Resources/Shader Graphs_TIPS_Effect.mat
#	Assets/CustomPasses/TIPS/Resources/test.mat
#	Assets/CustomPasses/UI_Blur/UI_Blur.cs
#	Assets/HDRPDefaultResources/HDRenderPipelineAsset.asset
#	Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset
#	Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta
#	Assets/Materials/Blue.mat
#	Assets/Materials/Floor.mat
#	Assets/Materials/Red.mat
#	Assets/Materials/TestPattern.mat
#	Assets/Materials/Transparent.mat
#	Assets/Materials/UI Video.mat
#	Assets/Scenes/Glass/LucyGlass.mat
#	Assets/Scenes/Glass/LucyGlassRef.mat
#	Assets/Scenes/Tests/Test.vfx
#	Assets/Scenes/Tests/Tests_Refraction/BeforeRefraction.mat
#	Assets/Scenes/Tests/Tests_Refraction/Chrome.mat
#	Assets/Scenes/Tests/Tests_Refraction/Opaque.mat
#	Assets/Scenes/Tests/Tests_Refraction/Refraction.mat
#	Assets/Scenes/Tests/Tests_Refraction/Water.mat
#	Logs/AssetImportWorker0.log
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/GraphicsSettings.asset
#	ProjectSettings/Packages/com.unity.probuilder/Settings.json
#	UserSettings/EditorUserSettings.asset
  • Loading branch information
@alelievr
alelievr committed Nov 17, 2021
2 parents e100d59 6edd141 commit c6ab09b
Show file tree
Hide file tree
Showing 87 changed files with 4,775 additions and 1,633 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 35,5 @@ sysinfo.txt
# Builds
*.apk
*.unitypackage
UserSettings
Logs
3 changes: 2 additions & 1 deletion Assets/AssetStoreOriginals/Lamps/Materials/UnlitEmissiveWhite.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 156,7 @@ Material:
- _DistortionVectorBias: -1
- _DistortionVectorScale: 2
- _DoubleSidedEnable: 0
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 1
- _DstBlend: 0
- _EmissiveColorMode: 1
Expand Down Expand Up @@ -239,7 240,7 @@ Material:
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 3.482202, g: 3.482202, b: 3.482202, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
Expand Down
Loading

0 comments on commit c6ab09b

Please sign in to comment.