Temp FIN
This commit is contained in:
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/ChracterShadow/CharacterShadowDepthPass.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/ChracterShadow/CharacterShadowInput.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/ChracterShadow/CharacterShadowTransforms.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/ChracterShadow/DeclareCharacterShadowTexture.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/ChracterShadow/ScreenSpaceCharacterShadows.shader
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/ChracterShadow/ToonCharacterShadow.cs.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/ChracterShadow/TransparentShadowPass.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/Common/PotaToonCommon.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/Common/PotaToonGlobalInput.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/OIT/LinkedListCreation.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/OIT/LinkedListRendering.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -11,6 +11,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/OIT/OITFullscreenRender.shader
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/OIT/OITOutlineUtils.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
// Unity's HLSL seems not to support dynamic array size, so we can only set this before compilation
|
||||
#define MAX_SORTED_PIXELS 8
|
||||
#define POW_2_24 16777216
|
||||
|
||||
//https://github.com/GameTechDev/AOIT-Update/blob/master/OIT_DX11/AOIT%20Technique/AOIT.hlsl
|
||||
// UnpackRGBA takes a uint value and converts it to a float4
|
||||
@@ -27,7 +28,7 @@ uint PackRGBA(float4 unpackedInput)
|
||||
}
|
||||
|
||||
float UnpackDepth(uint uDepthSampleIdx) {
|
||||
return (float)(uDepthSampleIdx >> 8UL) / (pow(2, 24) - 1);
|
||||
return (float)(uDepthSampleIdx >> 8UL) / (POW_2_24 - 1);
|
||||
}
|
||||
|
||||
uint UnpackSampleIdx(uint uDepthSampleIdx) {
|
||||
@@ -35,7 +36,7 @@ uint UnpackSampleIdx(uint uDepthSampleIdx) {
|
||||
}
|
||||
|
||||
uint PackDepthSampleIdx(float depth, uint uSampleIdx) {
|
||||
uint d = (uint)(saturate(depth) * (pow(2, 24) - 1));
|
||||
uint d = (uint)(saturate(depth) * (POW_2_24 - 1));
|
||||
return d << 8UL | uSampleIdx;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/OIT/OitUtils.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PostProcessing/PotaToonBlit.shader
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PostProcessing/PotaToonBloom.shader
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PostProcessing/PotaToonScreenPostPasses.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PostProcessing/PotaToonToneMapping.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -11,6 +11,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PostProcessing/PotaToonUberPost.shader
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PostProcessing/PotaToonUtilsFor2021.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -11,6 +11,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/Eye/PotaToonEye.shader
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/Eye/PotaToonEyeForwardKeywords.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/Eye/PotaToonEyeInput.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/Eye/PotaToonEyePass.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -58,56 +58,56 @@ Shader "PotaToon/Toon"
|
||||
// MatCap
|
||||
[Enum(None, 0, Add, 1, Multiply, 2)] _MatCapMode ("MatCap Mode", Int) = 0
|
||||
[HDR] _MatCapColor ("MatCap Color", Color) = (1,1,1,1)
|
||||
_MatCapTex ("MatCap Tex", 2D) = "black" {}
|
||||
_MatCapTex ("MatCap Tex", 2D) = "white" {}
|
||||
_MatCapMask ("MatcapMask", 2D) = "white" {}
|
||||
_MatCapWeight ("Matcap Weight", Range(0, 1)) = 1
|
||||
_MatCapLightingDimmer ("Matcap Lighting Dimmer", Range(0, 1)) = 1
|
||||
|
||||
[Enum(None, 0, Add, 1, Multiply, 2)] _MatCapMode2 ("MatCap2 Mode", Int) = 0
|
||||
[HDR] _MatCapColor2 ("MatCap2 Color", Color) = (1,1,1,1)
|
||||
_MatCapTex2 ("MatCap Tex2", 2D) = "black" {}
|
||||
_MatCapTex2 ("MatCap Tex2", 2D) = "white" {}
|
||||
_MatCapMask2 ("MatcapMask2", 2D) = "white" {}
|
||||
_MatCapWeight2 ("Matcap Weight2", Range(0, 1)) = 1
|
||||
_MatCapLightingDimmer2 ("Matcap Lighting Dimmer2", Range(0, 1)) = 1
|
||||
|
||||
[Enum(None, 0, Add, 1, Multiply, 2)] _MatCapMode3 ("MatCap3 Mode", Int) = 0
|
||||
[HDR] _MatCapColor3 ("MatCap2 Color", Color) = (1,1,1,1)
|
||||
_MatCapTex3 ("MatCap Tex3", 2D) = "black" {}
|
||||
_MatCapTex3 ("MatCap Tex3", 2D) = "white" {}
|
||||
_MatCapMask3 ("MatcapMask3", 2D) = "white" {}
|
||||
_MatCapWeight3 ("Matcap Weight3", Range(0, 1)) = 1
|
||||
_MatCapLightingDimmer3 ("Matcap Lighting Dimmer3", Range(0, 1)) = 1
|
||||
|
||||
[Enum(None, 0, Add, 1, Multiply, 2)] _MatCapMode4 ("MatCap4 Mode", Int) = 0
|
||||
[HDR] _MatCapColor4 ("MatCap4 Color", Color) = (1,1,1,1)
|
||||
_MatCapTex4 ("MatCap Tex4", 2D) = "black" {}
|
||||
_MatCapTex4 ("MatCap Tex4", 2D) = "white" {}
|
||||
_MatCapMask4 ("MatcapMask4", 2D) = "white" {}
|
||||
_MatCapWeight4 ("Matcap Weight4", Range(0, 1)) = 1
|
||||
_MatCapLightingDimmer4 ("Matcap Lighting Dimmer4", Range(0, 1)) = 1
|
||||
|
||||
[Enum(None, 0, Add, 1, Multiply, 2)] _MatCapMode5 ("MatCap5 Mode", Int) = 0
|
||||
[HDR] _MatCapColor5 ("MatCap5 Color", Color) = (1,1,1,1)
|
||||
_MatCapTex5 ("MatCap Tex5", 2D) = "black" {}
|
||||
_MatCapTex5 ("MatCap Tex5", 2D) = "white" {}
|
||||
_MatCapMask5 ("MatcapMask5", 2D) = "white" {}
|
||||
_MatCapWeight5 ("Matcap Weight5", Range(0, 1)) = 1
|
||||
_MatCapLightingDimmer5 ("Matcap Lighting Dimmer5", Range(0, 1)) = 1
|
||||
|
||||
[Enum(None, 0, Add, 1, Multiply, 2)] _MatCapMode6 ("MatCap6 Mode", Int) = 0
|
||||
[HDR] _MatCapColor6 ("MatCap6 Color", Color) = (1,1,1,1)
|
||||
_MatCapTex6 ("MatCap Tex6", 2D) = "black" {}
|
||||
_MatCapTex6 ("MatCap Tex6", 2D) = "white" {}
|
||||
_MatCapMask6 ("MatcapMask6", 2D) = "white" {}
|
||||
_MatCapWeight6 ("Matcap Weight6", Range(0, 1)) = 1
|
||||
_MatCapLightingDimmer6 ("Matcap Lighting Dimmer6", Range(0, 1)) = 1
|
||||
|
||||
[Enum(None, 0, Add, 1, Multiply, 2)] _MatCapMode7 ("MatCap7 Mode", Int) = 0
|
||||
[HDR] _MatCapColor7 ("MatCap7 Color", Color) = (1,1,1,1)
|
||||
_MatCapTex7 ("MatCap Tex7", 2D) = "black" {}
|
||||
_MatCapTex7 ("MatCap Tex7", 2D) = "white" {}
|
||||
_MatCapMask7 ("MatcapMask7", 2D) = "white" {}
|
||||
_MatCapWeight7 ("Matcap Weight7", Range(0, 1)) = 1
|
||||
_MatCapLightingDimmer7 ("Matcap Lighting Dimmer7", Range(0, 1)) = 1
|
||||
|
||||
[Enum(None, 0, Add, 1, Multiply, 2)] _MatCapMode8 ("MatCap8 Mode", Int) = 0
|
||||
[HDR] _MatCapColor8 ("MatCap8 Color", Color) = (1,1,1,1)
|
||||
_MatCapTex8 ("MatCap Tex8", 2D) = "black" {}
|
||||
_MatCapTex8 ("MatCap Tex8", 2D) = "white" {}
|
||||
_MatCapMask8 ("MatcapMask8", 2D) = "white" {}
|
||||
_MatCapWeight8 ("Matcap Weight8", Range(0, 1)) = 1
|
||||
_MatCapLightingDimmer8 ("Matcap Lighting Dimmer8", Range(0, 1)) = 1
|
||||
@@ -161,7 +161,7 @@ Shader "PotaToon/Toon"
|
||||
|
||||
// Face SDF
|
||||
[HideInInspector] [Toggle] _UseFaceSDFShadow ("_UseFaceSDFShadow", Int) = 0
|
||||
_FaceSDFTex ("Face SDF", 2D) = "white" {}
|
||||
_FaceSDFTex ("Face SDF", 2D) = "black" {}
|
||||
[Toggle] _SDFReverse("Reverse Face SDF", Int) = 0
|
||||
_SDFOffset("SDF_Offset", Range(-0.5, 0.5)) = 0
|
||||
_SDFBlur("SDF_Blur", Range(0, 1)) = 0
|
||||
|
||||
@@ -11,6 +11,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/PotaToon.shader
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/PotaToonCharMaskPass.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/PotaToonForwardKeywords.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/PotaToonInput.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/PotaToonLighting.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -5,6 +5,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/PotaToonOutlineKeywords.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/PotaToonOutlinePass.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/PotaToonPass.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Shaders/PotaToon/PotaToonUtility.hlsl
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
Reference in New Issue
Block a user