Compare commits

...

25 Commits

Author SHA1 Message Date
Takashi Sakai ed3fce5fa5 release v2.3.1 2018-05-10 12:44:18 +09:00
Takashi Sakai 4bbe569248 update change log 2018-05-10 12:44:18 +09:00
Takashi Sakai 9d911eb581 Fixed: UIEffectCapturedImage: When iteration count is even. the result image is flipped vertically (on Windows) #62 2018-05-10 12:34:39 +09:00
Takashi Sakai bc87c42cdd Remove docs dir 2018-05-08 21:19:12 +09:00
Takashi Sakai 972235ec44 Update readme 2018-05-08 21:10:44 +09:00
Takashi Sakai e4fa6aff30 release v2.3.0 2018-05-08 20:45:21 +09:00
Takashi Sakai b80ff1498e update change log 2018-05-08 20:45:20 +09:00
Takashi Sakai ea83602102 Update release script 2018-05-08 20:43:54 +09:00
Takashi Sakai df5f723e11 Upload demo to github pages 2018-05-07 14:31:54 +09:00
Takashi Sakai 32293858bf Update demo 2018-05-07 14:31:53 +09:00
Takashi Sakai e7bec9849b Update readme 2018-05-07 14:31:52 +09:00
Takashi Sakai 8ae051b7b2 Feature: Flip horizontal/vertical #47 2018-05-07 14:31:52 +09:00
Takashi Sakai bb300bef59 update release script 2018-04-24 13:14:34 +09:00
Takashi Sakai 30884fd349 [WIP]Feature: Dissolve 2018-04-23 21:45:08 +09:00
Takashi Sakai f477f1174a Feature: Shining effect #9 2018-04-20 19:58:42 +09:00
Takashi Sakai aaf79b76a9 release v2.2.0 2018-04-12 09:13:00 +09:00
Takashi Sakai 2c8b994aa0 update change log 2018-04-12 09:12:59 +09:00
Takashi Sakai 49c3855c49 Change: Reduce the pixelation effect when tone level = 1. #57 2018-04-12 09:01:02 +09:00
Takashi Sakai 537784c0f3 Update release script 2018-04-12 08:25:46 +09:00
Takashi Sakai bf8b4833fd Update README 2018-04-12 08:25:46 +09:00
Takashi Sakai c78bc86cf1 Refactor: Add shader struct 2018-04-12 08:25:46 +09:00
Takashi Sakai 0ad6bd7693 Fixed: Color effect on shadow is incorrect. #55 2018-04-12 08:25:46 +09:00
Takashi Sakai 3fda891b35 Feature: Customize shader/material. #46 2018-04-12 08:25:45 +09:00
Takashi Sakai efefad1a73 Feature: UIEffectCapturedImage supports keep canvas size. #54 2018-04-12 08:25:45 +09:00
Takashi Sakai 1e9cea00cb Feature: UIEffectCapturedImage supports Quality Type to easy setup. #53 2018-04-12 08:25:45 +09:00
33 changed files with 7463 additions and 230 deletions
File diff suppressed because it is too large Load Diff
+21
View File
@@ -0,0 +1,21 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace Coffee.UIExtensions
{
public class Demo_UIEffect : MonoBehaviour
{
[SerializeField] RectMask2D mask;
// Use this for initialization
void Start()
{
if (mask)
{
mask.enabled = true;
}
}
}
}
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: e94f1a0bc56a14944aadc5064f5f485a
timeCreated: 1525599611
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -2,7 +2,7 @@
namespace Coffee.UIExtensions
{
public class UIEffectDialogDemo : MonoBehaviour
public class Demo_UIEffectDialog : MonoBehaviour
{
public void Open()
{
@@ -0,0 +1,444 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &-1353081132
AnimationClip:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Animation
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
path:
classID: 114
script: {fileID: 11500000, guid: f19b7e2285c104f6ca47d583f3e5444f, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
path:
classID: 114
script: {fileID: 11500000, guid: ce76b7a490bd74f34a2f2752641aea24, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 1
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 1.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 2
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Horizontal
path:
classID: 114
script: {fileID: 11500000, guid: 9bb4e59514e90489d985e9a17c838085, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 0.5
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 1.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 2
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Veritical
path:
classID: 114
script: {fileID: 11500000, guid: 9bb4e59514e90489d985e9a17c838085, type: 3}
m_PPtrCurves: []
m_SampleRate: 12
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- path: 0
attribute: 2830261733
script: {fileID: 11500000, guid: f19b7e2285c104f6ca47d583f3e5444f, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
- path: 0
attribute: 2830261733
script: {fileID: 11500000, guid: ce76b7a490bd74f34a2f2752641aea24, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
- path: 0
attribute: 3652906371
script: {fileID: 11500000, guid: 9bb4e59514e90489d985e9a17c838085, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
- path: 0
attribute: 1301824207
script: {fileID: 11500000, guid: 9bb4e59514e90489d985e9a17c838085, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 2
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
path:
classID: 114
script: {fileID: 11500000, guid: f19b7e2285c104f6ca47d583f3e5444f, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
path:
classID: 114
script: {fileID: 11500000, guid: ce76b7a490bd74f34a2f2752641aea24, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 1
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 1.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 2
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Horizontal
path:
classID: 114
script: {fileID: 11500000, guid: 9bb4e59514e90489d985e9a17c838085, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 0.5
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 1.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 2
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Veritical
path:
classID: 114
script: {fileID: 11500000, guid: 9bb4e59514e90489d985e9a17c838085, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_IsEmpty: 0
m_Events: []
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Shiny, Dissolve, Flip
serializedVersion: 5
m_AnimatorParameters:
- m_Name: New Bool
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 110755890}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &110250372
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Animation
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_Motion: {fileID: -1353081132}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
--- !u!1107 &110755890
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110250372}
m_Position: {x: 240, y: 120, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 48, y: 72, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 110250372}
--- !u!1102 &558841200
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Animation
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_Motion: {fileID: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: efc039787ac554a5d9ac2068e70d0c44
timeCreated: 1502936794
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
@@ -1,6 +1,7 @@
using UnityEditor;
using UnityEditor.UI;
using UnityEngine;
using DesamplingRate = Coffee.UIExtensions.UIEffectCapturedImage.DesamplingRate;
namespace Coffee.UIExtensions
{
@@ -11,6 +12,41 @@ namespace Coffee.UIExtensions
[CanEditMultipleObjects]
public class UIEffectCapturedImageEditor : RawImageEditor
{
//################################
// Constant or Static Members.
//################################
public enum QualityMode : int
{
Fast = (DesamplingRate.x2 << 0) + (DesamplingRate.x2 << 4) + (FilterMode.Bilinear << 8) + (1 << 10),
Medium = (DesamplingRate.x1 << 0) + (DesamplingRate.x1 << 4) + (FilterMode.Bilinear << 8) + (1 << 10),
Detail = (DesamplingRate.None << 0) + (DesamplingRate.x1 << 4) + (FilterMode.Bilinear << 8) + (1 << 10),
Custom = -1,
}
//################################
// Public/Protected Members.
//################################
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected override void OnEnable()
{
base.OnEnable();
_spTexture = serializedObject.FindProperty("m_Texture");
_spColor = serializedObject.FindProperty("m_Color");
_spRaycastTarget = serializedObject.FindProperty("m_RaycastTarget");
_spDesamplingRate = serializedObject.FindProperty("m_DesamplingRate");
_spReductionRate = serializedObject.FindProperty("m_ReductionRate");
_spFilterMode = serializedObject.FindProperty("m_FilterMode");
_spIterations = serializedObject.FindProperty("m_Iterations");
_spKeepSizeToRootCanvas = serializedObject.FindProperty("m_KeepCanvasSize");
_customAdvancedOption = (qualityMode == QualityMode.Custom);
}
/// <summary>
/// Implement this function to make a custom inspector.
/// </summary>
@@ -21,9 +57,9 @@ namespace Coffee.UIExtensions
//================
// Basic properties.
//================
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Texture"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Color"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_RaycastTarget"));
EditorGUILayout.PropertyField(_spTexture);
EditorGUILayout.PropertyField(_spColor);
EditorGUILayout.PropertyField(_spRaycastTarget);
//================
// Capture effect.
@@ -38,17 +74,24 @@ namespace Coffee.UIExtensions
GUILayout.Space(10);
EditorGUILayout.LabelField("Advanced Option", EditorStyles.boldLabel);
// Desampling rate.
DrawDesamplingRate(serializedObject.FindProperty("m_DesamplingRate"));
EditorGUI.BeginChangeCheck();
QualityMode quality = qualityMode;
quality = (QualityMode)EditorGUILayout.EnumPopup("Quality Mode", quality);
if(EditorGUI.EndChangeCheck())
{
_customAdvancedOption = (quality == QualityMode.Custom);
qualityMode = quality;
}
// Reduction rate.
DrawDesamplingRate(serializedObject.FindProperty("m_ReductionRate"));
// Filter Mode.
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_FilterMode"));
// Iterations.
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Iterations"));
// When qualityMode is `Custom`, show advanced option.
if (_customAdvancedOption)
{
DrawDesamplingRate(_spDesamplingRate);// Desampling rate.
DrawDesamplingRate(_spReductionRate);// Reduction rate.
EditorGUILayout.PropertyField(_spFilterMode);// Filter Mode.
EditorGUILayout.PropertyField(_spIterations);// Iterations.
}
EditorGUILayout.PropertyField(_spKeepSizeToRootCanvas);// Iterations.
serializedObject.ApplyModifiedProperties();
@@ -67,6 +110,48 @@ namespace Coffee.UIExtensions
}
}
//################################
// Private Members.
//################################
const int Bits4 = (1 << 4) - 1;
const int Bits2 = (1 << 2) - 1;
bool _customAdvancedOption = false;
SerializedProperty _spTexture;
SerializedProperty _spColor;
SerializedProperty _spRaycastTarget;
SerializedProperty _spDesamplingRate;
SerializedProperty _spReductionRate;
SerializedProperty _spFilterMode;
SerializedProperty _spIterations;
SerializedProperty _spKeepSizeToRootCanvas;
QualityMode qualityMode
{
get
{
if (_customAdvancedOption)
return QualityMode.Custom;
int qualityValue = (_spDesamplingRate.intValue << 0)
+ (_spReductionRate.intValue << 4)
+ (_spFilterMode.intValue << 8)
+ (_spIterations.intValue << 10);
return System.Enum.IsDefined(typeof(QualityMode), qualityValue) ? (QualityMode)qualityValue : QualityMode.Custom;
}
set
{
if (value != QualityMode.Custom)
{
int qualityValue = (int)value;
_spDesamplingRate.intValue = (qualityValue >> 0) & Bits4;
_spReductionRate.intValue = (qualityValue >> 4) & Bits4;
_spFilterMode.intValue = (qualityValue >> 8) & Bits2;
_spIterations.intValue = (qualityValue >> 10) & Bits4;
}
}
}
/// <summary>
/// Draws the desampling rate.
/// </summary>
+61 -21
View File
@@ -11,12 +11,11 @@ namespace Coffee.UIExtensions
[CanEditMultipleObjects]
public class UIEffectEditor : Editor
{
ReorderableList roAdditionalShadows;
SerializedProperty spAdditionalShadows;
SerializedProperty spBlurMode;
//################################
// Constant or Static Members.
//################################
/// <summary>
/// Implement this function to make a custom inspector.
/// Draw effect properties.
/// </summary>
public static void DrawEffectProperties(string shaderName, SerializedObject serializedObject)
{
@@ -93,23 +92,46 @@ namespace Coffee.UIExtensions
}
}
//################################
// Private Members.
//################################
ReorderableList _roAdditionalShadows;
SerializedProperty _spAdditionalShadows;
SerializedProperty _spBlurMode;
SerializedProperty _spCustomEffect;
SerializedProperty _spEffectMaterial;
SerializedProperty _spEffectColor;
SerializedProperty _spCustomFactorX;
SerializedProperty _spCustomFactorY;
SerializedProperty _spCustomFactorZ;
SerializedProperty _spCustomFactorW;
void OnEnable()
{
spAdditionalShadows = serializedObject.FindProperty("m_AdditionalShadows");
spBlurMode = serializedObject.FindProperty("m_BlurMode");
_spAdditionalShadows = serializedObject.FindProperty("m_AdditionalShadows");
_spBlurMode = serializedObject.FindProperty("m_BlurMode");
_spEffectColor = serializedObject.FindProperty("m_EffectColor");
roAdditionalShadows = new ReorderableList(serializedObject, spAdditionalShadows, true, true, true, true);
roAdditionalShadows.drawElementCallback = DrawElementCallback;
roAdditionalShadows.drawHeaderCallback = (rect) => EditorGUI.LabelField(rect, "Additional Shadows");
roAdditionalShadows.onAddCallback = OnAddCallback;
roAdditionalShadows.elementHeightCallback = ElementHeightCallback;
_spCustomEffect = serializedObject.FindProperty("m_CustomEffect");
_spEffectMaterial = serializedObject.FindProperty("m_EffectMaterial");
var spFactor = serializedObject.FindProperty("m_CustomFactor");
_spCustomFactorX = spFactor.FindPropertyRelative("x");
_spCustomFactorY = spFactor.FindPropertyRelative("y");
_spCustomFactorZ = spFactor.FindPropertyRelative("z");
_spCustomFactorW = spFactor.FindPropertyRelative("w");
_roAdditionalShadows = new ReorderableList(serializedObject, _spAdditionalShadows, true, true, true, true);
_roAdditionalShadows.drawElementCallback = DrawElementCallback;
_roAdditionalShadows.drawHeaderCallback = (rect) => EditorGUI.LabelField(rect, "Additional Shadows");
_roAdditionalShadows.onAddCallback = OnAddCallback;
_roAdditionalShadows.elementHeightCallback = ElementHeightCallback;
}
void OnAddCallback(ReorderableList ro)
{
spAdditionalShadows.InsertArrayElementAtIndex(ro.count);
var element = spAdditionalShadows.GetArrayElementAtIndex(ro.count - 1);
_spAdditionalShadows.InsertArrayElementAtIndex(ro.count);
var element = _spAdditionalShadows.GetArrayElementAtIndex(ro.count - 1);
element.FindPropertyRelative("shadowMode").intValue = (int)UIEffect.ShadowStyle.Shadow;
element.FindPropertyRelative("shadowColor").colorValue = Color.black;
element.FindPropertyRelative("effectDistance").vector2Value = new Vector2(1f, -1f);
@@ -119,11 +141,11 @@ namespace Coffee.UIExtensions
float ElementHeightCallback(int index)
{
var element = spAdditionalShadows.GetArrayElementAtIndex(index);
var element = _spAdditionalShadows.GetArrayElementAtIndex(index);
if (element.FindPropertyRelative("shadowMode").intValue == (int)UIEffect.ShadowStyle.None)
return 16;
return (spBlurMode.intValue == (int)UIEffect.BlurMode.None ? 66 : 84) + (EditorGUIUtility.wideMode ? 0 : 18);
return (_spBlurMode.intValue == (int)UIEffect.BlurMode.None ? 66 : 84) + (EditorGUIUtility.wideMode ? 0 : 18);
}
/// <summary>
@@ -131,7 +153,7 @@ namespace Coffee.UIExtensions
/// </summary>
void DrawElementCallback(Rect rect, int index, bool isActive, bool isFocused)
{
var sp = roAdditionalShadows.serializedProperty.GetArrayElementAtIndex(index);
var sp = _roAdditionalShadows.serializedProperty.GetArrayElementAtIndex(index);
Rect r = new Rect(rect);
r.height = EditorGUIUtility.singleLineHeight;
@@ -147,7 +169,7 @@ namespace Coffee.UIExtensions
r.y += EditorGUIUtility.wideMode ? r.height : r.height * 2;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("useGraphicAlpha"));
if (spBlurMode.intValue != (int)UIEffect.BlurMode.None)
if (_spBlurMode.intValue != (int)UIEffect.BlurMode.None)
{
r.y += r.height;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("shadowBlur"));
@@ -160,7 +182,25 @@ namespace Coffee.UIExtensions
public override void OnInspectorGUI()
{
serializedObject.Update();
DrawEffectProperties(UIEffect.shaderName, serializedObject);
// Custom effect.
EditorGUILayout.PropertyField(_spCustomEffect);
if(_spCustomEffect.boolValue)
{
EditorGUILayout.PropertyField(_spEffectMaterial);
EditorGUI.indentLevel++;
EditorGUILayout.Slider(_spCustomFactorX, 0, 1, new GUIContent("Effect Factor X"));
EditorGUILayout.Slider(_spCustomFactorY, 0, 1, new GUIContent("Effect Factor Y"));
EditorGUILayout.Slider(_spCustomFactorZ, 0, 1, new GUIContent("Effect Factor Z"));
EditorGUILayout.Slider(_spCustomFactorW, 0, 1, new GUIContent("Effect Factor W"));
EditorGUILayout.PropertyField(_spEffectColor);
EditorGUI.indentLevel--;
}
else
{
DrawEffectProperties(UIEffect.shaderName, serializedObject);
}
//================
// Shadow setting.
@@ -176,7 +216,7 @@ namespace Coffee.UIExtensions
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ShadowColor"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_UseGraphicAlpha"));
if (spBlurMode.intValue != (int)UIEffect.BlurMode.None)
if (_spBlurMode.intValue != (int)UIEffect.BlurMode.None)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ShadowBlur"));
}
@@ -186,7 +226,7 @@ namespace Coffee.UIExtensions
//================
// Additional shadow setting.
//================
roAdditionalShadows.DoLayoutList();
_roAdditionalShadows.DoLayoutList();
serializedObject.ApplyModifiedProperties();
@@ -0,0 +1,172 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Shiny
m_Shader: {fileID: 4800000, guid: 20ffe76c2439c403aabdd25bd94bf011, type: 3}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _BumpMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _BumpScale
second: 1
- first:
name: _ColorMask
second: 15
- first:
name: _Cutoff
second: 0.5
- first:
name: _DetailNormalMapScale
second: 1
- first:
name: _DstBlend
second: 0
- first:
name: _GlossMapScale
second: 1
- first:
name: _Glossiness
second: 0.5
- first:
name: _GlossyReflections
second: 1
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 0
- first:
name: _OcclusionStrength
second: 1
- first:
name: _Parallax
second: 0.02
- first:
name: _ShineLocation
second: 0.03
- first:
name: _ShineWidth
second: 0.612
- first:
name: _SmoothnessTextureChannel
second: 0
- first:
name: _SpecularHighlights
second: 1
- first:
name: _SrcBlend
second: 1
- first:
name: _Stencil
second: 0
- first:
name: _StencilComp
second: 8
- first:
name: _StencilOp
second: 0
- first:
name: _StencilReadMask
second: 255
- first:
name: _StencilWriteMask
second: 255
- first:
name: _UVSec
second: 0
- first:
name: _UseUIAlphaClip
second: 0
- first:
name: _ZWrite
second: 1
- first:
name: _alpha
second: 0.4
- first:
name: _angle
second: 180
- first:
name: _factor
second: 16.2
- first:
name: _width
second: 9969.5
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
- first:
name: _effectcolor
second: {r: 0.14812386, g: 0, b: 0.9338235, a: 0.441}
- first:
name: _size
second: {r: 112, g: 317, b: 100, a: 1000}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9dc7e810a87b444ab96919f3215c2fe5
timeCreated: 1523859834
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

+100
View File
@@ -0,0 +1,100 @@
fileFormatVersion: 2
guid: 3e04c247fb2604af186173fce0bc62de
timeCreated: 1524468976
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: 1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 2
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 10
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: iPhone
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: WebGL
maxTextureSize: 256
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
+82
View File
@@ -0,0 +1,82 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Dissolve
m_Shader: {fileID: 4800000, guid: e1b48dc831eb147e9886c049033213bf, type: 3}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _NoiseTex
second:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- first:
name: _EdgeWidth
second: 0.1
- first:
name: _InnerSoftClip
second: 0.468
- first:
name: _InnerSoftness
second: 0.5
- first:
name: _OuterSoftClip
second: 0.776
- first:
name: _OuterSoftness
second: 0.5
- first:
name: _Stencil
second: 0
- first:
name: _StencilComp
second: 8
- first:
name: _StencilOp
second: 0
- first:
name: _StencilReadMask
second: 255
- first:
name: _StencilWriteMask
second: 255
- first:
name: _UseUIAlphaClip
second: 0
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
- first:
name: _EdgeInnerColor
second: {r: 1, g: 0, b: 0, a: 1}
- first:
name: _EdgeOuterColor
second: {r: 1, g: 0.7529412, b: 0, a: 1}
- first:
name: _InnerEdgeColor
second: {r: 1, g: 0, b: 0, a: 1}
- first:
name: _OuterEdgeColor
second: {r: 1, g: 0.75, b: 0, a: 1}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 17b17d6effbe14075a3bbdf1fda1f6e1
timeCreated: 1524469054
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
+160
View File
@@ -0,0 +1,160 @@
Shader "UI/Hidden/UI-Effect-Dissolve"
{
Properties
{
[PerRendererData] _MainTex ("Main Texture", 2D) = "white" {}
_Color ("Tint", Color) = (1,1,1,1)
_StencilComp ("Stencil Comparison", Float) = 8
_Stencil ("Stencil ID", Float) = 0
_StencilOp ("Stencil Operation", Float) = 0
_StencilWriteMask ("Stencil Write Mask", Float) = 255
_StencilReadMask ("Stencil Read Mask", Float) = 255
_ColorMask ("Color Mask", Float) = 15
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
[Header(Dissolve)]
_NoiseTex ("Noise Texture (A)", 2D) = "white" {}
_EdgeWidth ("Edge width", Range (0.0001, 1)) = 0.05
_OuterEdgeColor ("Outer edge color", Color) = (1.0, 0.75, 0.0, 1.0)
_OuterSoftness ("Outer softness", Range (0.0001, 1)) = 0.5
_InnerEdgeColor ("Inner edge color", Color) = (1.0, 0.0, 0.0, 1.0)
_InnerSoftness ("Inner softness", Range (0.0001, 1)) = 0.5
}
SubShader
{
Tags
{
"Queue"="Transparent"
"IgnoreProjector"="True"
"RenderType"="Transparent"
"PreviewType"="Plane"
"CanUseSpriteAtlas"="True"
}
Stencil
{
Ref [_Stencil]
Comp [_StencilComp]
Pass [_StencilOp]
ReadMask [_StencilReadMask]
WriteMask [_StencilWriteMask]
}
Cull Off
Lighting Off
ZWrite Off
ZTest [unity_GUIZTestMode]
Blend SrcAlpha OneMinusSrcAlpha
ColorMask [_ColorMask]
Pass
{
Name "Default"
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma target 2.0
#pragma multi_compile __ UNITY_UI_ALPHACLIP
#include "UnityCG.cginc"
#include "UnityUI.cginc"
struct appdata_t
{
float4 vertex : POSITION;
float4 color : COLOR;
float2 texcoord : TEXCOORD0;
UNITY_VERTEX_INPUT_INSTANCE_ID
float2 uv1 : TEXCOORD1;
};
struct v2f
{
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
float2 texcoord : TEXCOORD0;
float4 worldPosition : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
half3 effectFactor : TEXCOORD2;
};
fixed4 _Color;
fixed4 _TextureSampleAdd;
float4 _ClipRect;
sampler2D _MainTex;
sampler2D _NoiseTex;
float _EdgeWidth;
float3 _OuterEdgeColor;
float _OuterSoftness;
float3 _InnerEdgeColor;
float _InnerSoftness;
fixed3 UnpackToVec3(float value)
{
const int PACKER_STEP = 256;
const int PRECISION = PACKER_STEP - 1;
fixed3 vec;
vec.x = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
vec.y = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
vec.z = (value % PACKER_STEP) / PRECISION;
return vec;
}
v2f vert(appdata_t IN)
{
v2f OUT;
UNITY_SETUP_INSTANCE_ID(IN);
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
OUT.worldPosition = IN.vertex;
OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord;
OUT.color = IN.color * _Color;
//xy: Noize uv
//z: Dissolve factor
OUT.effectFactor = UnpackToVec3(IN.uv1.x);
return OUT;
}
fixed4 frag(v2f IN) : SV_Target
{
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
float cutout = tex2D(_NoiseTex, IN.effectFactor.xy).a;
fixed factor = cutout - IN.effectFactor.z;
#ifdef UNITY_UI_ALPHACLIP
clip (min(color.a - 0.01, factor));
#endif
fixed edgeLerp = step(cutout, color.a) * saturate((_EdgeWidth - factor)*16/_InnerSoftness);
fixed3 edgeColor = lerp(_OuterEdgeColor, _InnerEdgeColor, (factor)/_EdgeWidth);
color.rgb =lerp(color.rgb, edgeColor, edgeLerp);
color.a *= saturate((factor)*32/_OuterSoftness);
return color;
}
ENDCG
}
}
}
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: e1b48dc831eb147e9886c049033213bf
timeCreated: 1523859834
licenseType: Pro
ShaderImporter:
defaultTextures: []
userData:
assetBundleName:
assetBundleVariant:
+144
View File
@@ -0,0 +1,144 @@
Shader "UI/Hidden/UI-Effect-Shiny"
{
Properties
{
[PerRendererData] _MainTex ("Main Texture", 2D) = "white" {}
_Color ("Tint", Color) = (1,1,1,1)
_StencilComp ("Stencil Comparison", Float) = 8
_Stencil ("Stencil ID", Float) = 0
_StencilOp ("Stencil Operation", Float) = 0
_StencilWriteMask ("Stencil Write Mask", Float) = 255
_StencilReadMask ("Stencil Read Mask", Float) = 255
_ColorMask ("Color Mask", Float) = 15
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
}
SubShader
{
Tags
{
"Queue"="Transparent"
"IgnoreProjector"="True"
"RenderType"="Transparent"
"PreviewType"="Plane"
"CanUseSpriteAtlas"="True"
}
Stencil
{
Ref [_Stencil]
Comp [_StencilComp]
Pass [_StencilOp]
ReadMask [_StencilReadMask]
WriteMask [_StencilWriteMask]
}
Cull Off
Lighting Off
ZWrite Off
ZTest [unity_GUIZTestMode]
Blend SrcAlpha OneMinusSrcAlpha
ColorMask [_ColorMask]
Pass
{
Name "Default"
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma target 2.0
#pragma multi_compile __ UNITY_UI_ALPHACLIP
#include "UnityCG.cginc"
#include "UnityUI.cginc"
struct appdata_t
{
float4 vertex : POSITION;
float4 color : COLOR;
float2 texcoord : TEXCOORD0;
UNITY_VERTEX_INPUT_INSTANCE_ID
float2 uv1 : TEXCOORD1;
};
struct v2f
{
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
float2 texcoord : TEXCOORD0;
float4 worldPosition : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
half4 effectFactor : TEXCOORD2;
};
fixed4 _Color;
fixed4 _TextureSampleAdd;
float4 _ClipRect;
sampler2D _MainTex;
float4 _MainTex_TexelSize;
fixed4 UnpackToVec4(float value)
{
const int PACKER_STEP = 64;
const int PRECISION = PACKER_STEP - 1;
fixed4 color;
color.r = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
color.g = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
color.b = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
color.a = (value % PACKER_STEP) / PRECISION;
return color;
}
v2f vert(appdata_t IN)
{
v2f OUT;
UNITY_SETUP_INSTANCE_ID(IN);
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
OUT.worldPosition = IN.vertex;
OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord;
OUT.color = IN.color * _Color;
OUT.effectFactor = UnpackToVec4(IN.uv1.x);
OUT.effectFactor.y = OUT.effectFactor.y * 2 - 0.5;
return OUT;
}
fixed4 frag(v2f IN) : SV_Target
{
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
#ifdef UNITY_UI_ALPHACLIP
clip (color.a - 0.001);
#endif
fixed lowLevel = IN.effectFactor.y - IN.effectFactor.z;
fixed highLevel = IN.effectFactor.y + IN.effectFactor.z;
fixed shinePower = smoothstep(IN.effectFactor.z, 0, abs(abs(clamp(IN.effectFactor.x, lowLevel, highLevel) - IN.effectFactor.y)));
color.rgb += color.a * (shinePower / 2) * IN.effectFactor.w;
return color;
}
ENDCG
}
}
}
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 20ffe76c2439c403aabdd25bd94bf011
timeCreated: 1523859834
licenseType: Pro
ShaderImporter:
defaultTextures: []
userData:
assetBundleName:
assetBundleVariant:
+9 -6
View File
@@ -85,7 +85,10 @@ Shader "UI/Hidden/UI-Effect"
#endif
#if defined (UI_TONE) || defined (UI_BLUR)
half3 effectFactor : TEXCOORD2;
half4 effectFactor : TEXCOORD2;
#endif
#if UI_TONE_HUE || UI_TONE_PIXEL
half4 extraFactor : TEXCOORD3;
#endif
};
@@ -112,10 +115,10 @@ Shader "UI/Hidden/UI-Effect"
#endif
#if UI_TONE_HUE
OUT.effectFactor.y = sin(OUT.effectFactor.x*3.14159265359*2);
OUT.effectFactor.x = cos(OUT.effectFactor.x*3.14159265359*2);
OUT.extraFactor.x = cos(OUT.effectFactor.x*3.14159265359 * 2);
OUT.extraFactor.y = sin(OUT.effectFactor.x*3.14159265359 * 2);
#elif UI_TONE_PIXEL
OUT.effectFactor.xy = max(2, (1-OUT.effectFactor.x) * _MainTex_TexelSize.zw);
OUT.extraFactor.xy = max(2, (1-OUT.effectFactor.x*0.98) * _MainTex_TexelSize.zw);
#endif
#if defined (UI_COLOR)
@@ -129,7 +132,7 @@ Shader "UI/Hidden/UI-Effect"
fixed4 frag(v2f IN) : SV_Target
{
#if UI_TONE_PIXEL
IN.texcoord = round(IN.texcoord * IN.effectFactor.xy) / IN.effectFactor.xy;
IN.texcoord = round(IN.texcoord * IN.extraFactor.xy) / IN.extraFactor.xy;
#endif
#if defined (UI_BLUR)
@@ -149,7 +152,7 @@ Shader "UI/Hidden/UI-Effect"
color.rgb = IN.color.rgb;
color.a = color.a * tex2D(_MainTex, IN.texcoord).a + IN.effectFactor.x * 2 - 1;
#elif UI_TONE_HUE
color.rgb = shift_hue(color.rgb, IN.effectFactor.x, IN.effectFactor.y);
color.rgb = shift_hue(color.rgb, IN.extraFactor.x, IN.extraFactor.y);
#elif defined (UI_TONE) & !UI_TONE_CUTOFF
color = ApplyToneEffect(color, IN.effectFactor.x);
#endif
+5 -10
View File
@@ -37,9 +37,7 @@ Shader "UI/Hidden/UI-EffectCapture"
fixed4 colorFactor : COLOR1;
#endif
#if defined (UI_TONE) || defined (UI_BLUR)
half4 effectFactor : TEXCOORD2;
#endif
};
sampler2D _MainTex;
@@ -51,16 +49,9 @@ Shader "UI/Hidden/UI-EffectCapture"
{
v2f OUT;
OUT.vertex = UnityObjectToClipPos(v.vertex);
#if UNITY_UV_STARTS_AT_TOP
OUT.texcoord = half2(v.texcoord.x, 1 - v.texcoord.y);
#else
OUT.texcoord = v.texcoord;
#endif
#if defined (UI_TONE) || defined (UI_BLUR)
OUT.texcoord = v.texcoord;
OUT.effectFactor = _EffectFactor;
#endif
#if UI_TONE_HUE
OUT.effectFactor.y = sin(OUT.effectFactor.x*3.14159265359*2);
@@ -73,6 +64,10 @@ Shader "UI/Hidden/UI-EffectCapture"
OUT.colorFactor = _ColorFactor;
#endif
#if UNITY_UV_STARTS_AT_TOP
OUT.texcoord.y = lerp(OUT.texcoord.y, 1 - OUT.texcoord.y, OUT.effectFactor.w);
#endif
return OUT;
}
+162
View File
@@ -0,0 +1,162 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
#if UNITY_EDITOR
using System.IO;
using System.Linq;
using UnityEditor;
#endif
namespace Coffee.UIExtensions
{
/// <summary>
/// UIDissolve.
/// </summary>
[ExecuteInEditMode]
[DisallowMultipleComponent]
public class UIDissolve : BaseMeshEffect
#if UNITY_EDITOR
, ISerializationCallbackReceiver
#endif
{
//################################
// Constant or Static Members.
//################################
public const string shaderName = "UI/Hidden/UI-Effect-Dissolve";
//################################
// Serialize Members.
//################################
[SerializeField] [Range(0, 1)] float m_Location = 0;
[SerializeField] Material m_EffectMaterial;
//################################
// Public Members.
//################################
/// <summary>
/// Graphic affected by the UIEffect.
/// </summary>
new public Graphic graphic { get { return base.graphic; } }
/// <summary>
/// Location for effect.
/// </summary>
public float location { get { return m_Location; } set { m_Location = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
/// <summary>
/// Effect material.
/// </summary>
public virtual Material effectMaterial { get { return m_EffectMaterial; } }
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected override void OnEnable()
{
graphic.material = effectMaterial;
base.OnEnable();
}
/// <summary>
/// This function is called when the behaviour becomes disabled () or inactive.
/// </summary>
protected override void OnDisable()
{
graphic.material = null;
base.OnDisable();
}
#if UNITY_EDITOR
public void OnBeforeSerialize()
{
}
public void OnAfterDeserialize()
{
var obj = this;
EditorApplication.delayCall += () =>
{
if (Application.isPlaying || !obj || !obj.graphic)
return;
if(!m_EffectMaterial)
{
m_EffectMaterial = GetMaterial(shaderName);
EditorUtility.SetDirty(this);
EditorApplication.delayCall +=AssetDatabase.SaveAssets;
}
if(obj.isActiveAndEnabled && graphic.material != m_EffectMaterial)
{
graphic.material = m_EffectMaterial;
EditorUtility.SetDirty(graphic);
EditorApplication.delayCall +=AssetDatabase.SaveAssets;
}
};
}
public static Material GetMaterial(string shaderName)
{
string name = Path.GetFileName (shaderName);
return AssetDatabase.FindAssets("t:Material " + name)
.Select(x => AssetDatabase.GUIDToAssetPath(x))
.SelectMany(x => AssetDatabase.LoadAllAssetsAtPath(x))
.OfType<Material>()
.FirstOrDefault(x => x.name == name);
}
#endif
/// <summary>
/// Modifies the mesh.
/// </summary>
public override void ModifyMesh(VertexHelper vh)
{
if (!IsActive())
return;
// rect.
Rect rect = graphic.rectTransform.rect;
// Calculate vertex position.
UIVertex vertex = default(UIVertex);
for (int i = 0; i < vh.currentVertCount; i++)
{
vh.PopulateUIVertex(ref vertex, i);
var x = Mathf.Clamp01 (vertex.position.x / rect.width + 0.5f);
var y = Mathf.Clamp01 (vertex.position.y / rect.height + 0.5f);
vertex.uv1 = new Vector2 (_PackToFloat (x, y, location), 0);
vh.SetUIVertex(vertex, i);
}
}
//################################
// Private Members.
//################################
/// <summary>
/// Mark the UIEffect as dirty.
/// </summary>
void _SetDirty()
{
if(graphic)
graphic.SetVerticesDirty();
}
/// <summary>
/// Pack 3 low-precision [0-1] floats values to a float.
/// Each value [0-1] has 256 steps(8 bits).
/// </summary>
static float _PackToFloat(float x, float y, float z)
{
const int PRECISION = (1 << 8) - 1;
return (Mathf.FloorToInt(z * PRECISION) << 16)
+ (Mathf.FloorToInt(y * PRECISION) << 8)
+ Mathf.FloorToInt(x * PRECISION);
}
}
}
+12
View File
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: ce76b7a490bd74f34a2f2752641aea24
timeCreated: 1523859834
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+29 -3
View File
@@ -127,6 +127,9 @@ namespace Coffee.UIExtensions
[SerializeField] List<AdditionalShadow> m_AdditionalShadows = new List<AdditionalShadow>();
[SerializeField] bool m_CustomEffect = false;
[SerializeField] Vector4 m_CustomFactor = new Vector4();
//################################
// Public Members.
//################################
@@ -200,6 +203,11 @@ namespace Coffee.UIExtensions
/// </summary>
public List<AdditionalShadow> additionalShadows { get { return m_AdditionalShadows; } }
/// <summary>
/// Custom effect factor.
/// </summary>
public Vector4 customFactor { get { return m_CustomFactor; } set { m_CustomFactor = value; _SetDirty(); } }
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
@@ -237,7 +245,7 @@ namespace Coffee.UIExtensions
{
// Pack some effect factors to 1 float.
Vector2 factor = new Vector2(
_PackToFloat(toneLevel, 0, blur, 0),
m_CustomEffect ? _PackToFloat(m_CustomFactor) : _PackToFloat(toneLevel, 0, blur, 0),
_PackToFloat(effectColor.r, effectColor.g, effectColor.b, effectColor.a)
);
@@ -284,6 +292,9 @@ namespace Coffee.UIExtensions
public void OnAfterDeserialize()
{
if (m_CustomEffect)
return;
var obj = this;
EditorApplication.delayCall += () =>
{
@@ -392,7 +403,7 @@ namespace Coffee.UIExtensions
/// Append shadow vertices.
/// * It is similar to Shadow component implementation.
/// </summary>
static void _ApplyShadow(List<UIVertex> verts, ref int start, ref int end, ShadowStyle mode, float toneLevel, float blur, Vector2 effectDistance, Color color, bool useGraphicAlpha)
void _ApplyShadow(List<UIVertex> verts, ref int start, ref int end, ShadowStyle mode, float toneLevel, float blur, Vector2 effectDistance, Color color, bool useGraphicAlpha)
{
if (ShadowStyle.None == mode)
return;
@@ -437,7 +448,7 @@ namespace Coffee.UIExtensions
/// Append shadow vertices.
/// * It is similar to Shadow component implementation.
/// </summary>
static void _ApplyShadowZeroAlloc(List<UIVertex> verts, ref int start, ref int end, float x, float y, Vector2 factor, Color color, bool useGraphicAlpha)
void _ApplyShadowZeroAlloc(List<UIVertex> verts, ref int start, ref int end, float x, float y, Vector2 factor, Color color, bool useGraphicAlpha)
{
// Check list capacity.
var neededCapacity = verts.Count + end - start;
@@ -456,6 +467,12 @@ namespace Coffee.UIExtensions
vt.position.Set(v.x + x, v.y + y, v.z);
Color vertColor = color;
if(colorMode != ColorMode.None)
{
vertColor.r = vertColor.g = vertColor.b = 1;
}
vertColor.a = useGraphicAlpha ? color.a * vt.color.a / 255 : color.a;
vt.color = vertColor;
@@ -490,5 +507,14 @@ namespace Coffee.UIExtensions
+ (Mathf.FloorToInt(y * PRECISION) << 6)
+ Mathf.FloorToInt(x * PRECISION);
}
/// <summary>
/// Pack 4 low-precision [0-1] floats values to a float.
/// Each value [0-1] has 64 steps(6 bits).
/// </summary>
static float _PackToFloat(Vector4 factor)
{
return _PackToFloat(Mathf.Clamp01(factor.x), Mathf.Clamp01(factor.y), Mathf.Clamp01(factor.z), Mathf.Clamp01(factor.w));
}
}
}
+17 -6
View File
@@ -54,6 +54,7 @@ namespace Coffee.UIExtensions
[SerializeField] FilterMode m_FilterMode = FilterMode.Bilinear;
[SerializeField] Material m_EffectMaterial;
[SerializeField][Range(1, 8)] int m_Iterations = 1;
[SerializeField] bool m_KeepCanvasSize = true;
//################################
@@ -119,6 +120,11 @@ namespace Coffee.UIExtensions
/// </summary>
public int iterations { get { return m_Iterations; } set { m_Iterations = value; } }
/// <summary>
/// Fits graphic size to the root canvas.
/// </summary>
public bool keepCanvasSize { get { return m_KeepCanvasSize; } set { m_KeepCanvasSize = value; } }
/// <summary>
/// This function is called when the MonoBehaviour will be destroyed.
/// </summary>
@@ -235,7 +241,7 @@ namespace Coffee.UIExtensions
_buffer.Blit(BuiltinRenderTextureType.CurrentActive, s_CopyId);
// Set properties.
_buffer.SetGlobalVector("_EffectFactor", new Vector4(toneLevel, 0, blur, 0));
_buffer.SetGlobalVector("_EffectFactor", new Vector4(toneLevel, 0, blur, 1));
_buffer.SetGlobalVector("_ColorFactor", new Vector4(effectColor.r, effectColor.g, effectColor.b, effectColor.a));
// Blit without effect.
@@ -255,6 +261,7 @@ namespace Coffee.UIExtensions
// Iterate the operation.
if(1 < m_Iterations)
{
_buffer.SetGlobalVector("_EffectFactor", new Vector4(toneLevel, 0, blur, 0));
_buffer.GetTemporaryRT(s_EffectId2, w, h, 0, m_FilterMode);
for (int i = 1; i < m_Iterations; i++)
{
@@ -276,11 +283,15 @@ namespace Coffee.UIExtensions
_camera.AddCommandBuffer(kCameraEvent, _buffer);
// StartCoroutine by CanvasScaler.
#if UNITY_5_4_OR_NEWER
canvas.rootCanvas.GetComponent<CanvasScaler>().StartCoroutine(_CoUpdateTextureOnNextFrame());
#else
canvas.GetComponentInParent<CanvasScaler>().StartCoroutine(_CoUpdateTextureOnNextFrame());
#endif
var rootCanvas = canvas.rootCanvas;
var scaler = rootCanvas.GetComponent<CanvasScaler>();
scaler.StartCoroutine(_CoUpdateTextureOnNextFrame());
if (m_KeepCanvasSize)
{
var size = (rootCanvas.transform as RectTransform).rect.size;
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x);
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y);
}
}
/// <summary>
+58
View File
@@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace Coffee.UIExtensions
{
[RequireComponent(typeof(Graphic))]
[DisallowMultipleComponent]
public class UIFlip : BaseMeshEffect
{
//################################
// Serialize Members.
//################################
[SerializeField] private bool m_Horizontal = false;
[SerializeField] private bool m_Veritical = false;
//################################
// Public Members.
//################################
/// <summary>
/// Gets or sets a value indicating whether this <see cref="Coffee.UIExtensions.UIFlip"/> should be flipped horizontally.
/// </summary>
/// <value><c>true</c> if be flipped horizontally; otherwise, <c>false</c>.</value>
public bool horizontal { get { return this.m_Horizontal; } set { this.m_Horizontal = value; } }
/// <summary>
/// Gets or sets a value indicating whether this <see cref="Coffee.UIExtensions.UIFlip"/> should be flipped vertically.
/// </summary>
/// <value><c>true</c> if be flipped horizontally; otherwise, <c>false</c>.</value>
public bool vertical { get { return this.m_Veritical; } set { this.m_Veritical = value; } }
/// <summary>
/// Call used to modify mesh.
/// </summary>
/// <param name="vh">VertexHelper.</param>
public override void ModifyMesh(VertexHelper vh)
{
RectTransform rt = graphic.rectTransform;
UIVertex vt = default(UIVertex);
Vector3 pos;
Vector2 center = rt.rect.center;
for (int i = 0; i < vh.currentVertCount; i++)
{
vh.PopulateUIVertex(ref vt, i);
pos = vt.position;
vt.position = new Vector3(
m_Horizontal ? -pos.x : pos.x,
m_Veritical ? -pos.y : pos.y
// m_Horizontal ? (pos.x + (center.x - pos.x) * 2) : pos.x,
// m_Veritical ? (pos.y + (center.y - pos.y) * 2) : pos.y
);
vh.SetUIVertex(vt, i);
}
}
}
}
+12
View File
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 9bb4e59514e90489d985e9a17c838085
timeCreated: 1525607243
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+227
View File
@@ -0,0 +1,227 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
#if UNITY_EDITOR
using System.IO;
using System.Linq;
using UnityEditor;
#endif
namespace Coffee.UIExtensions
{
/// <summary>
/// UIEffect.
/// </summary>
[ExecuteInEditMode]
[DisallowMultipleComponent]
public class UIShiny : BaseMeshEffect
#if UNITY_EDITOR
, ISerializationCallbackReceiver
#endif
{
//################################
// Constant or Static Members.
//################################
public const string shaderName = "UI/Hidden/UI-Effect-Shiny";
//################################
// Serialize Members.
//################################
[SerializeField] [Range(0, 1)] float m_Location = 0;
[SerializeField] [Range(0, 1)] float m_Width = 0.25f;
[SerializeField] [Range(0, 1)] float m_Alpha = 1f;
[SerializeField] [Range(-180, 180)] float m_Rotation;
[SerializeField] Material m_EffectMaterial;
//################################
// Public Members.
//################################
/// <summary>
/// Graphic affected by the UIEffect.
/// </summary>
new public Graphic graphic { get { return base.graphic; } }
/// <summary>
/// Location for shiny effect.
/// </summary>
public float location { get { return m_Location; } set { m_Location = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
/// <summary>
/// Width for shiny effect.
/// </summary>
public float width { get { return m_Width; } set { m_Width = Mathf.Clamp(value, 0, 2); _SetDirty(); } }
/// <summary>
/// Alpha for shiny effect.
/// </summary>
public float alpha { get { return m_Alpha; } set { m_Alpha = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
/// <summary>
/// Rotation for shiny effect.
/// </summary>
public float rotation
{
get
{
return m_Rotation;
}
set { if (!Mathf.Approximately(m_Rotation, value)) { m_Rotation = value; _SetDirty(); } }
}
/// <summary>
/// Effect material.
/// </summary>
public virtual Material effectMaterial { get { return m_EffectMaterial; } }
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected override void OnEnable()
{
graphic.material = effectMaterial;
base.OnEnable();
}
/// <summary>
/// This function is called when the behaviour becomes disabled () or inactive.
/// </summary>
protected override void OnDisable()
{
graphic.material = null;
base.OnDisable();
}
#if UNITY_EDITOR
public void OnBeforeSerialize()
{
}
public void OnAfterDeserialize()
{
var obj = this;
EditorApplication.delayCall += () =>
{
if (Application.isPlaying || !obj)
return;
var mat = GetMaterial(shaderName);
if(m_EffectMaterial == mat && graphic.material == mat)
return;
graphic.material = m_EffectMaterial = mat;
EditorUtility.SetDirty(this);
EditorUtility.SetDirty(graphic);
EditorApplication.delayCall +=AssetDatabase.SaveAssets;
};
}
public static Material GetMaterial(string shaderName)
{
string name = Path.GetFileName (shaderName);
return AssetDatabase.FindAssets("t:Material " + name)
.Select(x => AssetDatabase.GUIDToAssetPath(x))
.SelectMany(x => AssetDatabase.LoadAllAssetsAtPath(x))
.OfType<Material>()
.FirstOrDefault(x => x.name == name);
}
#endif
/// <summary>
/// Modifies the mesh.
/// </summary>
public override void ModifyMesh(VertexHelper vh)
{
if (!IsActive())
return;
// rect.
Rect rect = graphic.rectTransform.rect;
// rotation.
float rad = rotation * Mathf.Deg2Rad;
Vector2 dir = new Vector2(Mathf.Cos(rad), Mathf.Sin(rad));
dir.x *= rect.height / rect.width;
dir = dir.normalized;
// Calculate vertex position.
UIVertex vertex = default(UIVertex);
Vector2 nomalizedPos;
Matrix2x3 localMatrix = new Matrix2x3(rect, dir.x, dir.y); // Get local matrix.
for (int i = 0; i < vh.currentVertCount; i++)
{
vh.PopulateUIVertex(ref vertex, i);
// Normalize vertex position by local matrix.
nomalizedPos = localMatrix * vertex.position;
vertex.uv1 = new Vector2(
_PackToFloat(Mathf.Clamp01(nomalizedPos.y), location, width, alpha),
0
);
vh.SetUIVertex(vertex, i);
}
}
//################################
// Private Members.
//################################
/// <summary>
/// Mark the UIEffect as dirty.
/// </summary>
void _SetDirty()
{
if(graphic)
graphic.SetVerticesDirty();
}
/// <summary>
/// Pack 4 low-precision [0-1] floats values to a float.
/// Each value [0-1] has 64 steps(6 bits).
/// </summary>
static float _PackToFloat(float x, float y, float z, float w)
{
const int PRECISION = (1 << 6) - 1;
return (Mathf.FloorToInt(w * PRECISION) << 18)
+ (Mathf.FloorToInt(z * PRECISION) << 12)
+ (Mathf.FloorToInt(y * PRECISION) << 6)
+ Mathf.FloorToInt(x * PRECISION);
}
/// <summary>
/// Matrix2x3.
/// </summary>
struct Matrix2x3
{
public float m00, m01, m02, m10, m11, m12;
public Matrix2x3(Rect rect, float cos, float sin)
{
const float center = 0.5f;
float dx = -rect.xMin / rect.width - center;
float dy = -rect.yMin / rect.height - center;
m00 = cos / rect.width;
m01 = -sin / rect.height;
m02 = dx * cos - dy * sin + center;
m10 = sin / rect.width;
m11 = cos / rect.height;
m12 = dx * sin + dy * cos + center;
}
public static Vector2 operator*(Matrix2x3 m, Vector2 v)
{
return new Vector2(
(m.m00 * v.x) + (m.m01 * v.y) + m.m02,
(m.m10 * v.x) + (m.m11 * v.y) + m.m12
);
}
}
}
}
+12
View File
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: f19b7e2285c104f6ca47d583f3e5444f
timeCreated: 1523859834
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+38 -2
View File
@@ -1,4 +1,40 @@
# Change Log
# Changelog
## [v2.3.1](https://github.com/mob-sakai/UIEffect/tree/v2.3.1) (2018-05-10)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.3.0...v2.3.1)
**Fixed bugs:**
- UIEffectCapturedImage: When iteration count is even. the result image is flipped vertically \(on Windows\) [\#62](https://github.com/mob-sakai/UIEffect/issues/62)
## [v2.3.0](https://github.com/mob-sakai/UIEffect/tree/v2.3.0) (2018-05-08)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.2.0...v2.3.0)
**Implemented enhancements:**
- Feature: Flip horizontal/vertical [\#47](https://github.com/mob-sakai/UIEffect/issues/47)
- Feature: Dissolve [\#45](https://github.com/mob-sakai/UIEffect/issues/45)
- Feature: Shining effect [\#9](https://github.com/mob-sakai/UIEffect/issues/9)
## [v2.2.0](https://github.com/mob-sakai/UIEffect/tree/v2.2.0) (2018-04-12)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.1.0...v2.2.0)
**Implemented enhancements:**
- Feature: Customize shader/material. You can create a custom ui shader and control it with UIEffct. [\#46](https://github.com/mob-sakai/UIEffect/issues/46)
- Feature: UIEffectCapturedImage supports keep canvas size. [\#54](https://github.com/mob-sakai/UIEffect/issues/54)
- Feature: UIEffectCapturedImage supports `Quality Type` to easy setup. [\#53](https://github.com/mob-sakai/UIEffect/issues/53)
**Fixed bugs:**
- Bug: Color effect on shadow is incorrect. [\#55](https://github.com/mob-sakai/UIEffect/issues/55)
**Closed issues:**
- Change: Reduce the pixelation effect when tone level = 1. [\#57](https://github.com/mob-sakai/UIEffect/issues/57)
## [v2.1.0](https://github.com/mob-sakai/UIEffect/tree/v2.1.0) (2018-04-04)
@@ -134,4 +170,4 @@
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+28 -12
View File
@@ -1,16 +1,16 @@
UIEffect
===
UIEffect is an effect component for uGUI.
Controls and manipulate visual effect is very easy!
UIEffect is an effect component for uGUI in Unity.
Let's decorate your UI with effects!
[![](https://img.shields.io/github/release/mob-sakai/UIEffect.svg?label=latest%20version)](https://github.com/mob-sakai/UIEffect/release)
[![](https://img.shields.io/github/release-date/mob-sakai/UIEffect.svg)](https://github.com/mob-sakai/UIEffect/releases)
![](https://img.shields.io/badge/requirement-Unity%205.5%2B-green.svg)
[![](https://img.shields.io/github/license/mob-sakai/UIEffect.svg)](https://github.com/mob-sakai/UIEffect/blob/master/LICENSE.txt)
[![](https://img.shields.io/github/last-commit/mob-sakai/UIEffect/develop.svg?label=last%20commit)](https://github.com/mob-sakai/UIEffect/commits/develop)
[![](https://img.shields.io/github/last-commit/mob-sakai/UIEffect/develop.svg?label=last%20commit%20to%20develop)](https://github.com/mob-sakai/UIEffect/commits/develop)
[![](https://img.shields.io/github/issues/mob-sakai/UIEffect.svg)](https://github.com/mob-sakai/UIEffect/issues)
[![](https://img.shields.io/github/commits-since/mob-sakai/UIEffect/latest.svg)](https://github.com/mob-sakai/UIEffect/compare/master...develop)
<< [Description](#Description) | [WebGL Demo](#demo) | [Download](https://github.com/mob-sakai/UIEffect/releases) | [Usage](#usage) | [Development Note](#development-note) | [Change log](https://github.com/mob-sakai/UIEffect/blob/develop/CHANGELOG.md) >>
@@ -20,6 +20,9 @@ Controls and manipulate visual effect is very easy!
<br><br><br><br>
## Description
### New feature in v2.3.0!
![v2.3.0](https://user-images.githubusercontent.com/12690315/39756239-bf546ae6-5303-11e8-964a-38aed7ea6096.gif)
### Supports following effects!
![image](https://user-images.githubusercontent.com/12690315/35077815-5ff8094e-fc42-11e7-92dd-99916c9f9da7.png)
@@ -46,32 +49,45 @@ Controls and manipulate visual effect is very easy!
* Vertical
* Angle
* Diagonal
* Shiny
* Dissolve
* Flip horizontal/vertical
### Easy to control effect parameters!
![image](https://user-images.githubusercontent.com/12690315/38594668-636dd3ac-3d82-11e8-9951-820964a6a95f.gif)
### And, more features!
* Control the effect parameters without instantiating the material
* Control the effect parameter with AnimationClip
* Control the effect parameters with AnimationClip
![image](https://user-images.githubusercontent.com/12690315/34617750-cf2c9464-f27f-11e7-8ee9-e6be3b209943.gif)
* Use for screen transition
![image](https://user-images.githubusercontent.com/12690315/34618554-71a32e40-f282-11e7-8b78-6948c50c6b58.gif)
* Multiple shadow effect to reduce rendering vertices
![image](https://user-images.githubusercontent.com/12690315/34552373-600fdab2-f164-11e7-8565-21c15af92a93.png)
* The captured image with effect, like post effect
* UICapturedEffectImage: The captured image with effect, like post effect
![image](https://user-images.githubusercontent.com/12690315/34619147-868cb36a-f284-11e7-8122-b924ff09077f.gif)
* Dialog window with the captured image effect
* UICapturedEffectImage: Dialog window with the captured image effect
![image](https://user-images.githubusercontent.com/12690315/34619468-97e3c134-f285-11e7-90b2-3a75bde13911.gif)
* Change vertex color as gradient, with rotation, offset, color correction
![image](https://user-images.githubusercontent.com/12690315/34931353-b1824df2-fa11-11e7-9dda-18aba10a8607.gif)
![image](https://user-images.githubusercontent.com/12690315/34930676-000c41d4-fa0e-11e7-825b-d5a1e757fea8.png)
* UIGradient: Change vertex color as gradient, with rotation, offset, color correction
![image](https://user-images.githubusercontent.com/12690315/38594997-2a39f03c-3d84-11e8-865d-9ce12a8bb3db.gif)
* UIShiny: Shiny effect WITHOUT Mask component. This will suppress extra draw calls and improve performance.
Merged from [ShinyEffectForUGUI](https://github.com/mob-sakai/ShinyEffectForUGUI).
![image](https://user-images.githubusercontent.com/12690315/38501362-c56e3768-3c47-11e8-9ec1-50343d8b83ad.gif)
* UIDissolve: Dissolve effect WITHOUT material instancing. This will suppress extra draw calls and improve performance.
Merged from [DissolveEffectForUGUI](https://github.com/mob-sakai/DissolveEffectForUGUI).
![demo](https://user-images.githubusercontent.com/12690315/39131616-dcf7ea60-474a-11e8-8e20-f9e5bd8b3f5c.gif)
* UIFlip: Flip horizontal/vertical.
<br><br><br><br>
## Demo
[WebGL Demo](https://developer.cloud.unity3d.com/share/WJTY06hfG7/webgl/)
[WebGL Demo](http://mob-sakai.github.io/UIEffect)
* Effect sample
* Transition
+2 -1
View File
@@ -1,10 +1,11 @@
{
"name": "UIEffect",
"version": "2.1.0",
"version": "2.3.1",
"repository": {
"type": "git",
"url": "git+https://github.com/mob-sakai/UIEffect.git"
},
"src": "Assets/UIEffect",
"unity": "/Applications/Unity2017.1.0p5/Unity2017.1.0p5.app/Contents/MacOS/Unity",
"license": "MIT"
}
+23 -9
View File
@@ -1,23 +1,25 @@
#!/bin/bash -xe
#!/bin/bash -e
# NOTE: Set an environment variable `CHANGELOG_GITHUB_TOKEN` by running the following command at the prompt, or by adding it to your shell profile (e.g., ~/.bash_profile or ~/.zshrc):
# export CHANGELOG_GITHUB_TOKEN="«your-40-digit-github-token»"
# Release the project with the following steps:
# 1. Update the release version in package.json.
# 2. Update "CHANGELOG.md" using "github_changelog_generator-1.15.0.pre.beta".
# 2. Update "CHANGELOG.md" using "github_changelog_generator-1.15.0.pre.rc".
# 3. Commit package.json and CHANGELOG.md.
# 4. Merge into master branch.
# 5. Export unitypackage.
# 6. Release using "gh-release-3.2.0". (Upload unitypackage)
UNITY_PATH=/Applications/Unity5.5.0p4/Unity5.5.0p4.app/Contents/MacOS/Unity
# input version
# input release version
PACKAGE_NAME=`node -pe 'require("./package.json").name'`
echo Github Release: $PACKAGE_NAME
read -p "[? release version (for example: 1.0.0): " RELEASE_VERSION
[ -z "$RELEASE_VERSION" ] && exit
# update version
# update version in package.json
git checkout -B release develop
sed -i -e "s/\"version\": \(.*\)/\"version\": \"${RELEASE_VERSION}\",/g" package.json
@@ -31,6 +33,17 @@ git tag -d $TAG
git push --delete origin $TAG
git diff -- CHANGELOG.md
read -p "[? continue? (y/N):" yn
case "$yn" in [yY]*) ;; *) exit ;; esac
# export unitypackage
UNITY_EDITOR=`node -pe 'require("./package.json").unity'`
PACKAGE_SRC=`node -pe 'require("./package.json").src'`
"$UNITY_EDITOR" -quit -batchmode -projectPath "`pwd`" -exportpackage "$PACKAGE_SRC" "$PACKAGE_NAME.unitypackage"
# commit files
git add CHANGELOG.md -f
git add package.json -f
@@ -42,12 +55,13 @@ git checkout master
git merge --no-ff release -m "release $TAG"
git branch -D release
git push origin master
git checkout develop
git merge --ff master
git push origin develop
# export .unitypackage and release on Github
PACKAGE_SRC=`node -pe 'require("./package.json").src'`
$UNITY_PATH -quit -batchmode -projectPath "`pwd`" -exportpackage $PACKAGE_SRC $PACKAGE_NAME.unitypackage
gh-release --draft --assets $PACKAGE_NAME.unitypackage
# upload unitypackage and release on Github
gh-release --draft --assets "$PACKAGE_NAME.unitypackage"
echo "\n\n$PACKAGE_NAME v$RELEASE_VERSION has been successfully released!\n"