From aa8da156197ac66c526cfc4027627815af76d5de Mon Sep 17 00:00:00 2001 From: xLinka Date: Thu, 14 Sep 2023 13:15:56 +0100 Subject: [PATCH] Update NewToonTest.cs gwah --- NEOSPlus/Materials/Toon/NewToonTest.cs | 204 ++++++++++++------------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/NEOSPlus/Materials/Toon/NewToonTest.cs b/NEOSPlus/Materials/Toon/NewToonTest.cs index 40ca7d7..0029380 100644 --- a/NEOSPlus/Materials/Toon/NewToonTest.cs +++ b/NEOSPlus/Materials/Toon/NewToonTest.cs @@ -8,38 +8,38 @@ public class NiloToon : SingleShaderMaterialProvider { protected override Uri ShaderURL => ShaderInjection.NiloToonFork; - public readonly Sync _IsFace; - public readonly AssetRef _BaseMap; - public readonly Sync _BaseColor; - public readonly Sync _UseAlphaClipping; - public readonly Sync _Cutoff; - public readonly Sync _UseEmission; - public readonly Sync _EmissionColor; - public readonly Sync _EmissionMulByBaseColor; - public readonly AssetRef _EmissionMap; - public readonly Sync _EmissionMapChannelMask; - public readonly Sync _UseOcclusion; - public readonly Sync _OcclusionStrength; - public readonly AssetRef _OcclusionMap; - public readonly Sync _OcclusionMapChannelMask; - public readonly Sync _OcclusionRemapStart; - public readonly Sync _OcclusionRemapEnd; - public readonly Sync _IndirectLightMinColor; - public readonly Sync _IndirectLightMultiplier; - public readonly Sync _DirectLightMultiplier; - public readonly Sync _CelShadeMidPoint; - public readonly Sync _CelShadeSoftness; - public readonly Sync _MainLightIgnoreCelShade; - public readonly Sync _AdditionalLightIgnoreCelShade; - public readonly Sync _ReceiveShadowMappingAmount; - public readonly Sync _ReceiveShadowMappingPosOffset; - public readonly Sync _ShadowMapColor; - public readonly Sync _OutlineWidth; - public readonly Sync _OutlineColor; - public readonly Sync _OutlineZOffset; - public readonly AssetRef _OutlineZOffsetMaskTex; - public readonly Sync _OutlineZOffsetMaskRemapStart; - public readonly Sync _OutlineZOffsetMaskRemapEnd; + public readonly Sync IsFace; + public readonly AssetRef BaseMap; + public readonly Sync BaseColor; + public readonly Sync UseAlphaClipping; + public readonly Sync Cutoff; + public readonly Sync UseEmission; + public readonly Sync EmissionColor; + public readonly Sync EmissionMulByBaseColor; + public readonly AssetRef EmissionMap; + public readonly Sync EmissionMapChannelMask; + public readonly Sync UseOcclusion; + public readonly Sync OcclusionStrength; + public readonly AssetRef OcclusionMap; + public readonly Sync OcclusionMapChannelMask; + public readonly Sync OcclusionRemapStart; + public readonly Sync OcclusionRemapEnd; + public readonly Sync IndirectLightMinColor; + public readonly Sync IndirectLightMultiplier; + public readonly Sync DirectLightMultiplier; + public readonly Sync CelShadeMidPoint; + public readonly Sync CelShadeSoftness; + public readonly Sync MainLightIgnoreCelShade; + public readonly Sync AdditionalLightIgnoreCelShade; + public readonly Sync ReceiveShadowMappingAmount; + public readonly Sync ReceiveShadowMappingPosOffset; + public readonly Sync ShadowMapColor; + public readonly Sync OutlineWidth; + public readonly Sync OutlineColor; + public readonly Sync OutlineZOffset; + public readonly AssetRef OutlineZOffsetMaskTex; + public readonly Sync OutlineZOffsetMaskRemapStart; + public readonly Sync OutlineZOffsetMaskRemapEnd; [DefaultValue(-1)] public readonly Sync RenderQueue; @@ -50,74 +50,74 @@ public override PropertyState PropertyInitializationState get => _propertyInitializationState; protected set => _propertyInitializationState = value; } - private static MaterialProperty _IsFace = new MaterialProperty("_IsFace"); - private static MaterialProperty _BaseMap = new MaterialProperty("_BaseMap"); - private static MaterialProperty _BaseColor = new MaterialProperty("_BaseColor"); - private static MaterialProperty _UseAlphaClipping = new MaterialProperty("_UseAlphaClipping"); - private static MaterialProperty _Cutoff = new MaterialProperty("_Cutoff"); - private static MaterialProperty _UseEmission = new MaterialProperty("_UseEmission"); - private static MaterialProperty _EmissionColor = new MaterialProperty("_EmissionColor"); - private static MaterialProperty _EmissionMulByBaseColor = new MaterialProperty("_EmissionMulByBaseColor"); - private static MaterialProperty _EmissionMap = new MaterialProperty("_EmissionMap"); - private static MaterialProperty _EmissionMapChannelMask = new MaterialProperty("_EmissionMapChannelMask"); - private static MaterialProperty _UseOcclusion = new MaterialProperty("_UseOcclusion"); - private static MaterialProperty _OcclusionStrength = new MaterialProperty("_OcclusionStrength"); - private static MaterialProperty _OcclusionMap = new MaterialProperty("_OcclusionMap"); - private static MaterialProperty _OcclusionMapChannelMask = new MaterialProperty("_OcclusionMapChannelMask"); - private static MaterialProperty _OcclusionRemapStart = new MaterialProperty("_OcclusionRemapStart"); - private static MaterialProperty _OcclusionRemapEnd = new MaterialProperty("_OcclusionRemapEnd"); - private static MaterialProperty _IndirectLightMinColor = new MaterialProperty("_IndirectLightMinColor"); - private static MaterialProperty _IndirectLightMultiplier = new MaterialProperty("_IndirectLightMultiplier"); - private static MaterialProperty _DirectLightMultiplier = new MaterialProperty("_DirectLightMultiplier"); - private static MaterialProperty _CelShadeMidPoint = new MaterialProperty("_CelShadeMidPoint"); - private static MaterialProperty _CelShadeSoftness = new MaterialProperty("_CelShadeSoftness"); - private static MaterialProperty _MainLightIgnoreCelShade = new MaterialProperty("_MainLightIgnoreCelShade"); - private static MaterialProperty _AdditionalLightIgnoreCelShade = new MaterialProperty("_AdditionalLightIgnoreCelShade"); - private static MaterialProperty _ReceiveShadowMappingAmount = new MaterialProperty("_ReceiveShadowMappingAmount"); - private static MaterialProperty _ReceiveShadowMappingPosOffset = new MaterialProperty("_ReceiveShadowMappingPosOffset"); - private static MaterialProperty _ShadowMapColor = new MaterialProperty("_ShadowMapColor"); - private static MaterialProperty _OutlineWidth = new MaterialProperty("_OutlineWidth"); - private static MaterialProperty _OutlineColor = new MaterialProperty("_OutlineColor"); - private static MaterialProperty _OutlineZOffset = new MaterialProperty("_OutlineZOffset"); - private static MaterialProperty _OutlineZOffsetMaskTex = new MaterialProperty("_OutlineZOffsetMaskTex"); - private static MaterialProperty _OutlineZOffsetMaskRemapStart = new MaterialProperty("_OutlineZOffsetMaskRemapStart"); - private static MaterialProperty _OutlineZOffsetMaskRemapEnd = new MaterialProperty("_OutlineZOffsetMaskRemapEnd"); + private static MaterialProperty IsFace = new MaterialProperty("_IsFace"); + private static MaterialProperty BaseMap = new MaterialProperty("_BaseMap"); + private static MaterialProperty BaseColor = new MaterialProperty("_BaseColor"); + private static MaterialProperty UseAlphaClipping = new MaterialProperty("_UseAlphaClipping"); + private static MaterialProperty Cutoff = new MaterialProperty("_Cutoff"); + private static MaterialProperty UseEmission = new MaterialProperty("_UseEmission"); + private static MaterialProperty EmissionColor = new MaterialProperty("_EmissionColor"); + private static MaterialProperty EmissionMulByBaseColor = new MaterialProperty("_EmissionMulByBaseColor"); + private static MaterialProperty EmissionMap = new MaterialProperty("_EmissionMap"); + private static MaterialProperty EmissionMapChannelMask = new MaterialProperty("_EmissionMapChannelMask"); + private static MaterialProperty UseOcclusion = new MaterialProperty("_UseOcclusion"); + private static MaterialProperty OcclusionStrength = new MaterialProperty("_OcclusionStrength"); + private static MaterialProperty OcclusionMap = new MaterialProperty("_OcclusionMap"); + private static MaterialProperty OcclusionMapChannelMask = new MaterialProperty("_OcclusionMapChannelMask"); + private static MaterialProperty OcclusionRemapStart = new MaterialProperty("_OcclusionRemapStart"); + private static MaterialProperty OcclusionRemapEnd = new MaterialProperty("_OcclusionRemapEnd"); + private static MaterialProperty IndirectLightMinColor = new MaterialProperty("_IndirectLightMinColor"); + private static MaterialProperty IndirectLightMultiplier = new MaterialProperty("_IndirectLightMultiplier"); + private static MaterialProperty DirectLightMultiplier = new MaterialProperty("_DirectLightMultiplier"); + private static MaterialProperty CelShadeMidPoint = new MaterialProperty("_CelShadeMidPoint"); + private static MaterialProperty CelShadeSoftness = new MaterialProperty("_CelShadeSoftness"); + private static MaterialProperty MainLightIgnoreCelShade = new MaterialProperty("_MainLightIgnoreCelShade"); + private static MaterialProperty AdditionalLightIgnoreCelShade = new MaterialProperty("_AdditionalLightIgnoreCelShade"); + private static MaterialProperty ReceiveShadowMappingAmount = new MaterialProperty("_ReceiveShadowMappingAmount"); + private static MaterialProperty ReceiveShadowMappingPosOffset = new MaterialProperty("_ReceiveShadowMappingPosOffset"); + private static MaterialProperty ShadowMapColor = new MaterialProperty("_ShadowMapColor"); + private static MaterialProperty OutlineWidth = new MaterialProperty("_OutlineWidth"); + private static MaterialProperty OutlineColor = new MaterialProperty("_OutlineColor"); + private static MaterialProperty OutlineZOffset = new MaterialProperty("_OutlineZOffset"); + private static MaterialProperty OutlineZOffsetMaskTex = new MaterialProperty("_OutlineZOffsetMaskTex"); + private static MaterialProperty OutlineZOffsetMaskRemapStart = new MaterialProperty("_OutlineZOffsetMaskRemapStart"); + private static MaterialProperty OutlineZOffsetMaskRemapEnd = new MaterialProperty("_OutlineZOffsetMaskRemapEnd"); protected override void UpdateMaterial(Material material) { - material.UpdateFloat(_IsFace, _IsFace); - material.UpdateTexture(_BaseMap, _BaseMap); - material.UpdateColor(_BaseColor, _BaseColor); - material.UpdateFloat(_UseAlphaClipping, _UseAlphaClipping); - material.UpdateFloat(_Cutoff, _Cutoff); - material.UpdateFloat(_UseEmission, _UseEmission); - material.UpdateColor(_EmissionColor, _EmissionColor); - material.UpdateFloat(_EmissionMulByBaseColor, _EmissionMulByBaseColor); - material.UpdateTexture(_EmissionMap, _EmissionMap); - material.UpdateVector(_EmissionMapChannelMask, _EmissionMapChannelMask); - material.UpdateFloat(_UseOcclusion, _UseOcclusion); - material.UpdateFloat(_OcclusionStrength, _OcclusionStrength); - material.UpdateTexture(_OcclusionMap, _OcclusionMap); - material.UpdateVector(_OcclusionMapChannelMask, _OcclusionMapChannelMask); - material.UpdateFloat(_OcclusionRemapStart, _OcclusionRemapStart); - material.UpdateFloat(_OcclusionRemapEnd, _OcclusionRemapEnd); - material.UpdateColor(_IndirectLightMinColor, _IndirectLightMinColor); - material.UpdateFloat(_IndirectLightMultiplier, _IndirectLightMultiplier); - material.UpdateFloat(_DirectLightMultiplier, _DirectLightMultiplier); - material.UpdateFloat(_CelShadeMidPoint, _CelShadeMidPoint); - material.UpdateFloat(_CelShadeSoftness, _CelShadeSoftness); - material.UpdateFloat(_MainLightIgnoreCelShade, _MainLightIgnoreCelShade); - material.UpdateFloat(_AdditionalLightIgnoreCelShade, _AdditionalLightIgnoreCelShade); - material.UpdateFloat(_ReceiveShadowMappingAmount, _ReceiveShadowMappingAmount); - material.UpdateFloat(_ReceiveShadowMappingPosOffset, _ReceiveShadowMappingPosOffset); - material.UpdateColor(_ShadowMapColor, _ShadowMapColor); - material.UpdateFloat(_OutlineWidth, _OutlineWidth); - material.UpdateColor(_OutlineColor, _OutlineColor); - material.UpdateFloat(_OutlineZOffset, _OutlineZOffset); - material.UpdateTexture(_OutlineZOffsetMaskTex, _OutlineZOffsetMaskTex); - material.UpdateFloat(_OutlineZOffsetMaskRemapStart, _OutlineZOffsetMaskRemapStart); - material.UpdateFloat(_OutlineZOffsetMaskRemapEnd, _OutlineZOffsetMaskRemapEnd); + material.UpdateFloat(IsFace, _IsFace); + material.UpdateTexture(BaseMap, _BaseMap); + material.UpdateColor(BaseColor, _BaseColor); + material.UpdateFloat(UseAlphaClipping, _UseAlphaClipping); + material.UpdateFloat(Cutoff, _Cutoff); + material.UpdateFloat(UseEmission, _UseEmission); + material.UpdateColor(EmissionColor, _EmissionColor); + material.UpdateFloat(EmissionMulByBaseColor, _EmissionMulByBaseColor); + material.UpdateTexture(EmissionMap, _EmissionMap); + material.UpdateVector(EmissionMapChannelMask, _EmissionMapChannelMask); + material.UpdateFloat(UseOcclusion, _UseOcclusion); + material.UpdateFloat(OcclusionStrength, _OcclusionStrength); + material.UpdateTexture(OcclusionMap, _OcclusionMap); + material.UpdateVector(OcclusionMapChannelMask, _OcclusionMapChannelMask); + material.UpdateFloat(OcclusionRemapStart, _OcclusionRemapStart); + material.UpdateFloat(OcclusionRemapEnd, _OcclusionRemapEnd); + material.UpdateColor(IndirectLightMinColor, _IndirectLightMinColor); + material.UpdateFloat(IndirectLightMultiplier, _IndirectLightMultiplier); + material.UpdateFloat(DirectLightMultiplier, _DirectLightMultiplier); + material.UpdateFloat(CelShadeMidPoint, _CelShadeMidPoint); + material.UpdateFloat(CelShadeSoftness, _CelShadeSoftness); + material.UpdateFloat(MainLightIgnoreCelShade, _MainLightIgnoreCelShade); + material.UpdateFloat(AdditionalLightIgnoreCelShade, _AdditionalLightIgnoreCelShade); + material.UpdateFloat(ReceiveShadowMappingAmount, _ReceiveShadowMappingAmount); + material.UpdateFloat(ReceiveShadowMappingPosOffset, _ReceiveShadowMappingPosOffset); + material.UpdateColor(ShadowMapColor, _ShadowMapColor); + material.UpdateFloat(OutlineWidth, _OutlineWidth); + material.UpdateColor(OutlineColor, _OutlineColor); + material.UpdateFloat(OutlineZOffset, _OutlineZOffset); + material.UpdateTexture(OutlineZOffsetMaskTex, _OutlineZOffsetMaskTex); + material.UpdateFloat(OutlineZOffsetMaskRemapStart, _OutlineZOffsetMaskRemapStart); + material.UpdateFloat(OutlineZOffsetMaskRemapEnd, _OutlineZOffsetMaskRemapEnd); if (!RenderQueue.GetWasChangedAndClear()) return; var renderQueue = RenderQueue.Value; @@ -128,12 +128,12 @@ protected override void UpdateMaterial(Material material) protected override void OnAttach() { base.OnAttach(); - _IsFace.Value = 0.0f; - _Cutoff.Value = 0.5f; - _UseEmission.Value = 0.0f; - _UseOcclusion.Value = 0.0f; - _OutlineWidth.Value = 1.0f; - _OutlineZOffset.Value = 0.0001f; + IsFace.Value = 0.0f; + Cutoff.Value = 0.5f; + UseEmission.Value = 0.0f; + UseOcclusion.Value = 0.0f; + OutlineWidth.Value = 1.0f; + OutlineZOffset.Value = 0.0001f; RenderQueue.Value = -1; }