Temp FIN
This commit is contained in:
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/CharacterScreenSpaceShadowPass.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/CharacterShadowPass.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/CharacterShadowUtils.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/OITDepthPass.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -262,8 +262,8 @@ namespace PotaToon
|
||||
private void SetupGraphicsBuffers(int width, int height)
|
||||
{
|
||||
Release();
|
||||
screenWidth = width; // * 2
|
||||
screenHeight = height; // * 2
|
||||
screenWidth = width * 2;
|
||||
screenHeight = height * 2;
|
||||
|
||||
int bufferSize = Mathf.Max(screenWidth * screenHeight * MAX_SORTED_PIXELS, 1);
|
||||
int bufferStride = sizeof(uint) * 3;
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/OITPass.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/OITPreRenderPass.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/PotaToon.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -39,6 +39,7 @@ namespace PotaToon
|
||||
private static class ShaderPassStrings
|
||||
{
|
||||
public const string OpaqueOutline = "SRPDefaultUnlit";
|
||||
public const string TransparentOutline = "TransparentOutline";
|
||||
public const string UniversalForward = "UniversalForward";
|
||||
public const string OpaqueDitherFade = "OpaqueDitherFade";
|
||||
public const string OpaqueDitherFadeOutline = "OpaqueDitherFadeOutline";
|
||||
@@ -132,7 +133,6 @@ namespace PotaToon
|
||||
}
|
||||
|
||||
ResetDitherFadeProperties();
|
||||
|
||||
FindHead();
|
||||
}
|
||||
|
||||
@@ -478,7 +478,11 @@ namespace PotaToon
|
||||
foreach (var material in allMaterials)
|
||||
{
|
||||
if (material != null && material.HasProperty(PropertyIDs._OutlineWidth))
|
||||
material.SetShaderPassEnabled(ShaderPassStrings.OpaqueOutline, material.GetFloat(PropertyIDs._OutlineWidth) > 0f);
|
||||
{
|
||||
var outlineActive = material.GetFloat(PropertyIDs._OutlineWidth) > 0f;
|
||||
material.SetShaderPassEnabled(ShaderPassStrings.OpaqueOutline, outlineActive && material.renderQueue <= 2500);
|
||||
material.SetShaderPassEnabled(ShaderPassStrings.TransparentOutline, outlineActive);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/PotaToonCharacter.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -4,6 +4,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/PotaToonDitherFadePass.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -4,6 +4,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/PotaToonDrawCharBufferPass.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -15,6 +15,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/PotaToonFeature.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/PotaToonPostProcessPass.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/PotaToonPostProcessUtils.cs
|
||||
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/Runtime/Scripts/RenderingUtilsFor2021.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/ShaderIDs.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/ToonCharacterShadow.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 316069
|
||||
packageName: PotaToon
|
||||
packageVersion: 1.3.6
|
||||
packageVersion: 1.3.7
|
||||
assetPath: Assets/PotaToon/Runtime/Scripts/TransparentShadowPass.cs
|
||||
uploadId: 814994
|
||||
uploadId: 827176
|
||||
|
||||
Reference in New Issue
Block a user