feat: add TransitionTexSpeed option

This commit is contained in:
mob-sakai
2025-03-11 19:43:33 +09:00
parent de918718d0
commit 6b8dc5ec33
4 changed files with 31 additions and 1 deletions
+8
View File
@@ -48,6 +48,7 @@ namespace Coffee.UIEffects.Editors
private SerializedProperty _transitionTex;
private SerializedProperty _transitionTexScale;
private SerializedProperty _transitionTexOffset;
private SerializedProperty _transitionTexSpeed;
private SerializedProperty _transitionReverse;
private SerializedProperty _transitionRotation;
private SerializedProperty _transitionKeepAspectRatio;
@@ -131,6 +132,7 @@ namespace Coffee.UIEffects.Editors
_transitionTex = serializedObject.FindProperty("m_TransitionTex");
_transitionTexScale = serializedObject.FindProperty("m_TransitionTexScale");
_transitionTexOffset = serializedObject.FindProperty("m_TransitionTexOffset");
_transitionTexSpeed = serializedObject.FindProperty("m_TransitionTexSpeed");
_transitionReverse = serializedObject.FindProperty("m_TransitionReverse");
_transitionRotation = serializedObject.FindProperty("m_TransitionRotation");
_transitionKeepAspectRatio = serializedObject.FindProperty("m_TransitionKeepAspectRatio");
@@ -247,6 +249,12 @@ namespace Coffee.UIEffects.Editors
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(_transitionTexScale, EditorGUIUtility.TrTempContent("Scale"));
EditorGUILayout.PropertyField(_transitionTexOffset, EditorGUIUtility.TrTempContent("Offset"));
EditorGUILayout.PropertyField(_transitionTexSpeed, EditorGUIUtility.TrTempContent("Speed"));
if (_transitionTexSpeed.vector2Value != Vector2.zero)
{
EditorApplication.QueuePlayerLoopUpdate();
}
EditorGUILayout.PropertyField(_transitionRotation, EditorGUIUtility.TrTempContent("Rotation"));
EditorGUILayout.PropertyField(_transitionKeepAspectRatio,
EditorGUIUtility.TrTempContent("Keep Aspect Ratio"));
+17
View File
@@ -67,6 +67,9 @@ namespace Coffee.UIEffects
[SerializeField]
protected Vector2 m_TransitionTexOffset = new Vector2(0, 0);
[SerializeField]
protected Vector2 m_TransitionTexSpeed = new Vector2(0, 0);
[SerializeField]
[Range(0, 360)]
private float m_TransitionRotation = 0;
@@ -432,6 +435,17 @@ namespace Coffee.UIEffects
}
}
public Vector2 transitionTextureSpeed
{
get => m_TransitionTexSpeed;
set
{
if (m_TransitionTexSpeed == value) return;
context.transitionTexSpeed = m_TransitionTexSpeed = value;
SetMaterialDirty();
}
}
public float transitionRotation
{
get => m_TransitionRotation;
@@ -1039,6 +1053,7 @@ namespace Coffee.UIEffects
c.transitionTex = m_TransitionTex;
c.transitionTexScale = m_TransitionTexScale;
c.transitionTexOffset = m_TransitionTexOffset;
c.transitionTexSpeed = m_TransitionTexSpeed;
c.transitionRotation = m_TransitionRotation;
c.transitionKeepAspectRatio = m_TransitionKeepAspectRatio;
c.transitionWidth = m_TransitionWidth;
@@ -1212,6 +1227,7 @@ namespace Coffee.UIEffects
m_TransitionTex = preset.m_TransitionTex;
m_TransitionTexScale = preset.m_TransitionTexScale;
m_TransitionTexOffset = preset.m_TransitionTexOffset;
m_TransitionTexSpeed = preset.m_TransitionTexSpeed;
m_TransitionRotation = preset.m_TransitionRotation;
m_TransitionKeepAspectRatio = preset.m_TransitionKeepAspectRatio;
m_TransitionWidth = preset.m_TransitionWidth;
@@ -1306,6 +1322,7 @@ namespace Coffee.UIEffects
m_TransitionTex = c.transitionTex;
m_TransitionTexScale = c.transitionTexScale;
m_TransitionTexOffset = c.transitionTexOffset;
m_TransitionTexSpeed = c.transitionTexSpeed;
m_TransitionRotation = c.transitionRotation;
m_TransitionKeepAspectRatio = c.transitionKeepAspectRatio;
m_TransitionWidth = c.transitionWidth;
+4
View File
@@ -26,6 +26,7 @@ namespace Coffee.UIEffects
private static readonly int s_TransitionReverse = Shader.PropertyToID("_TransitionReverse");
private static readonly int s_TransitionTex = Shader.PropertyToID("_TransitionTex");
private static readonly int s_TransitionTex_ST = Shader.PropertyToID("_TransitionTex_ST");
private static readonly int s_TransitionTex_Speed = Shader.PropertyToID("_TransitionTex_Speed");
private static readonly int s_TransitionWidth = Shader.PropertyToID("_TransitionWidth");
private static readonly int s_TransitionSoftness = Shader.PropertyToID("_TransitionSoftness");
private static readonly int s_TransitionRange = Shader.PropertyToID("_TransitionRange");
@@ -181,6 +182,7 @@ namespace Coffee.UIEffects
public Texture transitionTex;
public Vector2 transitionTexScale = new Vector2(1, 1);
public Vector2 transitionTexOffset = new Vector2(0, 0);
public Vector2 transitionTexSpeed = new Vector2(0, 0);
public float transitionRotation = 0;
public bool transitionKeepAspectRatio = true;
public float transitionWidth = 0.2f;
@@ -266,6 +268,7 @@ namespace Coffee.UIEffects
transitionTex = preset.transitionTex;
transitionTexScale = preset.transitionTexScale;
transitionTexOffset = preset.transitionTexOffset;
transitionTexSpeed = preset.transitionTexSpeed;
transitionKeepAspectRatio = preset.transitionKeepAspectRatio;
transitionRotation = preset.transitionRotation;
transitionWidth = preset.transitionWidth;
@@ -346,6 +349,7 @@ namespace Coffee.UIEffects
material.SetVector(s_TransitionTex_ST,
new Vector4(transitionTexScale.x, transitionTexScale.y,
transitionTexOffset.x, transitionTexOffset.y));
material.SetVector(s_TransitionTex_Speed, transitionTexSpeed);
material.SetFloat(s_TransitionWidth, Mathf.Clamp01(transitionWidth));
material.SetFloat(s_TransitionSoftness, Mathf.Clamp01(transitionSoftness));
material.SetVector(s_TransitionRange, new Vector2(transitionRange.min, transitionRange.max));
+2 -1
View File
@@ -13,6 +13,7 @@ uniform const float _SamplingWidth;
uniform const float _SamplingScale;
uniform const sampler2D _TransitionTex;
uniform const float4 _TransitionTex_ST;
uniform const float2 _TransitionTex_Speed;
uniform const float _TransitionRate;
uniform const int _TransitionReverse;
uniform const half4 _TransitionColor;
@@ -109,7 +110,7 @@ float transition_alpha(float2 uvLocal)
}
#endif
const float alpha = tex2D(_TransitionTex, uv).a;
const float alpha = tex2D(_TransitionTex, uv + _Time.y * _TransitionTex_Speed).a;
return _TransitionReverse ? 1 - alpha : alpha;
}