Misaki/com.misaki.hdrp-toon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Updated namespace;

Browse Source 
Added UTSPass;
Chnaged the RTHanlde _HairShadowMap to not reallocate when screen resolution decreased;
This commit is contained in:
Misaki
2025-01-08 22:19:04 +09:00
parent 23862b4380
commit a7a9ad16b5
33 changed files with 457 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
Runtime/ModelToonEvAdjustment.cs
View File

@@ -1,22 +1,15 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
#if UNITY_EDITOR
using UnityEditor;
#endif
using UnityEngine.Rendering;
using UnityEngine.Experimental.Rendering;
using UnityObject = UnityEngine.Object;
using System.Linq;
namespace Unity.Rendering.Toon
namespace Misaki.HdrpToon
{
[ExecuteAlways]
[DisallowMultipleComponent]
[UTSHelpURL("ToonEVAdjustment")]
internal class ModelToonEvAdjustment : MonoBehaviour
public class ModelToonEvAdjustment : MonoBehaviour
{
const string kCompensationPorpName = "_ToonEvAdjustmentCompensation";
const string kExposureAdjustmentPropName = "_ToonEvAdjustmentCurve";
@@ -31,30 +24,20 @@ namespace Unity.Rendering.Toon
const int kAdjustmentCurvePrecision = 128;
[SerializeField]
internal bool m_ToonLightHiCutFilter = false;
[SerializeField]
internal bool m_ExposureAdjustmnt = false;
[SerializeField]
internal bool m_IgnorVolumeExposure = false;
[SerializeField]
internal AnimationCurve m_AnimationCurve = DefaultAnimationCurve();
[SerializeField]
internal float[] m_ExposureArray;
[SerializeField]
internal float m_Max, m_Min;
[SerializeField]
internal float m_Compensation;
public bool m_ToonLightHiCutFilter = false;
public bool m_ExposureAdjustmnt = false;
public bool m_IgnorVolumeExposure = false;
public AnimationCurve m_AnimationCurve = DefaultAnimationCurve();
public float[] m_ExposureArray;
public float m_Max, m_Min;
public float m_Compensation;
internal GameObject[] m_Objs;
[SerializeField]
// [HideInInspector]
// [HideInInspector]
Renderer[] m_Renderers;
[SerializeField]
// [HideInInspector]
// [HideInInspector]
MaterialPropertyBlock[] m_MaterialPropertyBlocks;
#if UNITY_EDITOR
@@ -111,16 +94,16 @@ namespace Unity.Rendering.Toon
m_Min = 0f;
m_Max = 0f;
for (int i = 0; i < kAdjustmentCurvePrecision; i++)
for (var i = 0; i < kAdjustmentCurvePrecision; i++)
m_ExposureArray[i] = 0.0f;
}
else
{
m_Min = curve[0].time;
m_Max = curve[curve.length - 1].time;
float step = (m_Max - m_Min) / (kAdjustmentCurvePrecision - 1f);
var step = (m_Max - m_Min) / (kAdjustmentCurvePrecision - 1f);
for (int i = 0; i < kAdjustmentCurvePrecision; i++)
for (var i = 0; i < kAdjustmentCurvePrecision; i++)
m_ExposureArray[i] = curve.Evaluate(m_Min + step * i);
}
@@ -143,8 +126,8 @@ namespace Unity.Rendering.Toon
int length = m_Renderers.Length;
for (int ii = 0; ii < length; ii++)
var length = m_Renderers.Length;
for (var ii = 0; ii < length; ii++)
{
m_Renderers[ii].GetPropertyBlock(m_MaterialPropertyBlocks[ii]);
@@ -209,13 +192,13 @@ namespace Unity.Rendering.Toon
m_Objs = new GameObject[1];
m_Objs[0] = this.gameObject;
}
int objCount = m_Objs.Length;
int rendererCount = 0;
var objCount = m_Objs.Length;
var rendererCount = 0;
List<Renderer> rendererList = new List<Renderer>();
for (int ii = 0; ii < objCount; ii++)
var rendererList = new List<Renderer>();
for (var ii = 0; ii < objCount; ii++)
{
if (m_Objs[ii] == null )
if (m_Objs[ii] == null)
{
continue;
}
@@ -227,20 +210,20 @@ namespace Unity.Rendering.Toon
rendererCount++;
rendererList.Add(renderer);
}
GameObject[] childGameObjects = m_Objs[ii].GetComponentsInChildren<Transform>().Select(t => t.gameObject).ToArray();
int childCount = childGameObjects.Length;
for (int jj = 0; jj < childCount; jj++)
var childGameObjects = m_Objs[ii].GetComponentsInChildren<Transform>().Select(t => t.gameObject).ToArray();
var childCount = childGameObjects.Length;
for (var jj = 0; jj < childCount; jj++)
{
if (m_Objs[ii] == childGameObjects[jj])
continue;
var modelToonEvAdjustment = childGameObjects[jj].GetComponent<ModelToonEvAdjustment>();
if ( modelToonEvAdjustment != null )
if (modelToonEvAdjustment != null)
{
break;
}
renderer = childGameObjects[jj].GetComponent<Renderer>();
if ( renderer != null )
if (renderer != null)
{
rendererList.Add(renderer);
rendererCount++;
@@ -249,12 +232,12 @@ namespace Unity.Rendering.Toon
}
if (rendererCount != 0)
{
m_MaterialPropertyBlocks = new MaterialPropertyBlock[rendererCount];
m_Renderers = rendererList.ToArray();
for (int ii = 0; ii < rendererCount; ii++)
for (var ii = 0; ii < rendererCount; ii++)
{
m_MaterialPropertyBlocks[ii] = new MaterialPropertyBlock();
}
@@ -272,10 +255,10 @@ namespace Unity.Rendering.Toon
if (m_initialized)
{
m_ExposureArray = null;
if (m_Renderers != null )
if (m_Renderers != null)
{
int length = m_Renderers.Length;
for (int ii = 0; ii < length; ii++)
var length = m_Renderers.Length;
for (var ii = 0; ii < length; ii++)
{
m_Renderers[ii].SetPropertyBlock(null);
}