Compare commits

...

102 Commits

Author SHA1 Message Date
mob-sakai 07f85474f4 release v3.0.2 2019-01-16 08:22:36 +09:00
mob-sakai b80abd9636 update change log 2019-01-16 08:22:36 +09:00
mob-sakai 7ff2a4e509 Fix change log 2019-01-15 22:58:06 +09:00
mob-sakai 39dd9acaa9 fix #144; UIEffect & UIHsvModifier & UITransitionEffect Strange action 2019-01-15 22:57:28 +09:00
mob-sakai 7ff21981a9 Use temporary render texture 2019-01-15 22:57:28 +09:00
Takashi Sakai 40a76a2fb2 Update README.md 2019-01-10 22:15:00 +09:00
Takashi Sakai f77839ab49 Update README.md 2019-01-10 22:12:22 +09:00
mob-sakai 99375cce90 release v3.0.1 2018-11-07 15:56:59 +09:00
mob-sakai a13f4702da update change log 2018-11-07 15:56:59 +09:00
mob-sakai 8247a34341 Fix for warning 2018-11-07 15:03:31 +09:00
mob-sakai 175011211e fix #139; Compile error in 2018.3 2018-11-07 15:03:31 +09:00
mob-sakai 5ff0de7354 release v3.0.0 2018-10-10 08:44:38 +09:00
mob-sakai 1709f2de26 update change log 2018-10-10 08:44:38 +09:00
mob-sakai 9266e4c50f Refactor 2018-10-10 08:30:11 +09:00
mob-sakai eaba40fc29 Update readme 2018-10-10 08:30:11 +09:00
mob-sakai 47d9f2978d Update demo 2018-10-10 08:30:11 +09:00
mob-sakai 950b07cfcc close #136; UIEffectCapturedImage: Remove 'TargetTexture' feature 2018-10-08 10:05:50 +09:00
mob-sakai 0a85f355c1 UIEffectCapturedImage: Reduce GC 2018-10-08 10:05:50 +09:00
mob-sakai c7782686ae Refactor 2018-10-08 10:05:50 +09:00
mob-sakai c9809ff1f4 close #135; UITransitionEffect: "Pass ray on hidden" option 2018-10-08 10:05:50 +09:00
mob-sakai b9e0da1316 Refactor 2018-10-06 21:39:09 +09:00
mob-sakai 9e79f18613 close #133; Add component menu in editor 2018-10-06 21:29:30 +09:00
mob-sakai 8c4dc5d996 Improve effect player 2018-10-06 21:29:29 +09:00
mob-sakai 850ae8e7e4 Add editors 2018-10-06 21:29:29 +09:00
mob-sakai 7724d5a9ed close #132; UITransitionEffect: Add Show/Hide method 2018-10-06 21:29:29 +09:00
mob-sakai 3215160a8f Effect runner 2018-10-06 21:29:29 +09:00
mob-sakai 0c1468b257 Fix shadow 2018-10-06 21:29:29 +09:00
mob-sakai 5de1ff78a4 close #92; Add tooltip 2018-10-06 21:29:29 +09:00
mob-sakai 896ea1ab93 Refactor 2018-10-06 21:29:29 +09:00
mob-sakai cdd8e2b7b0 close #61; Change: Change ToneMode to EffectMode 2018-10-05 16:57:36 +09:00
mob-sakai e660c8233d Refactor 2018-10-05 16:57:36 +09:00
mob-sakai b0f7ad390a close #130; UIEffectCapturedImage: Immediate capturing 2018-10-05 11:30:28 +09:00
mob-sakai 51f8e13949 Update demo 2018-10-05 11:27:51 +09:00
mob-sakai 8682783932 Update readme 2018-10-05 08:38:36 +09:00
mob-sakai a854d5d561 Add issue template 2018-09-30 11:00:07 +09:00
mob-sakai d9361ebf74 Refactor 2018-09-29 22:59:07 +09:00
mob-sakai 5f1fdedb3c Update demo 2018-09-29 22:59:07 +09:00
mob-sakai 33881e7c6a Delete UITransitionEffect.None 2018-09-29 22:59:06 +09:00
mob-sakai b3a3edd30a Improve effect runner 2018-09-29 22:59:06 +09:00
mob-sakai da9f36397d Improve editor 2018-09-29 22:59:06 +09:00
mob-sakai ff0ea5d24c Add DeprecatedRemover 2018-09-29 22:59:06 +09:00
mob-sakai 67c0bf9f6d close #98; Remove 'custom effect' feature in UIEffect component 2018-09-29 22:59:06 +09:00
mob-sakai a2ad00041b Improve parameter texture 2018-09-29 22:59:06 +09:00
mob-sakai 97a6f48ac1 UITransitionEffect: Add 'Dissolve' mode 2018-09-29 22:59:06 +09:00
mob-sakai bfc3468705 Fix fade transition 2018-09-29 22:59:06 +09:00
mob-sakai 66516f0e2d Fix Shadow color 2018-09-29 22:59:06 +09:00
mob-sakai 20717fdca6 close #95; Improve blurring for atlas 2018-09-29 22:59:06 +09:00
mob-sakai 4f179ea5fc close #110; Remove 'additional shadow' in UIShadow component 2018-09-29 22:59:06 +09:00
mob-sakai a073a70582 close #63; New architecture: Shared texture for effect parameter 2018-09-29 22:59:06 +09:00
mob-sakai 91830e2b20 close #98; Remove 'custom effect' feature in UIEffect component 2018-09-29 22:59:06 +09:00
mob-sakai cd970b05a9 close #78; Remove 'cutoff' and 'mono' effect in UIEffect component 2018-09-29 22:59:06 +09:00
mob-sakai 7be2f6f8d7 close #91; Remove 'hue' effect in UIEffect component 2018-09-29 22:59:06 +09:00
mob-sakai 9903cce242 close #93; UIShiny: Change parameter name highlight to gloss 2018-09-29 22:59:06 +09:00
mob-sakai 21f8af7668 Upgrade tool 2018-09-29 22:59:06 +09:00
mob-sakai ee0c1ceee3 close #97; Obsolete shadow effect in UIEffect component 2018-09-29 22:59:06 +09:00
Takashi Sakai 8b31489593 close #50; Use the graphic color as effect color, to reduce parameters 2018-09-29 22:59:06 +09:00
mob-sakai 76bfd259cf close #87; Use Canvas.willRenderCanvases event instead of Update method 2018-09-29 22:59:06 +09:00
mob-sakai aeb6d562ed release v2.8.3 2018-09-29 11:03:31 +09:00
mob-sakai 01e5f05118 update change log 2018-09-29 11:03:31 +09:00
mob-sakai a92aa327b5 fix #131; UIEffectCapturedImage: Black screen with Unity 2018.1+ editor on Windows 2018-09-29 10:43:26 +09:00
mob-sakai ea7d98dc5e release v2.8.2 2018-09-26 22:40:48 +09:00
mob-sakai 77ebcf2b7a update change log 2018-09-26 22:40:48 +09:00
mob-sakai 773f8cf4ae High Serria 2018-09-26 22:09:40 +09:00
mob-sakai c792be9626 Update readme 2018-09-26 22:02:43 +09:00
mob-sakai 1110bf3dad Update gitignore 2018-09-26 16:51:12 +09:00
mob-sakai 4dfdcd76ab fix #125; UICapturedEffectImage does not work with Lightweight Render Pipeline LWRP 2018-09-26 16:51:12 +09:00
mob-sakai 385c082fb4 fix #126; When "UI-Effect.mat" is created automatically, Unity hangs up 2018-09-25 10:49:10 +09:00
mob-sakai d84d9747bc release v2.8.1 2018-08-17 10:25:59 +09:00
mob-sakai 318fc18597 update change log 2018-08-17 10:25:59 +09:00
mob-sakai d93a83d577 fix #119; (Demo) "Transition capture & dissolve" is incorrect 2018-08-17 10:21:42 +09:00
mob-sakai c94b3965af release v2.8.0 2018-08-14 17:14:30 +09:00
mob-sakai 9990f640c7 update change log 2018-08-14 17:14:29 +09:00
mob-sakai d840a76759 Update demo 2018-08-14 17:06:21 +09:00
mob-sakai 5bf0df0f66 Update readme 2018-08-14 17:06:21 +09:00
mob-sakai 84df2f4cf6 Refactor 2018-08-14 17:06:20 +09:00
mob-sakai 27e8bc8117 close #114; UIEffectCapturedImage: Keep aspect ratio 2018-08-14 17:05:22 +09:00
mob-sakai 362f881f73 close #116; UIEffectCapturedImage: change parameter name keepCanvasSize to fitToScreen 2018-08-14 17:05:22 +09:00
mob-sakai 7fe79bb11f close #115; UIEffectCapturedImage: Supports 'ScreenSpace - Overlay' 2018-08-14 17:05:22 +09:00
mob-sakai 65166ecdbd close #113; UIEffectCapturedImage: 'Capture on enable' option 2018-08-08 11:02:20 +09:00
mob-sakai 9a580b2132 close #111; UITransitionEffect: Change transition texture 2018-08-07 15:51:48 +09:00
mob-sakai 4236fcc0da release v2.7.1 2018-08-06 10:42:52 +09:00
mob-sakai ecad03cb37 update change log 2018-08-06 10:42:52 +09:00
Takashi Sakai 61879b86db fix #112; In v2.7.0, UIEffectCapturedImage is flipped vertically on Windows 2018-08-04 03:34:06 +09:00
mob-sakai 4c5f01c7f3 release v2.7.0 2018-07-26 20:48:41 +09:00
mob-sakai 3c3d47aede update change log 2018-07-26 20:48:41 +09:00
mob-sakai ed0a02b8d6 Update readme 2018-07-26 20:43:37 +09:00
mob-sakai 9cdd8558b1 Update demo 2018-07-26 20:43:37 +09:00
mob-sakai b38358f867 UIEffectCapturedImage: Default capture quality is 'Detail' 2018-07-26 20:43:35 +09:00
mob-sakai 71c6b4c314 UIEffectCapturedImage: 'Iteration' means blur iteration 2018-07-26 19:46:02 +09:00
mob-sakai 9c7e068374 close #108; UIEffectCapturedImage: Support target RenderTexture to use external component 2018-07-26 19:46:02 +09:00
mob-sakai 9081598259 Fix #109; UIEffectCapturedImage: ColorMode is not working 2018-07-26 19:46:02 +09:00
mob-sakai a135c7e23c UIEffectCapturedImage: Show warning message for overlay rendering in inspector 2018-07-26 19:46:02 +09:00
mob-sakai fb3b0a4312 close #96; UIEffectCapturedImage: Use multi-pass blurring to capture screenshot 2018-07-26 19:46:02 +09:00
mob-sakai 4240974c81 UIEffectCapturedImage: Fix keeping root canvas size 2018-07-26 19:46:02 +09:00
mob-sakai beaaef3208 close #105; Transition effect as other component 2018-07-26 19:46:02 +09:00
mob-sakai f9e6477114 fix #101; UIDissolve is not maskable 2018-07-26 19:46:02 +09:00
mob-sakai fad4c847e6 Add extensions for EffectArea 2018-07-26 19:46:01 +09:00
mob-sakai 5fb19badb3 close #44; HSV modifier 2018-07-26 19:46:01 +09:00
mob-sakai 60d0df6171 release v2.6.2 2018-07-18 10:53:23 +09:00
mob-sakai e031e57f23 update change log 2018-07-18 10:53:23 +09:00
mob-sakai c919449629 fix #99; Shader has compile errors in D3D9 or D3D11_9X(WSA) 2018-07-18 10:46:55 +09:00
mob-sakai 6bfc676bee update release script 2018-07-17 17:28:11 +09:00
86 changed files with 38301 additions and 18456 deletions
+23
View File
@@ -0,0 +1,23 @@
---
name: Bug report
about: Create a report to help us improve
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Environment (please complete the following information):**
- Platform: [e.g. Editor(Windows/Mac), Standalone(Windows/Mac), iOS, Android, WebGL]
- Unity: [e.g. 2018.2.8f1]
- UIEffect: [e.g. v3.0.0]
**Additional context**
Add any other context, screenshots or gif animations about the bug here.
+17
View File
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context, screenshots or gif animations about the feature request here.
+16
View File
@@ -0,0 +1,16 @@
---
name: Question
about: Feel free to ask us any question.
---
**Describe the question**
A clear and concise description of what the question is.
**Environment (please complete the following information):**
- Platform: [e.g. Editor(Windows/Mac), Standalone(Windows/Mac), iOS, Android, WebGL]
- Unity: [e.g. 2018.2.8f1]
- UIEffect: [e.g. v3.0.0]
**Additional context**
Add any other context, screenshots or gif animations about the question here.
+9 -1
View File
@@ -33,4 +33,12 @@ sysinfo.txt
# Packages
*.unitypackage
*.unitypackage
build.app
unity.log
.vs/
_Android/
_iOS/
_WebGL/
_Standalone/
@@ -7,7 +7,7 @@ namespace Coffee.UIExtensions
{
public class UIEffect_Demo : MonoBehaviour
{
[SerializeField] RectMask2D mask;
[SerializeField] RectMask2D mask = null;
// Use this for initialization
void Start()
@@ -40,5 +40,10 @@ namespace Coffee.UIExtensions
anim.GetComponentInChildren<UIEffectCapturedImage>().Capture();
anim.SetTrigger("Capture");
}
public void SetCanvasOverlay(bool isOverlay)
{
GetComponent<Canvas> ().renderMode = isOverlay ? RenderMode.ScreenSpaceOverlay : RenderMode.ScreenSpaceCamera;
}
}
}
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!200 &20000000
ShaderVariantCollection:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UIEffect_Demo
m_Shaders:
- first: {fileID: 4800000, guid: 7a6f925a07c3c5846a1c782eaaeb7087, type: 3}
second:
variants:
- keywords: DETAILBLUR GRAYSCALE
passType: 0
- keywords: DETAILBLUR SEPIA
passType: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 73036fa061ee340dcb3c04b9d8872e66
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 20000000
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
@@ -34,7 +34,7 @@ TextureImporter:
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
filterMode: 0
aniso: -1
mipBias: -1
wrapMode: 1
@@ -276,7 +276,14 @@ AnimationClip:
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_IsEmpty: 0
m_Events: []
m_Events:
- time: 0.5
functionName: Closed
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
--- !u!74 &7450624
AnimationClip:
m_ObjectHideFlags: 3
@@ -323,7 +330,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -393,7 +400,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -605,18 +612,12 @@ AnimatorController:
m_Name: UIEffect_Demo_Dialog
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Open
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: Close
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -630,51 +631,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &110107960
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Open
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110244674}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110173032
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110201538}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110180378
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -722,30 +678,6 @@ AnimatorState:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
--- !u!1102 &110201538
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Closed
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 110107960}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 0
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_Motion: {fileID: 7487404}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
--- !u!1102 &110202250
AnimatorState:
serializedVersion: 5
@@ -755,8 +687,7 @@ AnimatorState:
m_Name: Close
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 110173032}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -804,13 +735,10 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110244674}
m_Position: {x: 480, y: 48, z: 0}
- serializedVersion: 1
m_State: {fileID: 110201538}
m_Position: {x: 336, y: -12, z: 0}
- serializedVersion: 1
m_State: {fileID: 110202250}
m_Position: {x: 336, y: 120, z: 0}
m_Position: {x: 336, y: 60, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -820,4 +748,4 @@ AnimatorStateMachine:
m_EntryPosition: {x: 144, y: -12, z: 0}
m_ExitPosition: {x: 144, y: 108, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 110201538}
m_DefaultState: {fileID: 110244674}
@@ -0,0 +1,27 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace Coffee.UIExtensions
{
public class UIEffect_Demo_Dialog : MonoBehaviour
{
[SerializeField] Animator m_Animator = null;
public void Open()
{
gameObject.SetActive(true);
}
public void Close()
{
m_Animator.SetTrigger("Close");
}
public void Closed()
{
gameObject.SetActive(false);
}
}
}
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: a4961e148a8cd4fe0b84dddc2741894a
timeCreated: 1487152293
guid: f71afccd9f9454a78bef6d9b225066bf
timeCreated: 1525599611
licenseType: Pro
MonoImporter:
serializedVersion: 2
@@ -46,7 +46,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f19b7e2285c104f6ca47d583f3e5444f, type: 3}
@@ -80,7 +80,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: ce76b7a490bd74f34a2f2752641aea24, type: 3}
@@ -158,7 +158,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Blur
attribute: m_BlurFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -214,7 +214,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -242,7 +242,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path: Mask
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -354,7 +354,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path: Pixel
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -386,6 +386,118 @@ AnimationClip:
path:
classID: 114
script: {fileID: 11500000, guid: 9bb4e59514e90489d985e9a17c838085, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1.2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2.4
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: 922b805bc01c243e5853d9cbb544118c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1.2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2.4
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_EffectFactor
path: Mask
classID: 114
script: {fileID: 11500000, guid: 922b805bc01c243e5853d9cbb544118c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: -0.5
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1.2
value: 0
inSlope: 0.41666666
outSlope: 0.41666666
tangentMode: 136
- serializedVersion: 2
time: 2.4
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Hue
path:
classID: 114
script: {fileID: 11500000, guid: efe700dddcd8341ff8607ac2c827b4b5, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1.2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2.4
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ColorFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
m_PPtrCurves: []
m_SampleRate: 10
m_WrapMode: 0
@@ -472,6 +584,30 @@ AnimationClip:
classID: 114
customType: 0
isPPtrCurve: 0
- path: 0
attribute: 64967491
script: {fileID: 11500000, guid: 922b805bc01c243e5853d9cbb544118c, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
- path: 3747441678
attribute: 64967491
script: {fileID: 11500000, guid: 922b805bc01c243e5853d9cbb544118c, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
- path: 0
attribute: 636985097
script: {fileID: 11500000, guid: efe700dddcd8341ff8607ac2c827b4b5, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
- path: 0
attribute: 4097790204
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -524,7 +660,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f19b7e2285c104f6ca47d583f3e5444f, type: 3}
@@ -558,7 +694,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: ce76b7a490bd74f34a2f2752641aea24, type: 3}
@@ -636,7 +772,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Blur
attribute: m_BlurFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -692,7 +828,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -720,7 +856,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path: Mask
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -832,7 +968,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path: Pixel
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -864,6 +1000,118 @@ AnimationClip:
path:
classID: 114
script: {fileID: 11500000, guid: 9bb4e59514e90489d985e9a17c838085, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1.2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2.4
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: 922b805bc01c243e5853d9cbb544118c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1.2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2.4
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_EffectFactor
path: Mask
classID: 114
script: {fileID: 11500000, guid: 922b805bc01c243e5853d9cbb544118c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: -0.5
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1.2
value: 0
inSlope: 0.41666666
outSlope: 0.41666666
tangentMode: 136
- serializedVersion: 2
time: 2.4
value: 0.5
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Hue
path:
classID: 114
script: {fileID: 11500000, guid: efe700dddcd8341ff8607ac2c827b4b5, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1.2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2.4
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ColorFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
@@ -46,7 +46,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -124,10 +124,66 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: ce76b7a490bd74f34a2f2752641aea24, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: 922b805bc01c243e5853d9cbb544118c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_RaycastTarget
path:
classID: 114
script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_PPtrCurves: []
m_SampleRate: 12
m_WrapMode: 0
@@ -160,6 +216,18 @@ AnimationClip:
classID: 114
customType: 0
isPPtrCurve: 0
- path: 0
attribute: 64967491
script: {fileID: 11500000, guid: 922b805bc01c243e5853d9cbb544118c, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
- path: 0
attribute: 4228073214
script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -212,7 +280,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -290,10 +358,66 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Location
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: ce76b7a490bd74f34a2f2752641aea24, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: 922b805bc01c243e5853d9cbb544118c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
- serializedVersion: 2
time: 3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_RaycastTarget
path:
classID: 114
script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
@@ -339,40 +463,6 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path:
classID: 114
script: {fileID: 11500000, guid: e96dacbf1b116f64da658fbad66839e2, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -395,6 +485,40 @@ AnimationClip:
path:
classID: 114
script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Alpha
path:
classID: 225
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 12
m_WrapMode: 0
@@ -403,18 +527,18 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- path: 0
attribute: 304273561
script: {fileID: 11500000, guid: e96dacbf1b116f64da658fbad66839e2, type: 3}
classID: 114
customType: 0
isPPtrCurve: 0
- path: 0
attribute: 3305885265
script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
classID: 114
customType: 24
isPPtrCurve: 0
- path: 0
attribute: 1574349066
script: {fileID: 0}
classID: 225
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -437,40 +561,6 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path:
classID: 114
script: {fileID: 11500000, guid: e96dacbf1b116f64da658fbad66839e2, type: 3}
- curve:
serializedVersion: 2
m_Curve:
@@ -493,19 +583,46 @@ AnimationClip:
path:
classID: 114
script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Alpha
path:
classID: 225
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_IsEmpty: 0
m_Events:
- time: 0
functionName: Capture
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
m_Events: []
--- !u!74 &7437890
AnimationClip:
m_ObjectHideFlags: 0
@@ -642,7 +759,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -712,7 +829,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_ToneLevel
attribute: m_EffectFactor
path:
classID: 114
script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
@@ -801,13 +918,13 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Transition
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Binary file not shown.

After

Width:  |  Height:  |  Size: 953 KiB

@@ -0,0 +1,100 @@
fileFormatVersion: 2
guid: 04b808c8e7e2f114aa6bce179817e3b6
timeCreated: 1533229821
licenseType: Free
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: 0
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: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: WebGL
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: iPhone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

@@ -0,0 +1,100 @@
fileFormatVersion: 2
guid: d8f19718cccf14d4b829474ab19e0c7a
timeCreated: 1533229825
licenseType: Free
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: 0
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: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: WebGL
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: iPhone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.

After

Width:  |  Height:  |  Size: 834 KiB

@@ -0,0 +1,100 @@
fileFormatVersion: 2
guid: 87e2a5102f952174eb7505e5cff15bda
timeCreated: 1533231485
licenseType: Free
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: 0
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: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: WebGL
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: iPhone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.

After

Width:  |  Height:  |  Size: 883 KiB

@@ -0,0 +1,100 @@
fileFormatVersion: 2
guid: 24f06a4f5c47b464e9762d2887848f04
timeCreated: 1533231480
licenseType: Free
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: 0
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: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: WebGL
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: iPhone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

@@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: a5e1e56d8affdfc47858b4e7000f1d60
timeCreated: 1533229376
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
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: 0
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: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: WebGL
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
@@ -27,6 +27,12 @@ Material:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -80,6 +86,12 @@ Material:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -133,6 +145,12 @@ Material:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -186,6 +204,12 @@ Material:
m_Texture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -0,0 +1,154 @@
%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-HSV
m_Shader: {fileID: 4800000, guid: 7fc74090480c84f8b977cfcd55cdfe82, type: 3}
m_ShaderKeywords:
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}
- first:
name: _ParamTex
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: _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
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}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c8243c28075b3431084ded42f46ad567
timeCreated: 1531885800
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
@@ -21,6 +21,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 77a4cc77ec7394415a18f9e5a4b8083e
timeCreated: 1532512709
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
@@ -21,6 +21,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -162,6 +168,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -209,6 +221,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -397,6 +415,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -773,6 +797,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -1149,6 +1179,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -1619,6 +1655,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -1786,6 +1828,59 @@ Material:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
--- !u!21 &21305736874167728
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Fill-DetailBlur-Ex
m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3}
m_ShaderKeywords: DETAILBLUR EX FILL
m_LightmapFlags: 5
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: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- 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}
--- !u!21 &21306681885004364
Material:
serializedVersion: 6
@@ -2418,6 +2513,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -2726,6 +2827,59 @@ Material:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
--- !u!21 &21448049851552048
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-MediumBlur-Ex
m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3}
m_ShaderKeywords: EX MEDIUMBLUR
m_LightmapFlags: 5
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: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- 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}
--- !u!21 &21450770079124654
Material:
serializedVersion: 6
@@ -2841,6 +2995,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -2935,6 +3095,65 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- 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}
--- !u!21 &21510007115466990
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Add-DetailBlur-Ex
m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3}
m_ShaderKeywords: ADD DETAILBLUR EX
m_LightmapFlags: 5
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: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -2982,6 +3201,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -3149,6 +3374,59 @@ Material:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
--- !u!21 &21541535114347366
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-DetailBlur-Ex
m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3}
m_ShaderKeywords: DETAILBLUR EX
m_LightmapFlags: 5
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: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- 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}
--- !u!21 &21542047413524304
Material:
serializedVersion: 6
@@ -3358,6 +3636,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -3854,6 +4138,59 @@ Material:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
--- !u!21 &21635119553697766
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-FastBlur-Ex
m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3}
m_ShaderKeywords: EX FASTBLUR
m_LightmapFlags: 5
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: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- 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}
--- !u!21 &21639588145429544
Material:
serializedVersion: 6
@@ -4486,6 +4823,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -4580,6 +4923,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -4768,6 +5117,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -4909,6 +5264,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -5003,6 +5364,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -5097,6 +5464,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -5264,6 +5637,59 @@ Material:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
--- !u!21 &21812566947609066
Material:
serializedVersion: 6
m_ObjectHideFlags: 9
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: UI-Effect-Grayscale-DetailBlur-Ex
m_Shader: {fileID: 4800000, guid: b868e81d0156245e08c8646b4fb68d7a, type: 3}
m_ShaderKeywords: DETAILBLUR EX GRAYSCALE
m_LightmapFlags: 5
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: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
second: 15
- 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}
--- !u!21 &21846284721920408
Material:
serializedVersion: 6
@@ -5426,6 +5852,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -5661,6 +6093,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
@@ -5990,6 +6428,12 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParamTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _ColorMask
Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

@@ -0,0 +1,100 @@
fileFormatVersion: 2
guid: a74d3d4a498866d44b094d3d3717604d
timeCreated: 1533229728
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
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: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Android
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: WebGL
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: iPhone
maxTextureSize: 512
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
@@ -1,4 +1,7 @@
namespace Coffee.UIExtensions
using UnityEngine;
using UnityEngine.UI;
namespace Coffee.UIExtensions
{
/// <summary>
/// Area for effect.
@@ -9,4 +12,57 @@
Fit,
Character,
}
}
public static class EffectAreaExtensions
{
static readonly Rect rectForCharacter = new Rect(0, 0, 1, 1);
/// <summary>
/// Gets effect for area.
/// </summary>
public static Rect GetEffectArea(this EffectArea area, VertexHelper vh, Graphic graphic, float aspectRatio = -1)
{
Rect rect = default(Rect);
switch (area)
{
case EffectArea.RectTransform:
rect = graphic.rectTransform.rect;
break;
case EffectArea.Character:
rect = rectForCharacter;
break;
case EffectArea.Fit:
// Fit to contents.
UIVertex vertex = default(UIVertex);
rect.xMin = rect.yMin = float.MaxValue;
rect.xMax = rect.yMax = float.MinValue;
for (int i = 0; i < vh.currentVertCount; i++)
{
vh.PopulateUIVertex(ref vertex, i);
rect.xMin = Mathf.Min(rect.xMin, vertex.position.x);
rect.yMin = Mathf.Min(rect.yMin, vertex.position.y);
rect.xMax = Mathf.Max(rect.xMax, vertex.position.x);
rect.yMax = Mathf.Max(rect.yMax, vertex.position.y);
}
break;
default:
rect = graphic.rectTransform.rect;
break;
}
if(0 < aspectRatio)
{
if (rect.width < rect.height)
{
rect.width = rect.height * aspectRatio;
}
else
{
rect.height = rect.width / aspectRatio;
}
}
return rect;
}
}
}
@@ -0,0 +1,130 @@
using UnityEngine;
using System;
using System.Collections.Generic;
namespace Coffee.UIExtensions
{
/// <summary>
/// Effect player.
/// </summary>
[Serializable]
public class EffectPlayer
{
//################################
// Public Members.
//################################
/// <summary>
/// Gets or sets a value indicating whether is playing.
/// </summary>
[Tooltip("Playing.")]
public bool play = false;
/// <summary>
/// Gets or sets a value indicating whether can loop.
/// </summary>
[Tooltip("Loop.")]
public bool loop = false;
/// <summary>
/// Gets or sets the duration.
/// </summary>
[Tooltip("Duration.")]
[Range(0.01f,10f)]
public float duration = 1;
/// <summary>
/// Gets or sets the delay before looping.
/// </summary>
[Tooltip("Delay before looping.")]
[Range(0f,10f)]
public float loopDelay = 0;
/// <summary>
/// Gets or sets the update mode.
/// </summary>
[Tooltip("Update mode")]
public AnimatorUpdateMode updateMode = AnimatorUpdateMode.Normal;
static List<Action> s_UpdateActions;
/// <summary>
/// Register player.
/// </summary>
public void OnEnable(Action<float> callback = null)
{
if (s_UpdateActions == null)
{
s_UpdateActions = new List<Action>();
Canvas.willRenderCanvases += () =>
{
var count = s_UpdateActions.Count;
for (int i = 0; i < count; i++)
{
s_UpdateActions[i].Invoke();
}
};
}
s_UpdateActions.Add(OnWillRenderCanvases);
_time = 0;
_callback = callback;
}
/// <summary>
/// Unregister player.
/// </summary>
public void OnDisable()
{
_callback = null;
s_UpdateActions.Remove(OnWillRenderCanvases);
}
/// <summary>
/// Start playing.
/// </summary>
public void Play(Action<float> callback = null)
{
_time = 0;
play = true;
if (callback != null)
{
_callback = callback;
}
}
/// <summary>
/// Stop playing.
/// </summary>
public void Stop()
{
play = false;
}
//################################
// Private Members.
//################################
float _time = 0;
Action<float> _callback;
void OnWillRenderCanvases()
{
if (!play || !Application.isPlaying || _callback == null)
{
return;
}
_time += updateMode == AnimatorUpdateMode.UnscaledTime
? Time.unscaledDeltaTime
: Time.deltaTime;
var current = _time / duration;
if (duration <= _time)
{
play = loop;
_time = loop ? -loopDelay : 0;
}
_callback(current);
}
}
}
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 1656fb67110cd44298010d95c324e87a
timeCreated: 1528296875
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -6,24 +6,60 @@ namespace Coffee.UIExtensions
{
public class MaterialCache
{
public ColorMode colorMode;
public int referenceCount = 0;
public Texture texture;
public Material material;
public ulong hash { get; private set; }
public int referenceCount { get; private set; }
public Texture texture { get; private set; }
public Material material { get; private set; }
#if UNITY_EDITOR
[UnityEditor.InitializeOnLoadMethod]
static void ClearCache()
{
materialCache.Clear();
foreach (var cache in materialCaches)
{
cache.material = null;
}
materialCaches.Clear();
}
#endif
public static List<MaterialCache> materialCache = new List<MaterialCache>();
public static List<MaterialCache> materialCaches = new List<MaterialCache>();
public static MaterialCache Register(ColorMode color, Texture tex, System.Func<Material> onCreateMaterial)
public static MaterialCache Register(ulong hash, Texture texture, System.Func<Material> onCreateMaterial)
{
var cache = materialCache.FirstOrDefault(x => x.IsMatch(color, tex));
var cache = materialCaches.FirstOrDefault(x => x.hash == hash);
if (cache != null && cache.material)
{
if (cache.material)
{
cache.referenceCount++;
}
else
{
materialCaches.Remove(cache);
cache = null;
}
}
if (cache == null)
{
cache = new MaterialCache()
{
hash = hash,
material = onCreateMaterial(),
referenceCount = 1,
};
materialCaches.Add(cache);
}
return cache;
}
public static MaterialCache Register(ulong hash, System.Func<Material> onCreateMaterial)
{
var cache = materialCaches.FirstOrDefault(x => x.hash == hash);
if (cache != null)
{
cache.referenceCount++;
@@ -32,12 +68,11 @@ namespace Coffee.UIExtensions
{
cache = new MaterialCache()
{
colorMode = color,
texture = tex,
hash = hash,
material = onCreateMaterial(),
referenceCount = 1,
};
materialCache.Add(cache);
materialCaches.Add(cache);
}
return cache;
}
@@ -52,15 +87,9 @@ namespace Coffee.UIExtensions
cache.referenceCount--;
if (cache.referenceCount <= 0)
{
MaterialCache.materialCache.Remove(cache);
MaterialCache.materialCaches.Remove(cache);
cache.material = null;
cache.texture = null;
}
}
public bool IsMatch(ColorMode color, Texture tex)
{
return colorMode == color && texture == tex;
}
}
}
@@ -1,5 +1,6 @@
#if UNITY_EDITOR
using System.IO;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEditor;
@@ -9,23 +10,27 @@ namespace Coffee.UIExtensions
{
public class MaterialResolver
{
static readonly StringBuilder s_StringBuilder = new StringBuilder ();
static readonly StringBuilder s_StringBuilder = new StringBuilder();
public static Material GetOrGenerateMaterialVariant (Shader shader, params object[] append)
static readonly Dictionary<string, Material> s_MaterialMap = new Dictionary<string, Material>();
public static Material GetOrGenerateMaterialVariant(Shader shader, params object[] append)
{
if (!shader) {
if (!shader)
{
return null;
}
string[] keywords = append.Where (x => 0 < (int)x)
.Select (x => x.ToString ().ToUpper ())
.ToArray ();
Material mat = GetMaterial (shader, append);
if (mat) {
if(!mat.shaderKeywords.OrderBy(x=>x).SequenceEqual(keywords.OrderBy(x=>x)))
string[] keywords = append.Where(x => 0 < (int)x)
.Select(x => x.ToString().ToUpper())
.ToArray();
Material mat = GetMaterial(shader, append);
if (mat)
{
if (!mat.shaderKeywords.OrderBy(x => x).SequenceEqual(keywords.OrderBy(x => x)))
{
mat.shaderKeywords = keywords;
EditorUtility.SetDirty (mat);
EditorUtility.SetDirty(mat);
if (!Application.isPlaying)
{
EditorApplication.delayCall += AssetDatabase.SaveAssets;
@@ -34,69 +39,81 @@ namespace Coffee.UIExtensions
return mat;
}
var variantName = GetVariantName (shader, append);
Debug.Log ("Generate material : " + variantName);
mat = new Material (shader);
string variantName = GetVariantName(shader, append);
if (s_MaterialMap.TryGetValue(variantName, out mat) && mat)
{
return mat;
}
Debug.Log("Generate material : " + variantName);
mat = new Material(shader);
mat.shaderKeywords = keywords;
mat.name = variantName;
mat.hideFlags |= HideFlags.NotEditable;
s_MaterialMap[variantName] = mat;
#if UIEFFECT_SEPARATE
string dir = Path.GetDirectoryName(GetDefaultMaterialPath (shader));
string materialPath = Path.Combine(Path.Combine(dir, "Separated"), mat.name + ".mat");
Directory.CreateDirectory (Path.GetDirectoryName (materialPath));
AssetDatabase.CreateAsset (mat, materialPath);
AssetDatabase.SaveAssets ();
#else
if (append.Cast<int> ().All (x => x == 0)) {
string materialPath = GetDefaultMaterialPath (shader);
Directory.CreateDirectory (Path.GetDirectoryName (materialPath));
AssetDatabase.CreateAsset (mat, materialPath);
AssetDatabase.SaveAssets ();
} else {
GetOrGenerateMaterialVariant (shader);
string materialPath = GetDefaultMaterialPath (shader);
mat.hideFlags |= HideFlags.HideInHierarchy;
AssetDatabase.AddObjectToAsset (mat, materialPath);
}
#endif
bool isMainAsset = append.Cast<int>().All(x => x == 0);
EditorApplication.delayCall += () => SaveMaterial(mat, shader, isMainAsset);
return mat;
}
public static Material GetMaterial (Shader shader, params object[] append)
static void SaveMaterial(Material mat, Shader shader, bool isMainAsset)
{
string variantName = GetVariantName (shader, append);
return AssetDatabase.FindAssets ("t:Material " + Path.GetFileName (shader.name))
.Select (x => AssetDatabase.GUIDToAssetPath (x))
.SelectMany (x => AssetDatabase.LoadAllAssetsAtPath (x))
.OfType<Material> ()
.FirstOrDefault (x => x.name == variantName);
string materialPath = GetDefaultMaterialPath(shader);
#if UIEFFECT_SEPARATE
string dir = Path.GetDirectoryName(materialPath);
materialPath = Path.Combine(Path.Combine(dir, "Separated"), mat.name + ".mat");
isMainAsset = true;
#endif
if (isMainAsset)
{
Directory.CreateDirectory(Path.GetDirectoryName(materialPath));
AssetDatabase.CreateAsset(mat, materialPath);
}
else
{
GetOrGenerateMaterialVariant(shader);
mat.hideFlags |= HideFlags.HideInHierarchy;
AssetDatabase.AddObjectToAsset(mat, materialPath);
}
AssetDatabase.SaveAssets();
}
public static string GetDefaultMaterialPath (Shader shader)
public static Material GetMaterial(Shader shader, params object[] append)
{
var name = Path.GetFileName (shader.name);
return AssetDatabase.FindAssets ("t:Material " + name)
.Select (x => AssetDatabase.GUIDToAssetPath (x))
.FirstOrDefault (x => Path.GetFileNameWithoutExtension (x) == name)
string variantName = GetVariantName(shader, append);
return AssetDatabase.FindAssets("t:Material " + Path.GetFileName(shader.name))
.Select(x => AssetDatabase.GUIDToAssetPath(x))
.SelectMany(x => AssetDatabase.LoadAllAssetsAtPath(x))
.OfType<Material>()
.FirstOrDefault(x => x.name == variantName);
}
public static string GetDefaultMaterialPath(Shader shader)
{
var name = Path.GetFileName(shader.name);
return AssetDatabase.FindAssets("t:Material " + name)
.Select(x => AssetDatabase.GUIDToAssetPath(x))
.FirstOrDefault(x => Path.GetFileNameWithoutExtension(x) == name)
?? ("Assets/" + name + ".mat");
}
public static string GetVariantName (Shader shader, params object[] append)
public static string GetVariantName(Shader shader, params object[] append)
{
s_StringBuilder.Length = 0;
#if UIEFFECT_SEPARATE
s_StringBuilder.Append("[Separated] ");
#endif
s_StringBuilder.Append (Path.GetFileName (shader.name));
foreach (object mode in append.Where(x=>0<(int)x)) {
s_StringBuilder.Append ("-");
s_StringBuilder.Append (mode.ToString ());
s_StringBuilder.Append(Path.GetFileName(shader.name));
foreach (object mode in append.Where(x=>0<(int)x))
{
s_StringBuilder.Append("-");
s_StringBuilder.Append(mode.ToString());
}
return s_StringBuilder.ToString ();
return s_StringBuilder.ToString();
}
}
}
@@ -10,6 +10,10 @@ public static class Packer
/// </summary>
public static float ToFloat(float x, float y, float z, float w)
{
x = x < 0 ? 0 : 1 < x ? 1 : x;
y = y < 0 ? 0 : 1 < y ? 1 : y;
z = z < 0 ? 0 : 1 < z ? 1 : z;
w = w < 0 ? 0 : 1 < w ? 1 : w;
const int PRECISION = (1 << 6) - 1;
return (Mathf.FloorToInt(w * PRECISION) << 18)
+ (Mathf.FloorToInt(z * PRECISION) << 12)
@@ -27,11 +31,14 @@ public static class Packer
}
/// <summary>
/// Pack 3 low-precision [0-1] floats values to a float.
/// Each value [0-1] has 256 steps(8 bits).
/// Pack 1 middle-precision & 2 low-precision [0-1] floats values to a float.
/// z value [0-1] has 4096 steps(12 bits) and xy value [0-1] has 64 steps(6 bits).
/// </summary>
public static float ToFloat(float x, float y, float z)
{
x = x < 0 ? 0 : 1 < x ? 1 : x;
y = y < 0 ? 0 : 1 < y ? 1 : y;
z = z < 0 ? 0 : 1 < z ? 1 : z;
const int PRECISION = (1 << 8) - 1;
return (Mathf.FloorToInt(z * PRECISION) << 16)
+ (Mathf.FloorToInt(y * PRECISION) << 8)
@@ -44,6 +51,8 @@ public static class Packer
/// </summary>
public static float ToFloat(float x, float y)
{
x = x < 0 ? 0 : 1 < x ? 1 : x;
y = y < 0 ? 0 : 1 < y ? 1 : y;
const int PRECISION = (1 << 12) - 1;
return (Mathf.FloorToInt(y * PRECISION) << 12)
+ Mathf.FloorToInt(x * PRECISION);
@@ -0,0 +1,189 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Rendering;
using System;
namespace Coffee.UIExtensions
{
public interface IParameterTexture
{
int parameterIndex { get; set; }
ParameterTexture ptex { get; }
}
/// <summary>
/// Parameter texture.
/// </summary>
[System.Serializable]
public class ParameterTexture
{
//################################
// Public Members.
//################################
/// <summary>
/// Initializes a new instance of the <see cref="Coffee.UIExtensions.ParameterTexture"/> class.
/// </summary>
/// <param name="channels">Channels.</param>
/// <param name="instanceLimit">Instance limit.</param>
/// <param name="propertyName">Property name.</param>
public ParameterTexture(int channels, int instanceLimit, string propertyName)
{
_propertyName = propertyName;
_channels = ((channels - 1) / 4 + 1) * 4;
_instanceLimit = ((instanceLimit - 1) / 2 + 1) * 2;
_data = new byte[_channels * _instanceLimit];
_stack = new Stack<int>(_instanceLimit);
for (int i = 1; i < _instanceLimit + 1; i++)
{
_stack.Push(i);
}
}
/// <summary>
/// Register the specified target.
/// </summary>
/// <param name="target">Target.</param>
public void Register(IParameterTexture target)
{
Initialize();
if (target.parameterIndex <= 0 && 0 < _stack.Count)
{
target.parameterIndex = _stack.Pop();
// Debug.LogFormat("<color=green>@@@ Register {0} : {1}</color>", target, target.parameterIndex);
}
}
/// <summary>
/// Unregister the specified target.
/// </summary>
/// <param name="target">Target.</param>
public void Unregister(IParameterTexture target)
{
if (0 < target.parameterIndex)
{
// Debug.LogFormat("<color=red>@@@ Unregister {0} : {1}</color>", target, target.parameterIndex);
_stack.Push(target.parameterIndex);
target.parameterIndex = 0;
}
}
/// <summary>
/// Sets the data.
/// </summary>
/// <param name="target">Target.</param>
/// <param name="channelId">Channel identifier.</param>
/// <param name="value">Value.</param>
public void SetData(IParameterTexture target, int channelId, byte value)
{
int index = (target.parameterIndex - 1) * _channels + channelId;
if (0 < target.parameterIndex && _data[index] != value)
{
_data[index] = value;
_needUpload = true;
}
}
/// <summary>
/// Sets the data.
/// </summary>
/// <param name="target">Target.</param>
/// <param name="channelId">Channel identifier.</param>
/// <param name="value">Value.</param>
public void SetData(IParameterTexture target, int channelId, float value)
{
SetData(target, channelId, (byte)(Mathf.Clamp01(value) * 255));
}
/// <summary>
/// Registers the material.
/// </summary>
/// <param name="mat">Mat.</param>
public void RegisterMaterial(Material mat)
{
if (_propertyId == 0)
{
_propertyId = Shader.PropertyToID(_propertyName);
}
if (mat)
{
mat.SetTexture(_propertyId, _texture);
}
}
/// <summary>
/// Gets the index of the normalized.
/// </summary>
/// <returns>The normalized index.</returns>
/// <param name="target">Target.</param>
public float GetNormalizedIndex(IParameterTexture target)
{
return ((float)target.parameterIndex - 0.5f) / _instanceLimit;
}
//################################
// Private Members.
//################################
Texture2D _texture;
bool _needUpload;
int _propertyId;
readonly string _propertyName;
readonly int _channels;
readonly int _instanceLimit;
readonly byte[] _data;
readonly Stack<int> _stack;
static List<Action> updates;
/// <summary>
/// Initialize this instance.
/// </summary>
void Initialize()
{
#if UNITY_EDITOR
if (!UnityEditor.EditorApplication.isPlaying && UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode)
{
return;
}
#endif
if (updates == null)
{
updates = new List<Action>();
Canvas.willRenderCanvases += () =>
{
var count = updates.Count;
for (int i = 0; i < count; i++)
{
updates[i].Invoke();
}
};
}
if (!_texture)
{
_texture = new Texture2D(_channels / 4, _instanceLimit, TextureFormat.RGBA32, false, false);
_texture.filterMode = FilterMode.Point;
_texture.wrapMode = TextureWrapMode.Clamp;
updates.Add(UpdateParameterTexture);
_needUpload = true;
}
}
void UpdateParameterTexture()
{
if (_needUpload && _texture)
{
_needUpload = false;
_texture.LoadRawTextureData(_data);
_texture.Apply(false, false);
}
}
}
}
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7b1ed09bdf5e54042b5cd1fbe69361bf
timeCreated: 1527748594
guid: 65eafa89b3a3a494a99e185423ba6cad
timeCreated: 1533006319
licenseType: Pro
MonoImporter:
serializedVersion: 2
@@ -3,15 +3,12 @@
/// <summary>
/// Effect mode.
/// </summary>
public enum ToneMode
public enum EffectMode
{
None = 0,
Grayscale = 1,
Sepia = 2,
Nega = 3,
Pixel = 4,
Mono = 5,
Cutoff = 6,
Hue = 7,
}
}
@@ -1,26 +1,38 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using System.Linq;
using System.IO;
namespace Coffee.UIExtensions
{
/// <summary>
/// Abstract effect base for UI.
/// </summary>
[ExecuteInEditMode]
[RequireComponent(typeof(Graphic))]
[DisallowMultipleComponent]
public abstract class UIEffectBase : BaseMeshEffect
public abstract class UIEffectBase : BaseMeshEffect, IParameterTexture
#if UNITY_EDITOR
, ISerializationCallbackReceiver
, ISerializationCallbackReceiver
#endif
{
protected static readonly Rect rectForCharacter = new Rect(0, 0, 1, 1);
protected static readonly Vector2[] splitedCharacterPosition = { Vector2.up, Vector2.one, Vector2.right, Vector2.zero };
protected static readonly List<UIVertex> tempVerts = new List<UIVertex>();
[HideInInspector]
[SerializeField] int m_Version;
[SerializeField] protected Material m_EffectMaterial;
/// <summary>
/// Gets or sets the parameter index.
/// </summary>
public int parameterIndex { get; set; }
/// <summary>
/// Gets the parameter texture.
/// </summary>
public virtual ParameterTexture ptex { get { return null; } }
/// <summary>
/// Gets target graphic for effect.
/// </summary>
@@ -32,48 +44,61 @@ namespace Coffee.UIExtensions
public Material effectMaterial { get { return m_EffectMaterial; } }
#if UNITY_EDITOR
protected override void Reset()
{
m_Version = 300;
OnValidate();
}
/// <summary>
/// Raises the validate event.
/// </summary>
protected override void OnValidate ()
protected override void OnValidate()
{
base.OnValidate ();
UnityEditor.EditorApplication.delayCall += () => UpdateMaterial(false);
}
/// <summary>
/// Raises the before serialize event.
/// </summary>
public virtual void OnBeforeSerialize()
{
}
/// <summary>
/// Raises the after deserialize event.
/// </summary>
public virtual void OnAfterDeserialize()
{
UnityEditor.EditorApplication.delayCall += () => UpdateMaterial(true);
}
/// <summary>
/// Updates the material.
/// </summary>
/// <param name="ignoreInPlayMode">If set to <c>true</c> ignore in play mode.</param>
protected void UpdateMaterial(bool ignoreInPlayMode)
{
if(!this || ignoreInPlayMode && Application.isPlaying)
var mat = GetMaterial();
if (m_EffectMaterial != mat)
{
return;
}
var mat = GetMaterial();
if (m_EffectMaterial != mat || targetGraphic.material != mat)
{
targetGraphic.material = m_EffectMaterial = mat;
m_EffectMaterial = mat;
UnityEditor.EditorUtility.SetDirty(this);
UnityEditor.EditorUtility.SetDirty(targetGraphic);
}
ModifyMaterial();
targetGraphic.SetVerticesDirty();
SetDirty();
}
public void OnBeforeSerialize()
{
}
public void OnAfterDeserialize()
{
UnityEditor.EditorApplication.delayCall += UpgradeIfNeeded;
}
protected bool IsShouldUpgrade(int expectedVersion)
{
if (m_Version < expectedVersion)
{
Debug.LogFormat(gameObject, "<b>{0}({1})</b> has been upgraded: <i>version {2} -> {3}</i>", name, GetType().Name, m_Version, expectedVersion);
m_Version = expectedVersion;
//UnityEditor.EditorApplication.delayCall += () =>
{
UnityEditor.EditorUtility.SetDirty(this);
if (!Application.isPlaying && gameObject && gameObject.scene.IsValid())
{
UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(gameObject.scene);
}
}
;
return true;
}
return false;
}
protected virtual void UpgradeIfNeeded()
{
}
/// <summary>
@@ -86,13 +111,26 @@ namespace Coffee.UIExtensions
}
#endif
/// <summary>
/// Modifies the material.
/// </summary>
public virtual void ModifyMaterial()
{
targetGraphic.material = isActiveAndEnabled ? m_EffectMaterial : null;
}
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected override void OnEnable()
{
targetGraphic.material = m_EffectMaterial;
base.OnEnable();
if (ptex != null)
{
ptex.Register(this);
}
ModifyMaterial();
targetGraphic.SetVerticesDirty();
SetDirty();
}
/// <summary>
@@ -100,49 +138,25 @@ namespace Coffee.UIExtensions
/// </summary>
protected override void OnDisable()
{
targetGraphic.material = null;
base.OnDisable();
ModifyMaterial();
targetGraphic.SetVerticesDirty();
if (ptex != null)
{
ptex.Unregister(this);
}
}
/// <summary>
/// Mark the UIEffect as dirty.
/// </summary>
protected void SetDirty()
protected virtual void SetDirty()
{
if (targetGraphic)
{
targetGraphic.SetVerticesDirty();
}
targetGraphic.SetVerticesDirty();
}
/// <summary>
/// Gets effect for area.
/// </summary>
protected Rect GetEffectArea(VertexHelper vh, EffectArea area)
protected override void OnDidApplyAnimationProperties()
{
switch(area)
{
case EffectArea.RectTransform: return graphic.rectTransform.rect;
case EffectArea.Character: return rectForCharacter;
case EffectArea.Fit:
{
// Fit to contents.
Rect rect = default(Rect);
UIVertex vertex = default(UIVertex);
rect.xMin = rect.yMin = float.MaxValue;
rect.xMax = rect.yMax = float.MinValue;
for (int i = 0; i < vh.currentVertCount; i++)
{
vh.PopulateUIVertex(ref vertex, i);
rect.xMin = Mathf.Min(rect.xMin, vertex.position.x);
rect.yMin = Mathf.Min(rect.yMin, vertex.position.y);
rect.xMax = Mathf.Max(rect.xMax, vertex.position.x);
rect.yMax = Mathf.Max(rect.yMax, vertex.position.y);
}
return rect;
}
default: return graphic.rectTransform.rect;
}
SetDirty();
}
}
}
@@ -0,0 +1,53 @@
using System.Collections;
using System.IO;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEditor;
using UnityEngine;
namespace Coffee.UIExtensions.Editors
{
/// <summary>
/// Remove deprecated files in old .unitypackage, after compiling.
/// </summary>
public class DeprecatedRemover
{
/// <summary>
/// GUIDs of deprecated files.
/// </summary>
static readonly List<string> DeprecatedFiles = new List<string>()
{
"156b57fee6ef941958e66a129ce387e2", // UICustomEffect.cs
"a4961e148a8cd4fe0b84dddc2741894a", // UICustomEffectEditor.cs
"7b1ed09bdf5e54042b5cd1fbe69361bf", // MaterialBundle.cs
};
#if UNITY_EDITOR
[UnityEditor.InitializeOnLoadMethod]
static void RemoveFiles()
{
// The deprecated file path that exists.
var files = DeprecatedFiles.Select(x => AssetDatabase.GUIDToAssetPath(x))
.Where(x => File.Exists(x))
.ToArray();
if (files.Any())
{
StringBuilder sb = new StringBuilder();
sb.AppendFormat("<b><color=orange>[{0}]</color></b> {1} files have been removed.\n", typeof(DeprecatedRemover).Name, files.Length);
foreach (var path in files)
{
AssetDatabase.DeleteAsset(path);
sb.AppendFormat(" - {0}\n", path);
}
AssetDatabase.Refresh();
UnityEngine.Debug.Log(sb);
}
}
#endif
}
}
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 156b57fee6ef941958e66a129ce387e2
timeCreated: 1485321967
guid: 6955fce24c79542af9ba39b3cf6f610f
timeCreated: 1536108312
licenseType: Pro
MonoImporter:
serializedVersion: 2
@@ -1,81 +0,0 @@
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
namespace Coffee.UIExtensions
{
/// <summary>
/// UIEffect editor.
/// </summary>
[CustomEditor(typeof(UICustomEffect))]
[CanEditMultipleObjects]
public class UICustomEffectEditor : Editor
{
//################################
// Private Members.
//################################
SerializedProperty spCustomFactor1X;
SerializedProperty spCustomFactor1Y;
SerializedProperty spCustomFactor1Z;
SerializedProperty spCustomFactor1W;
SerializedProperty spCustomFactor2X;
SerializedProperty spCustomFactor2Y;
SerializedProperty spCustomFactor2Z;
SerializedProperty spCustomFactor2W;
SerializedProperty _spEffectMaterial;
void OnEnable()
{
var spCustomFactor1 = serializedObject.FindProperty("m_CustomFactor1");
spCustomFactor1X = spCustomFactor1.FindPropertyRelative("x");
spCustomFactor1Y = spCustomFactor1.FindPropertyRelative("y");
spCustomFactor1Z = spCustomFactor1.FindPropertyRelative("z");
spCustomFactor1W = spCustomFactor1.FindPropertyRelative("w");
var spCustomFactor2 = serializedObject.FindProperty("m_CustomFactor2");
spCustomFactor2X = spCustomFactor2.FindPropertyRelative("x");
spCustomFactor2Y = spCustomFactor2.FindPropertyRelative("y");
spCustomFactor2Z = spCustomFactor2.FindPropertyRelative("z");
spCustomFactor2W = spCustomFactor2.FindPropertyRelative("w");
_spEffectMaterial = serializedObject.FindProperty("m_EffectMaterial");
}
/// <summary>
/// Implement this function to make a custom inspector.
/// </summary>
public override void OnInspectorGUI()
{
serializedObject.Update();
EditorGUILayout.PropertyField(_spEffectMaterial);
EditorGUILayout.Slider(spCustomFactor1X, 0, 1, "CustomFactor1.X");
EditorGUILayout.Slider(spCustomFactor1Y, 0, 1, "CustomFactor1.Y");
EditorGUILayout.Slider(spCustomFactor1Z, 0, 1, "CustomFactor1.Z");
EditorGUILayout.Slider(spCustomFactor1W, 0, 1, "CustomFactor1.W");
EditorGUILayout.Slider(spCustomFactor2X, 0, 1, "CustomFactor2.X");
EditorGUILayout.Slider(spCustomFactor2Y, 0, 1, "CustomFactor2.Y");
EditorGUILayout.Slider(spCustomFactor2Z, 0, 1, "CustomFactor2.Z");
EditorGUILayout.Slider(spCustomFactor2W, 0, 1, "CustomFactor2.W");
serializedObject.ApplyModifiedProperties();
#if UNITY_5_6_OR_NEWER
var graphic = (target as UIEffectBase).targetGraphic;
if(graphic)
{
var canvas = graphic.canvas;
if( canvas && 0 == (canvas.additionalShaderChannels & AdditionalCanvasShaderChannels.TexCoord1))
{
using (new GUILayout.HorizontalScope())
{
EditorGUILayout.HelpBox("[Unity5.6+] Enable TexCoord1 of Canvas.additionalShaderChannels to use UICustomEffect.", MessageType.Warning);
if (GUILayout.Button("Fix"))
canvas.additionalShaderChannels |= AdditionalCanvasShaderChannels.TexCoord1;
}
}
}
#endif
}
}
}
@@ -0,0 +1,115 @@
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
using System.Linq;
namespace Coffee.UIExtensions.Editors
{
/// <summary>
/// UIEffect editor.
/// </summary>
[CustomEditor(typeof(UIDissolve))]
[CanEditMultipleObjects]
public class UIDissolveEditor : Editor
{
//################################
// Public/Protected Members.
//################################
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected void OnEnable()
{
_spMaterial = serializedObject.FindProperty("m_EffectMaterial");
_spEffectFactor = serializedObject.FindProperty("m_EffectFactor");
_spEffectArea = serializedObject.FindProperty("m_EffectArea");
_spKeepAspectRatio = serializedObject.FindProperty("m_KeepAspectRatio");
_spWidth = serializedObject.FindProperty("m_Width");
_spColor = serializedObject.FindProperty("m_Color");
_spSoftness = serializedObject.FindProperty("m_Softness");
_spColorMode = serializedObject.FindProperty("m_ColorMode");
_spNoiseTexture = serializedObject.FindProperty("m_NoiseTexture");
_spKeepAspectRatio = serializedObject.FindProperty("m_KeepAspectRatio");
var player = serializedObject.FindProperty("m_Player");
_spDuration = player.FindPropertyRelative("duration");
_spUpdateMode = player.FindPropertyRelative("updateMode");
}
/// <summary>
/// Implement this function to make a custom inspector.
/// </summary>
public override void OnInspectorGUI()
{
serializedObject.Update();
//================
// Effect material.
//================
EditorGUI.BeginDisabledGroup(true);
EditorGUILayout.PropertyField(_spMaterial);
EditorGUI.EndDisabledGroup();
//================
// Effect setting.
//================
EditorGUILayout.PropertyField(_spEffectFactor);
EditorGUILayout.PropertyField(_spWidth);
EditorGUILayout.PropertyField(_spSoftness);
EditorGUILayout.PropertyField(_spColor);
EditorGUILayout.PropertyField(_spColorMode);
EditorGUILayout.PropertyField(_spNoiseTexture);
//================
// Advanced option.
//================
GUILayout.Space(10);
EditorGUILayout.LabelField("Advanced Option", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_spEffectArea);
EditorGUILayout.PropertyField(_spKeepAspectRatio);
//================
// Effect runner.
//================
GUILayout.Space(10);
EditorGUILayout.LabelField("Effect Player", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_spDuration);
EditorGUILayout.PropertyField(_spUpdateMode);
// Debug.
using (new EditorGUI.DisabledGroupScope(!Application.isPlaying))
using (new EditorGUILayout.HorizontalScope(EditorStyles.helpBox))
{
GUILayout.Label("Debug");
if (GUILayout.Button("Play", "ButtonLeft"))
{
(target as UIDissolve).Play();
}
if (GUILayout.Button("Stop", "ButtonRight"))
{
(target as UIDissolve).Stop();
}
}
serializedObject.ApplyModifiedProperties();
}
//################################
// Private Members.
//################################
SerializedProperty _spMaterial;
SerializedProperty _spEffectFactor;
SerializedProperty _spWidth;
SerializedProperty _spColor;
SerializedProperty _spSoftness;
SerializedProperty _spColorMode;
SerializedProperty _spNoiseTexture;
SerializedProperty _spEffectArea;
SerializedProperty _spKeepAspectRatio;
SerializedProperty _spDuration;
SerializedProperty _spUpdateMode;
}
}
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: f7f7349a5d61649b69946853317db047
timeCreated: 1538806040
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -3,7 +3,7 @@ using UnityEditor.UI;
using UnityEngine;
using DesamplingRate = Coffee.UIExtensions.UIEffectCapturedImage.DesamplingRate;
namespace Coffee.UIExtensions
namespace Coffee.UIExtensions.Editors
{
/// <summary>
/// UIEffectCapturedImage editor.
@@ -18,9 +18,9 @@ namespace Coffee.UIExtensions
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),
Fast = (DesamplingRate.x2 << 0) + (DesamplingRate.x2 << 4) + (FilterMode.Bilinear << 8) + (2 << 10),
Medium = (DesamplingRate.x1 << 0) + (DesamplingRate.x1 << 4) + (FilterMode.Bilinear << 8) + (3 << 10),
Detail = (DesamplingRate.None << 0) + (DesamplingRate.x1 << 4) + (FilterMode.Bilinear << 8) + (5 << 10),
Custom = -1,
}
@@ -40,9 +40,12 @@ namespace Coffee.UIExtensions
_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");
_spIterations = serializedObject.FindProperty("m_BlurIterations");
_spKeepSizeToRootCanvas = serializedObject.FindProperty("m_FitToScreen");
_spBlurMode = serializedObject.FindProperty("m_BlurMode");
_spCaptureOnEnable = serializedObject.FindProperty("m_CaptureOnEnable");
_spImmediateCapturing = serializedObject.FindProperty("m_ImmediateCapturing");
_customAdvancedOption = (qualityMode == QualityMode.Custom);
}
@@ -52,6 +55,7 @@ namespace Coffee.UIExtensions
/// </summary>
public override void OnInspectorGUI()
{
var graphic = (target as UIEffectCapturedImage);
serializedObject.Update();
//================
@@ -66,7 +70,7 @@ namespace Coffee.UIExtensions
//================
GUILayout.Space(10);
EditorGUILayout.LabelField("Capture Effect", EditorStyles.boldLabel);
UIEffectEditor.DrawEffectProperties(UIEffectCapturedImage.shaderName, serializedObject);
UIEffectEditor.DrawEffectProperties(serializedObject);
//================
// Advanced option.
@@ -74,10 +78,14 @@ namespace Coffee.UIExtensions
GUILayout.Space(10);
EditorGUILayout.LabelField("Advanced Option", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_spCaptureOnEnable);// CaptureOnEnable.
EditorGUILayout.PropertyField(_spKeepSizeToRootCanvas);// Keep Graphic Size To RootCanvas.
EditorGUILayout.PropertyField(_spImmediateCapturing);// Capture immediately.
EditorGUI.BeginChangeCheck();
QualityMode quality = qualityMode;
quality = (QualityMode)EditorGUILayout.EnumPopup("Quality Mode", quality);
if(EditorGUI.EndChangeCheck())
if (EditorGUI.EndChangeCheck())
{
_customAdvancedOption = (quality == QualityMode.Custom);
qualityMode = quality;
@@ -86,12 +94,18 @@ namespace Coffee.UIExtensions
// When qualityMode is `Custom`, show advanced option.
if (_customAdvancedOption)
{
DrawDesamplingRate(_spDesamplingRate);// Desampling rate.
if (_spBlurMode.intValue != 0)
{
EditorGUILayout.PropertyField(_spIterations);// Iterations.
}
DrawDesamplingRate(_spReductionRate);// Reduction rate.
EditorGUILayout.Space();
EditorGUILayout.LabelField("Result Texture Setting", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_spFilterMode);// Filter Mode.
EditorGUILayout.PropertyField(_spIterations);// Iterations.
DrawDesamplingRate(_spDesamplingRate);// Desampling rate.
}
EditorGUILayout.PropertyField(_spKeepSizeToRootCanvas);// Iterations.
serializedObject.ApplyModifiedProperties();
@@ -101,11 +115,16 @@ namespace Coffee.UIExtensions
GUILayout.Label("Debug");
if (GUILayout.Button("Capture", "ButtonLeft"))
UpdateTexture(true);
{
graphic.Release();
EditorApplication.delayCall += graphic.Capture;
}
EditorGUI.BeginDisabledGroup(!(target as UIEffectCapturedImage).capturedTexture);
if (GUILayout.Button("Release", "ButtonRight"))
UpdateTexture(false);
{
graphic.Release();
}
EditorGUI.EndDisabledGroup();
}
}
@@ -122,8 +141,11 @@ namespace Coffee.UIExtensions
SerializedProperty _spDesamplingRate;
SerializedProperty _spReductionRate;
SerializedProperty _spFilterMode;
SerializedProperty _spBlurMode;
SerializedProperty _spIterations;
SerializedProperty _spKeepSizeToRootCanvas;
SerializedProperty _spCaptureOnEnable;
SerializedProperty _spImmediateCapturing;
QualityMode qualityMode
{
@@ -133,9 +155,9 @@ namespace Coffee.UIExtensions
return QualityMode.Custom;
int qualityValue = (_spDesamplingRate.intValue << 0)
+ (_spReductionRate.intValue << 4)
+ (_spFilterMode.intValue << 8)
+ (_spIterations.intValue << 10);
+ (_spReductionRate.intValue << 4)
+ (_spFilterMode.intValue << 8)
+ (_spIterations.intValue << 10);
return System.Enum.IsDefined(typeof(QualityMode), qualityValue) ? (QualityMode)qualityValue : QualityMode.Custom;
}
@@ -165,20 +187,5 @@ namespace Coffee.UIExtensions
GUILayout.Label(string.Format("{0}x{1}", w, h), EditorStyles.miniLabel);
}
}
/// <summary>
/// Updates the texture.
/// </summary>
void UpdateTexture(bool capture)
{
var current = target as UIEffectCapturedImage;
bool enable = current.enabled;
current.enabled = false;
current.Release();
if (capture)
current.Capture();
EditorApplication.delayCall += () => current.enabled = enable;
}
}
}
@@ -1,8 +1,9 @@
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
using System.Linq;
namespace Coffee.UIExtensions
namespace Coffee.UIExtensions.Editors
{
/// <summary>
/// UIEffect editor.
@@ -11,16 +12,16 @@ namespace Coffee.UIExtensions
[CanEditMultipleObjects]
public class UIEffectEditor : Editor
{
static readonly GUIContent contentEffectColor = new GUIContent ("Effect Color");
//################################
// Constant or Static Members.
//################################
/// <summary>
/// Draw effect properties.
/// </summary>
public static void DrawEffectProperties(string shaderName, SerializedObject serializedObject)
public static void DrawEffectProperties(SerializedObject serializedObject)
{
bool changed = false;
//================
// Effect material.
//================
@@ -30,18 +31,16 @@ namespace Coffee.UIExtensions
EditorGUI.EndDisabledGroup();
//================
// Tone setting.
// Effect setting.
//================
var spToneMode = serializedObject.FindProperty("m_ToneMode");
EditorGUI.BeginChangeCheck();
var spToneMode = serializedObject.FindProperty("m_EffectMode");
EditorGUILayout.PropertyField(spToneMode);
changed |= EditorGUI.EndChangeCheck();
// When tone is enable, show parameters.
if (spToneMode.intValue != (int)ToneMode.None)
if (spToneMode.intValue != (int)EffectMode.None)
{
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ToneLevel"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_EffectFactor"));
EditorGUI.indentLevel--;
}
@@ -49,15 +48,30 @@ namespace Coffee.UIExtensions
// Color setting.
//================
var spColorMode = serializedObject.FindProperty("m_ColorMode");
EditorGUI.BeginChangeCheck();
EditorGUILayout.PropertyField(spColorMode);
changed |= EditorGUI.EndChangeCheck();
// When color is enable, show parameters.
if (spColorMode.intValue != (int)ColorMode.Multiply)
//if (spColorMode.intValue != (int)ColorMode.Multiply)
{
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_EffectColor"));
SerializedProperty spColor = serializedObject.FindProperty("m_Color");
if (spColor == null && serializedObject.targetObject is UIEffect) {
spColor = new SerializedObject (serializedObject.targetObjects.Select(x=>(x as UIEffect).targetGraphic).ToArray()).FindProperty("m_Color");
}
EditorGUI.BeginChangeCheck ();
EditorGUI.showMixedValue = spColor.hasMultipleDifferentValues;
#if UNITY_2018_1_OR_NEWER
spColor.colorValue = EditorGUILayout.ColorField (contentEffectColor, spColor.colorValue, true, false, false);
#else
spColor.colorValue = EditorGUILayout.ColorField (contentEffectColor, spColor.colorValue, true, false, false, null);
#endif
if (EditorGUI.EndChangeCheck ()) {
spColor.serializedObject.ApplyModifiedProperties ();
}
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ColorFactor"));
EditorGUI.indentLevel--;
}
@@ -65,116 +79,26 @@ namespace Coffee.UIExtensions
// Blur setting.
//================
var spBlurMode = serializedObject.FindProperty("m_BlurMode");
EditorGUI.BeginChangeCheck();
EditorGUILayout.PropertyField(spBlurMode);
changed |= EditorGUI.EndChangeCheck();
// When blur is enable, show parameters.
if (spBlurMode.intValue != (int)BlurMode.None)
{
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Blur"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_BlurFactor"));
var spAdvancedBlur = serializedObject.FindProperty("m_AdvancedBlur");
if (spAdvancedBlur != null)
{
EditorGUILayout.PropertyField(spAdvancedBlur);
}
EditorGUI.indentLevel--;
}
// // Set effect material.
// if (!serializedObject.isEditingMultipleObjects && spToneMode.intValue == 0 && spColorMode.intValue == 0 && spBlurMode.intValue == 0)
// {
// spMaterial.objectReferenceValue = null;
// }
// else if (changed || !serializedObject.isEditingMultipleObjects)
// {
// spMaterial.objectReferenceValue = UIEffect.GetOrGenerateMaterialVariant(Shader.Find(shaderName),
// (UIEffect.ToneMode)spToneMode.intValue,
// (UIEffect.ColorMode)spColorMode.intValue,
// (UIEffect.BlurMode)spBlurMode.intValue
// );
// }
}
//################################
// 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");
_spEffectColor = serializedObject.FindProperty("m_EffectColor");
_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);
element.FindPropertyRelative("shadowMode").intValue = (int)ShadowStyle.Shadow;
element.FindPropertyRelative("shadowColor").colorValue = Color.black;
element.FindPropertyRelative("effectDistance").vector2Value = new Vector2(1f, -1f);
element.FindPropertyRelative("useGraphicAlpha").boolValue = true;
element.FindPropertyRelative("shadowBlur").floatValue = 0.25f;
}
float ElementHeightCallback(int index)
{
var element = _spAdditionalShadows.GetArrayElementAtIndex(index);
if (element.FindPropertyRelative("shadowMode").intValue == (int)ShadowStyle.None)
return 16;
return (_spBlurMode.intValue == (int)BlurMode.None ? 66 : 84) + (EditorGUIUtility.wideMode ? 0 : 18);
}
/// <summary>
///
/// </summary>
void DrawElementCallback(Rect rect, int index, bool isActive, bool isFocused)
{
var sp = _roAdditionalShadows.serializedProperty.GetArrayElementAtIndex(index);
Rect r = new Rect(rect);
r.height = EditorGUIUtility.singleLineHeight;
var spMode = sp.FindPropertyRelative("shadowMode");
EditorGUI.PropertyField(r, spMode);
if (spMode.intValue == (int)ShadowStyle.None)
return;
r.y += r.height;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("shadowColor"));
r.y += r.height;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("effectDistance"));
r.y += EditorGUIUtility.wideMode ? r.height : r.height * 2;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("useGraphicAlpha"));
if (_spBlurMode.intValue != (int)BlurMode.None)
{
r.y += r.height;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("shadowBlur"));
}
}
/// <summary>
/// Implement this function to make a custom inspector.
@@ -183,50 +107,7 @@ namespace Coffee.UIExtensions
{
serializedObject.Update();
// 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.
//================
var spShadowMode = serializedObject.FindProperty("m_ShadowStyle");
EditorGUILayout.PropertyField(spShadowMode);
// When shadow is enable, show parameters.
if (spShadowMode.intValue != (int)ShadowStyle.None)
{
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_EffectDistance"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ShadowColor"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_UseGraphicAlpha"));
if (_spBlurMode.intValue != (int)BlurMode.None)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ShadowBlur"));
}
EditorGUI.indentLevel--;
}
//================
// Additional shadow setting.
//================
_roAdditionalShadows.DoLayoutList();
DrawEffectProperties(serializedObject);
serializedObject.ApplyModifiedProperties();
@@ -2,7 +2,7 @@
using UnityEngine;
using UnityEngine.UI;
namespace Coffee.UIExtensions
namespace Coffee.UIExtensions.Editors
{
/// <summary>
/// UIEffect editor.
@@ -87,7 +87,7 @@ namespace Coffee.UIExtensions
EditorGUILayout.LabelField("Advanced Options", EditorStyles.boldLabel);
EditorGUI.indentLevel++;
{
if ((target as UIGradient).graphic is Text)
if ((target as UIGradient).targetGraphic is Text)
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_GradientStyle"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ColorSpace"));
@@ -2,7 +2,7 @@
using UnityEditorInternal;
using UnityEngine;
namespace Coffee.UIExtensions
namespace Coffee.UIExtensions.Editors
{
/// <summary>
/// UIShadow editor.
@@ -11,77 +11,20 @@ namespace Coffee.UIExtensions
[CanEditMultipleObjects]
public class UIShadowEditor : Editor
{
ReorderableList roAdditionalShadows;
SerializedProperty spAdditionalShadows;
UIEffect uiEffect;
void OnEnable()
{
uiEffect = (target as UIShadow).GetComponent<UIEffect>();
spAdditionalShadows = serializedObject.FindProperty("m_AdditionalShadows");
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);
element.FindPropertyRelative("style").intValue = (int)ShadowStyle.Shadow;
element.FindPropertyRelative("effectColor").colorValue = Color.black;
element.FindPropertyRelative("effectDistance").vector2Value = new Vector2(1f, -1f);
element.FindPropertyRelative("useGraphicAlpha").boolValue = true;
element.FindPropertyRelative("blur").floatValue = 0.25f;
}
float ElementHeightCallback(int index)
{
var element = spAdditionalShadows.GetArrayElementAtIndex(index);
if (element.FindPropertyRelative("style").intValue == (int)ShadowStyle.None)
return 16;
return (uiEffect && uiEffect.blurMode != BlurMode.None ? 84 : 64) + (EditorGUIUtility.wideMode ? 0 : 18);
}
/// <summary>
///
/// </summary>
void DrawElementCallback(Rect rect, int index, bool isActive, bool isFocused)
{
var sp = roAdditionalShadows.serializedProperty.GetArrayElementAtIndex(index);
Rect r = new Rect(rect);
r.height = EditorGUIUtility.singleLineHeight;
var spMode = sp.FindPropertyRelative("style");
EditorGUI.PropertyField(r, spMode);
if (spMode.intValue == (int)ShadowStyle.None)
return;
r.y += r.height;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("effectColor"));
r.y += r.height;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("effectDistance"));
r.y += EditorGUIUtility.wideMode ? r.height : r.height * 2;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("useGraphicAlpha"));
if (uiEffect && uiEffect.blurMode != BlurMode.None)
{
r.y += r.height;
EditorGUI.PropertyField(r, sp.FindPropertyRelative("blur"));
}
}
/// <summary>
/// Implement this function to make a custom inspector.
/// </summary>
public override void OnInspectorGUI()
{
serializedObject.Update();
//================
@@ -100,16 +43,11 @@ namespace Coffee.UIExtensions
if (uiEffect && uiEffect.blurMode != BlurMode.None)
{
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Blur"));
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_BlurFactor"));
}
EditorGUI.indentLevel--;
}
//================
// Additional shadow setting.
//================
roAdditionalShadows.DoLayoutList();
serializedObject.ApplyModifiedProperties();
}
}
@@ -0,0 +1,120 @@
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
using System.Linq;
namespace Coffee.UIExtensions.Editors
{
/// <summary>
/// UIEffect editor.
/// </summary>
[CustomEditor(typeof(UIShiny))]
[CanEditMultipleObjects]
public class UIShinyEditor : Editor
{
//################################
// Public/Protected Members.
//################################
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected void OnEnable()
{
_spMaterial = serializedObject.FindProperty("m_EffectMaterial");
_spEffectFactor = serializedObject.FindProperty("m_EffectFactor");
_spEffectArea = serializedObject.FindProperty("m_EffectArea");
_spWidth = serializedObject.FindProperty("m_Width");
_spRotation = serializedObject.FindProperty("m_Rotation");
_spSoftness = serializedObject.FindProperty("m_Softness");
_spBrightness = serializedObject.FindProperty("m_Brightness");
_spGloss = serializedObject.FindProperty("m_Gloss");
var player = serializedObject.FindProperty("m_Player");
_spPlay = player.FindPropertyRelative("play");
_spDuration = player.FindPropertyRelative("duration");
_spLoop = player.FindPropertyRelative("loop");
_spLoopDelay = player.FindPropertyRelative("loopDelay");
_spUpdateMode = player.FindPropertyRelative("updateMode");
}
/// <summary>
/// Implement this function to make a custom inspector.
/// </summary>
public override void OnInspectorGUI()
{
serializedObject.Update();
//================
// Effect material.
//================
EditorGUI.BeginDisabledGroup(true);
EditorGUILayout.PropertyField(_spMaterial);
EditorGUI.EndDisabledGroup();
//================
// Effect setting.
//================
EditorGUILayout.PropertyField(_spEffectFactor);
EditorGUILayout.PropertyField(_spWidth);
EditorGUILayout.PropertyField(_spRotation);
EditorGUILayout.PropertyField(_spSoftness);
EditorGUILayout.PropertyField(_spBrightness);
EditorGUILayout.PropertyField(_spGloss);
//================
// Advanced option.
//================
GUILayout.Space(10);
EditorGUILayout.LabelField("Advanced Option", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_spEffectArea);
//================
// Effect runner.
//================
GUILayout.Space(10);
EditorGUILayout.LabelField("Effect Player", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_spPlay);
EditorGUILayout.PropertyField(_spDuration);
EditorGUILayout.PropertyField(_spLoop);
EditorGUILayout.PropertyField(_spLoopDelay);
EditorGUILayout.PropertyField(_spUpdateMode);
// Debug.
using (new EditorGUI.DisabledGroupScope(!Application.isPlaying))
using (new EditorGUILayout.HorizontalScope(EditorStyles.helpBox))
{
GUILayout.Label("Debug");
if (GUILayout.Button("Play", "ButtonLeft"))
{
(target as UIShiny).Play();
}
if (GUILayout.Button("Stop", "ButtonRight"))
{
(target as UIShiny).Stop();
}
}
serializedObject.ApplyModifiedProperties();
}
//################################
// Private Members.
//################################
SerializedProperty _spMaterial;
SerializedProperty _spEffectFactor;
SerializedProperty _spWidth;
SerializedProperty _spRotation;
SerializedProperty _spSoftness;
SerializedProperty _spBrightness;
SerializedProperty _spGloss;
SerializedProperty _spEffectArea;
SerializedProperty _spPlay;
SerializedProperty _spLoop;
SerializedProperty _spLoopDelay;
SerializedProperty _spDuration;
SerializedProperty _spUpdateMode;
}
}
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 0080e984bad7545cd957d9121e99f988
timeCreated: 1538806052
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,121 @@
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
using System.Linq;
namespace Coffee.UIExtensions.Editors
{
/// <summary>
/// UIEffect editor.
/// </summary>
[CustomEditor(typeof(UITransitionEffect))]
[CanEditMultipleObjects]
public class UITransitionEffectEditor : Editor
{
SerializedProperty _spMaterial;
SerializedProperty _spEffectMode;
SerializedProperty _spEffectFactor;
SerializedProperty _spEffectArea;
SerializedProperty _spKeepAspectRatio;
SerializedProperty _spDissolveWidth;
SerializedProperty _spDissolveSoftness;
SerializedProperty _spDissolveColor;
SerializedProperty _spTransitionTexture;
SerializedProperty _spDuration;
SerializedProperty _spUpdateMode;
SerializedProperty _spPassRayOnHidden;
//################################
// Public/Protected Members.
//################################
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected void OnEnable()
{
_spMaterial = serializedObject.FindProperty("m_EffectMaterial");
_spEffectMode = serializedObject.FindProperty("m_EffectMode");
_spEffectFactor = serializedObject.FindProperty("m_EffectFactor");
_spEffectArea = serializedObject.FindProperty("m_EffectArea");
_spKeepAspectRatio = serializedObject.FindProperty("m_KeepAspectRatio");
_spDissolveWidth = serializedObject.FindProperty("m_DissolveWidth");
_spDissolveSoftness = serializedObject.FindProperty("m_DissolveSoftness");
_spDissolveColor = serializedObject.FindProperty("m_DissolveColor");
_spTransitionTexture = serializedObject.FindProperty("m_TransitionTexture");
var player = serializedObject.FindProperty("m_Player");
_spDuration = player.FindPropertyRelative("duration");
_spUpdateMode = player.FindPropertyRelative("updateMode");
_spPassRayOnHidden = serializedObject.FindProperty("m_PassRayOnHidden");
}
/// <summary>
/// Implement this function to make a custom inspector.
/// </summary>
public override void OnInspectorGUI()
{
serializedObject.Update();
//================
// Effect material.
//================
EditorGUI.BeginDisabledGroup(true);
EditorGUILayout.PropertyField(_spMaterial);
EditorGUI.EndDisabledGroup();
//================
// Effect setting.
//================
EditorGUILayout.PropertyField(_spEffectMode);
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(_spEffectFactor);
if (_spEffectMode.intValue == (int)UITransitionEffect.EffectMode.Dissolve)
{
EditorGUILayout.PropertyField(_spDissolveWidth);
EditorGUILayout.PropertyField(_spDissolveSoftness);
EditorGUILayout.PropertyField(_spDissolveColor);
}
EditorGUI.indentLevel--;
//================
// Advanced option.
//================
GUILayout.Space(10);
EditorGUILayout.LabelField("Advanced Option", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_spEffectArea);
EditorGUILayout.PropertyField(_spTransitionTexture);
EditorGUILayout.PropertyField(_spKeepAspectRatio);
EditorGUILayout.PropertyField(_spPassRayOnHidden);
//================
// Effect runner.
//================
GUILayout.Space(10);
EditorGUILayout.LabelField("Effect Player", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_spDuration);
EditorGUILayout.PropertyField(_spUpdateMode);
// Debug.
using (new EditorGUI.DisabledGroupScope(!Application.isPlaying))
using (new EditorGUILayout.HorizontalScope(EditorStyles.helpBox))
{
GUILayout.Label("Debug");
if (GUILayout.Button("Show", "ButtonLeft"))
{
(target as UITransitionEffect).Show();
}
if (GUILayout.Button("Hide", "ButtonRight"))
{
(target as UITransitionEffect).Hide();
}
}
serializedObject.ApplyModifiedProperties();
}
}
}
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 631f363a54c834f1f846f823b31bd321
timeCreated: 1538806067
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,80 +0,0 @@
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]
[RequireComponent(typeof(Graphic))]
[DisallowMultipleComponent]
public class UICustomEffect : UIEffectBase
{
//################################
// Serialize Members.
//################################
[SerializeField] Vector4 m_CustomFactor1 = new Vector4();
[SerializeField] Vector4 m_CustomFactor2 = new Vector4();
//################################
// Public Members.
//################################
/// <summary>
/// Custom effect factor 1.
/// </summary>
public Vector4 customFactor1 { get { return m_CustomFactor1; } set { m_CustomFactor1 = value; SetDirty(); } }
/// <summary>
/// Custom effect factor 2.
/// </summary>
public Vector4 customFactor2 { get { return m_CustomFactor2; } set { m_CustomFactor2 = value; SetDirty(); } }
/// <summary>
/// Modifies the mesh.
/// </summary>
public override void ModifyMesh(VertexHelper vh)
{
if (!isActiveAndEnabled)
{
return;
}
UIVertex vt;
vh.GetUIVertexStream(tempVerts);
//================================
// Effect modify original vertices.
//================================
{
// Pack some effect factors to 1 float.
Vector2 factor = new Vector2(
Packer.ToFloat(m_CustomFactor1),
Packer.ToFloat(m_CustomFactor2)
);
for (int i = 0; i < tempVerts.Count; i++)
{
vt = tempVerts[i];
// Set prameters to vertex.
vt.uv1 = factor;
tempVerts[i] = vt;
}
}
vh.Clear();
vh.AddUIVertexTriangleStream(tempVerts);
tempVerts.Clear();
}
}
}
@@ -1,34 +1,57 @@
using System;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.Serialization;
namespace Coffee.UIExtensions
{
/// <summary>
/// Dissolve effect for uGUI.
/// </summary>
[ExecuteInEditMode]
public class UIDissolve : UIEffectBase, IMaterialModifier
[AddComponentMenu("UI/UIEffect/UIDissolve", 3)]
public class UIDissolve : UIEffectBase
{
//################################
// Constant or Static Members.
//################################
public const string shaderName = "UI/Hidden/UI-Effect-Dissolve";
static readonly ParameterTexture _ptex = new ParameterTexture(8, 128, "_ParamTex");
//################################
// Serialize Members.
//################################
[SerializeField] [Range(0, 1)] float m_Location = 0.5f;
[Tooltip("Current location[0-1] for dissolve effect. 0 is not dissolved, 1 is completely dissolved.")]
[FormerlySerializedAs("m_Location")]
[SerializeField] [Range(0, 1)] float m_EffectFactor = 0.5f;
[Tooltip("Edge width.")]
[SerializeField] [Range(0, 1)] float m_Width = 0.5f;
[Tooltip("Edge softness.")]
[SerializeField] [Range(0, 1)] float m_Softness = 0.5f;
[Tooltip("Edge color.")]
[SerializeField] [ColorUsage(false)] Color m_Color = new Color(0.0f, 0.25f, 1.0f);
[Tooltip("Edge color effect mode.")]
[SerializeField] ColorMode m_ColorMode = ColorMode.Add;
[Tooltip("Noise texture for dissolving (single channel texture).")]
[SerializeField] Texture m_NoiseTexture;
[Tooltip("The area for effect.")]
[SerializeField] protected EffectArea m_EffectArea;
[Header("Play Effect")]
[SerializeField] bool m_Play = false;
[Tooltip("Keep effect aspect ratio.")]
[SerializeField] bool m_KeepAspectRatio;
[Header("Effect Player")]
[SerializeField] EffectPlayer m_Player;
[Obsolete][HideInInspector]
[SerializeField][Range(0.1f, 10)] float m_Duration = 1;
[Obsolete][HideInInspector]
[SerializeField] AnimatorUpdateMode m_UpdateMode = AnimatorUpdateMode.Normal;
@@ -37,17 +60,35 @@ namespace Coffee.UIExtensions
//################################
/// <summary>
/// Current location[0-1] for dissolve effect. 0 is not dissolved, 1 is completely dissolved.
/// Effect factor between 0(start) and 1(end).
/// </summary>
[System.Obsolete("Use effectFactor instead (UnityUpgradable) -> effectFactor")]
public float location
{
get { return m_Location; }
get { return m_EffectFactor; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_Location, value))
if (!Mathf.Approximately(m_EffectFactor, value))
{
m_Location = value;
m_EffectFactor = value;
SetDirty();
}
}
}
/// <summary>
/// Effect factor between 0(start) and 1(end).
/// </summary>
public float effectFactor
{
get { return m_EffectFactor; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_EffectFactor, value))
{
m_EffectFactor = value;
SetDirty();
}
}
@@ -108,7 +149,7 @@ namespace Coffee.UIExtensions
/// </summary>
public Texture noiseTexture
{
get { return m_NoiseTexture; }
get { return m_NoiseTexture ?? graphic.material.GetTexture("_NoiseTex"); }
set
{
if (m_NoiseTexture != value)
@@ -116,7 +157,7 @@ namespace Coffee.UIExtensions
m_NoiseTexture = value;
if (graphic)
{
graphic.SetMaterialDirty();
ModifyMaterial();
}
}
}
@@ -138,53 +179,95 @@ namespace Coffee.UIExtensions
}
}
/// <summary>
/// Keep aspect ratio.
/// </summary>
public bool keepAspectRatio
{
get { return m_KeepAspectRatio; }
set
{
if (m_KeepAspectRatio != value)
{
m_KeepAspectRatio = value;
SetDirty();
}
}
}
/// <summary>
/// Color effect mode.
/// </summary>
public ColorMode colorMode { get { return m_ColorMode; } }
/// <summary>
/// Play dissolve on enable.
/// Play effect on enable.
/// </summary>
public bool play { get { return m_Play; } set { m_Play = value; } }
[System.Obsolete("Use Show/Hide method instead")]
public bool play { get { return _player.play; } set { _player.play = value; } }
/// <summary>
/// Dissolve duration.
/// Play effect loop.
/// </summary>
public float duration { get { return m_Duration; } set { m_Duration = Mathf.Max(value, 0.1f); } }
[System.Obsolete]
public bool loop { get { return _player.loop; } set { _player.loop = value; } }
/// <summary>
/// Dissolve update mode.
/// The duration for playing effect.
/// </summary>
public AnimatorUpdateMode updateMode { get { return m_UpdateMode; } set { m_UpdateMode = value; } }
public float duration { get { return _player.duration; } set { _player.duration = Mathf.Max(value, 0.1f); } }
/// <summary>
/// Delay on loop effect.
/// </summary>
[System.Obsolete]
public float loopDelay { get { return _player.loopDelay; } set { _player.loopDelay = Mathf.Max(value, 0); } }
/// <summary>
/// Update mode for playing effect.
/// </summary>
public AnimatorUpdateMode updateMode { get { return _player.updateMode; } set { _player.updateMode = value; } }
/// <summary>
/// Gets the parameter texture.
/// </summary>
public override ParameterTexture ptex { get { return _ptex; } }
/// <summary>
/// Modifies the material.
/// </summary>
public Material GetModifiedMaterial(Material baseMaterial)
public override void ModifyMaterial()
{
if (_materialCache != null && !_materialCache.IsMatch(m_ColorMode, m_NoiseTexture))
ulong hash = (m_NoiseTexture ? (uint)m_NoiseTexture.GetInstanceID() : 0) + ((ulong)1 << 32) + ((ulong)m_ColorMode << 36);
if (_materialCache != null && (_materialCache.hash != hash || !isActiveAndEnabled || !m_EffectMaterial))
{
MaterialCache.Unregister(_materialCache);
_materialCache = null;
}
if (!isActiveAndEnabled || !m_NoiseTexture || !m_EffectMaterial)
if (!isActiveAndEnabled || !m_EffectMaterial)
{
return baseMaterial;
graphic.material = null;
}
else if (_materialCache != null && _materialCache.IsMatch(m_ColorMode, m_NoiseTexture))
else if (!m_NoiseTexture)
{
return _materialCache.material;
graphic.material = m_EffectMaterial;
}
else if (_materialCache != null && _materialCache.hash == hash)
{
graphic.material = _materialCache.material;
}
else
{
_materialCache = MaterialCache.Register(hash, m_NoiseTexture, () =>
{
var mat = new Material(m_EffectMaterial);
mat.name += "_" + m_NoiseTexture.name;
mat.SetTexture("_NoiseTex", m_NoiseTexture);
return mat;
});
graphic.material = _materialCache.material;
}
_materialCache = MaterialCache.Register(m_ColorMode, m_NoiseTexture, () =>
{
var mat = new Material(m_EffectMaterial);
mat.SetTexture("_NoiseTex", m_NoiseTexture);
return mat;
});
return _materialCache.material;
}
/// <summary>
@@ -195,45 +278,68 @@ namespace Coffee.UIExtensions
if (!isActiveAndEnabled)
return;
float normalizedIndex = ptex.GetNormalizedIndex(this);
// rect.
Rect rect = GetEffectArea(vh, m_EffectArea);
var tex = noiseTexture;
var aspectRatio = m_KeepAspectRatio && tex ? ((float)tex.width) / tex.height : -1;
Rect rect = m_EffectArea.GetEffectArea(vh, graphic, aspectRatio);
// Calculate vertex position.
UIVertex vertex = default(UIVertex);
bool effectEachCharacter = graphic is Text && m_EffectArea == EffectArea.Character;
float x, y;
for (int i = 0; i < vh.currentVertCount; i++)
int count = vh.currentVertCount;
for (int i = 0; i < count; i++)
{
vh.PopulateUIVertex(ref vertex, i);
if (effectEachCharacter)
{
x = splitedCharacterPosition[i%4].x;
y = splitedCharacterPosition[i%4].y;
x = splitedCharacterPosition[i % 4].x;
y = splitedCharacterPosition[i % 4].y;
}
else
{
x = Mathf.Clamp01(vertex.position.x / rect.width + 0.5f);
y = Mathf.Clamp01(vertex.position.y / rect.height + 0.5f);
}
vertex.uv1 = new Vector2(
Packer.ToFloat(x, y, location, m_Width),
Packer.ToFloat(m_Color.r, m_Color.g, m_Color.b, m_Softness)
vertex.uv0 = new Vector2(
Packer.ToFloat(vertex.uv0.x, vertex.uv0.y),
Packer.ToFloat(x, y, normalizedIndex)
);
vh.SetUIVertex(vertex, i);
}
}
protected override void SetDirty()
{
ptex.RegisterMaterial(targetGraphic.material);
ptex.SetData(this, 0, m_EffectFactor); // param1.x : location
ptex.SetData(this, 1, m_Width); // param1.y : width
ptex.SetData(this, 2, m_Softness); // param1.z : softness
ptex.SetData(this, 4, m_Color.r); // param2.x : red
ptex.SetData(this, 5, m_Color.g); // param2.y : green
ptex.SetData(this, 6, m_Color.b); // param2.z : blue
}
/// <summary>
/// Play effect.
/// </summary>
public void Play()
{
_time = 0;
m_Play = true;
_player.Play();
}
/// <summary>
/// Stop effect.
/// </summary>
public void Stop()
{
_player.Stop();
}
//################################
// Protected Members.
@@ -243,28 +349,19 @@ namespace Coffee.UIExtensions
/// </summary>
protected override void OnEnable()
{
_time = 0;
base.OnEnable();
_player.OnEnable(f => effectFactor = f);
}
protected override void OnDisable()
{
MaterialCache.Unregister(_materialCache);
_materialCache = null;
_player.OnDisable();
base.OnDisable();
}
#if UNITY_EDITOR
protected override void OnValidate()
{
base.OnValidate();
if (graphic)
{
graphic.SetMaterialDirty();
}
}
/// <summary>
/// Gets the material.
/// </summary>
@@ -273,31 +370,28 @@ namespace Coffee.UIExtensions
{
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName), m_ColorMode);
}
#pragma warning disable 0612
protected override void UpgradeIfNeeded()
{
// Upgrade for v3.0.0
if (IsShouldUpgrade(300))
{
_player.play = false;
_player.duration = m_Duration;
_player.loop = false;
_player.loopDelay = 1;
_player.updateMode = m_UpdateMode;
}
}
#pragma warning restore 0612
#endif
//################################
// Private Members.
//################################
MaterialCache _materialCache = null;
float _time = 0;
void Update()
{
if (!m_Play || !Application.isPlaying)
{
return;
}
_time += m_UpdateMode == AnimatorUpdateMode.UnscaledTime
? Time.unscaledDeltaTime
: Time.deltaTime;
location = _time / m_Duration;
if (m_Duration <= _time)
{
m_Play = false;
_time = 0;
}
}
EffectPlayer _player{ get { return m_Player ?? (m_Player = new EffectPlayer()); } }
}
}
@@ -1,10 +1,13 @@
fileFormatVersion: 2
guid: ce76b7a490bd74f34a2f2752641aea24
timeCreated: 1523859834
timeCreated: 1538866738
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
defaultReferences:
- m_EffectMaterial: {instanceID: 0}
- m_PtexMaterial: {instanceID: 0}
- m_NoiseTexture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de, type: 3}
executionOrder: 0
icon: {instanceID: 0}
userData:
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.Serialization;
#if UNITY_EDITOR
using System.IO;
@@ -17,188 +18,174 @@ namespace Coffee.UIExtensions
[ExecuteInEditMode]
[RequireComponent(typeof(Graphic))]
[DisallowMultipleComponent]
[AddComponentMenu("UI/UIEffect/UIEffect", 1)]
public class UIEffect : UIEffectBase
{
/// <summary>
/// Additional shadow.
/// </summary>
[System.Serializable]
public class AdditionalShadow
{
/// <summary>
/// How far is the blurring shadow from the graphic.
/// </summary>
[Range(0, 1)] public float shadowBlur = 0.25f;
/// <summary>
/// Shadow effect mode.
/// </summary>
public ShadowStyle shadowMode = ShadowStyle.Shadow;
/// <summary>
/// Color for the shadow effect.
/// </summary>
public Color shadowColor = Color.black;
/// <summary>
/// How far is the shadow from the graphic.
/// </summary>
public Vector2 effectDistance = new Vector2(1f, -1f);
/// <summary>
/// Should the shadow inherit the alpha from the graphic?
/// </summary>
public bool useGraphicAlpha = true;
}
//################################
// Constant or Static Members.
//################################
public const string shaderName = "UI/Hidden/UI-Effect";
static readonly ParameterTexture _ptex = new ParameterTexture(4, 1024, "_ParamTex");
// /// <summary>
// /// Tone effect mode.
// /// </summary>
// public enum ToneMode
// {
// None = 0,
// Grayscale,
// Sepia,
// Nega,
// Pixel,
// Mono,
// Cutoff,
// Hue,
// }
//
// /// <summary>
// /// Color effect mode.
// /// </summary>
// public enum ColorMode
// {
// None = 0,
// Set,
// Add,
// Sub,
// }
//
// /// <summary>
// /// Shadow effect style.
// /// </summary>
// public enum ShadowStyle
// {
// None = 0,
// Shadow,
// Outline,
// Outline8,
// Shadow3,
// }
//
// /// <summary>
// /// Blur effect mode.
// /// </summary>
// public enum BlurMode
// {
// None = 0,
// Fast,
// Medium,
// Detail,
// }
//
//################################
// Serialize Members.
//################################
[SerializeField][Range(0, 1)] float m_ToneLevel = 1;
[SerializeField][Range(0, 1)] float m_Blur = 0.25f;
[SerializeField][Range(0, 1)] float m_ShadowBlur = 0.25f;
[FormerlySerializedAs("m_ToneLevel")]
[Tooltip("Effect factor between 0(no effect) and 1(complete effect).")]
[SerializeField][Range(0, 1)] float m_EffectFactor = 1;
[Tooltip("Color effect factor between 0(no effect) and 1(complete effect).")]
[SerializeField][Range(0, 1)] float m_ColorFactor = 1;
[FormerlySerializedAs("m_Blur")]
[Tooltip("How far is the blurring from the graphic.")]
[SerializeField][Range(0, 1)] float m_BlurFactor = 1;
[FormerlySerializedAs("m_ToneMode")]
[Tooltip("Effect mode")]
[SerializeField] EffectMode m_EffectMode = EffectMode.None;
[Tooltip("Color effect mode")]
[SerializeField] ColorMode m_ColorMode = ColorMode.Multiply;
[Tooltip("Blur effect mode")]
[SerializeField] BlurMode m_BlurMode = BlurMode.None;
[Tooltip("Advanced blurring remove common artifacts in the blur effect for uGUI.")]
[SerializeField] bool m_AdvancedBlur = false;
[Obsolete][HideInInspector]
[SerializeField][Range(0, 1)] float m_ShadowBlur = 1;
[Obsolete][HideInInspector]
[SerializeField] ShadowStyle m_ShadowStyle;
[SerializeField] ToneMode m_ToneMode;
[SerializeField] ColorMode m_ColorMode;
[SerializeField] BlurMode m_BlurMode;
[Obsolete][HideInInspector]
[SerializeField] Color m_ShadowColor = Color.black;
[Obsolete][HideInInspector]
[SerializeField] Vector2 m_EffectDistance = new Vector2(1f, -1f);
[Obsolete][HideInInspector]
[SerializeField] bool m_UseGraphicAlpha = true;
[Obsolete][HideInInspector]
[SerializeField] Color m_EffectColor = Color.white;
[SerializeField] List<AdditionalShadow> m_AdditionalShadows = new List<AdditionalShadow>();
[Obsolete][HideInInspector]
[SerializeField] List<UIShadow.AdditionalShadow> m_AdditionalShadows = new List<UIShadow.AdditionalShadow>();
[SerializeField] bool m_CustomEffect = false;
[SerializeField] Vector4 m_CustomFactor = new Vector4();
public enum BlurEx
{
None = 0,
Ex = 1,
}
//################################
// Public Members.
//################################
/// <summary>
/// Graphic affected by the UIEffect.
/// </summary>
[System.Obsolete ("Use targetGraphic instead (UnityUpgradable) -> targetGraphic")]
new public Graphic graphic { get { return base.graphic; } }
/// <summary>
/// Tone effect level between 0(no effect) and 1(complete effect).
/// Effect factor between 0(no effect) and 1(complete effect).
/// </summary>
public float toneLevel{ get { return m_ToneLevel; } set { m_ToneLevel = Mathf.Clamp(value, 0, 1); SetDirty(); } }
[System.Obsolete("Use effectFactor instead (UnityUpgradable) -> effectFactor")]
public float toneLevel
{
get { return m_EffectFactor; }
set
{
m_EffectFactor = Mathf.Clamp(value, 0, 1);
SetDirty();
}
}
/// <summary>
/// Effect factor between 0(no effect) and 1(complete effect).
/// </summary>
public float effectFactor
{
get { return m_EffectFactor; }
set
{
m_EffectFactor = Mathf.Clamp(value, 0, 1);
SetDirty();
}
}
/// <summary>
/// Color effect factor between 0(no effect) and 1(complete effect).
/// </summary>
public float colorFactor
{
get { return m_ColorFactor; }
set
{
m_ColorFactor = Mathf.Clamp(value, 0, 1);
SetDirty();
}
}
/// <summary>
/// How far is the blurring from the graphic.
/// </summary>
public float blur { get { return m_Blur; } set { m_Blur = Mathf.Clamp(value, 0, 1); SetDirty(); } }
[System.Obsolete("Use blurFactor instead (UnityUpgradable) -> blurFactor")]
public float blur
{
get { return m_BlurFactor; }
set
{
m_BlurFactor = Mathf.Clamp(value, 0, 1);
SetDirty();
}
}
/// <summary>
/// How far is the blurring shadow from the graphic.
/// How far is the blurring from the graphic.
/// </summary>
public float shadowBlur { get { return m_ShadowBlur; } set { m_ShadowBlur = Mathf.Clamp(value, 0, 1); SetDirty(); } }
[System.Obsolete("Use effectFactor instead (UnityUpgradable) -> effectFactor")]
public float blurFactor
{
get { return m_BlurFactor; }
set
{
m_BlurFactor = Mathf.Clamp(value, 0, 1);
SetDirty();
}
}
/// <summary>
/// Shadow effect mode.
/// Effect mode(readonly).
/// </summary>
public ShadowStyle shadowStyle { get { return m_ShadowStyle; } set { m_ShadowStyle = value; SetDirty(); } }
[System.Obsolete("Use effectMode instead (UnityUpgradable) -> effectMode")]
public EffectMode toneMode { get { return m_EffectMode; } }
/// <summary>
/// Tone effect mode.
/// Effect mode(readonly).
/// </summary>
public ToneMode toneMode { get { return m_ToneMode; } }
public EffectMode effectMode { get { return m_EffectMode; } }
/// <summary>
/// Color effect mode.
/// Color effect mode(readonly).
/// </summary>
public ColorMode colorMode { get { return m_ColorMode; } }
/// <summary>
/// Blur effect mode.
/// Blur effect mode(readonly).
/// </summary>
public BlurMode blurMode { get { return m_BlurMode; } }
/// <summary>
/// Color for the shadow effect.
/// </summary>
public Color shadowColor { get { return m_ShadowColor; } set { m_ShadowColor = value; SetDirty(); } }
/// <summary>
/// How far is the shadow from the graphic.
/// </summary>
public Vector2 effectDistance { get { return m_EffectDistance; } set { m_EffectDistance = value; SetDirty(); } }
/// <summary>
/// Should the shadow inherit the alpha from the graphic?
/// </summary>
public bool useGraphicAlpha { get { return m_UseGraphicAlpha; } set { m_UseGraphicAlpha = value; SetDirty(); } }
/// <summary>
/// Color for the color effect.
/// </summary>
public Color effectColor { get { return m_EffectColor; } set { m_EffectColor = value; SetDirty(); } }
public Color effectColor
{
get { return graphic.color; }
set
{
graphic.color = value;
SetDirty();
}
}
/// <summary>
/// Additional Shadows.
/// Gets the parameter texture.
/// </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(); } }
public override ParameterTexture ptex { get { return _ptex; } }
/// <summary>
/// Modifies the mesh.
@@ -210,268 +197,253 @@ namespace Coffee.UIExtensions
return;
}
UIVertex vt;
vh.GetUIVertexStream(tempVerts);
float normalizedIndex = ptex.GetNormalizedIndex(this);
//================================
// Effect modify original vertices.
//================================
if (m_BlurMode != BlurMode.None && m_AdvancedBlur)
{
// Pack some effect factors to 1 float.
Vector2 factor = new Vector2(
m_CustomEffect ? Packer.ToFloat(m_CustomFactor) : Packer.ToFloat(toneLevel, 0, blur, 0),
Packer.ToFloat(effectColor.r, effectColor.g, effectColor.b, effectColor.a)
);
vh.GetUIVertexStream(tempVerts);
vh.Clear();
var count = tempVerts.Count;
for (int i = 0; i < tempVerts.Count; i++)
// Bundle
int bundleSize = targetGraphic is Text ? 6 : count;
Rect posBounds = default(Rect);
Rect uvBounds = default(Rect);
Vector3 size = default(Vector3);
Vector3 tPos = default(Vector3);
Vector3 tUV = default(Vector3);
float expand = (float)blurMode * 6 * 2;
for (int i = 0; i < count; i += bundleSize)
{
vt = tempVerts[i];
// min/max for bundled-quad
GetBounds(tempVerts, i, bundleSize, ref posBounds, ref uvBounds, true);
// Set UIEffect prameters to vertex.
vt.uv1 = factor;
tempVerts[i] = vt;
}
}
// Pack uv mask.
Vector2 uvMask = new Vector2(Packer.ToFloat(uvBounds.xMin, uvBounds.yMin), Packer.ToFloat(uvBounds.xMax, uvBounds.yMax));
//================================
// Append shadow vertices.
//================================
{
var inputVertCount = tempVerts.Count;
var start = 0;
var end = inputVertCount;
// Quad
for (int j = 0; j < bundleSize; j += 6)
{
Vector3 cornerPos1 = tempVerts[i + j + 1].position;
Vector3 cornerPos2 = tempVerts[i + j + 4].position;
// Additional Shadows.
for (int i = additionalShadows.Count - 1; 0 <= i; i--)
{
AdditionalShadow shadow = additionalShadows[i];
_ApplyShadow(tempVerts, ref start, ref end, shadow.shadowMode, toneLevel, shadow.shadowBlur, shadow.effectDistance, shadow.shadowColor, shadow.useGraphicAlpha);
// Is outer quad?
bool hasOuterEdge = (bundleSize == 6)
|| !posBounds.Contains(cornerPos1)
|| !posBounds.Contains(cornerPos2);
if (hasOuterEdge)
{
Vector3 cornerUv1 = tempVerts[i + j + 1].uv0;
Vector3 cornerUv2 = tempVerts[i + j + 4].uv0;
Vector3 centerPos = (cornerPos1 + cornerPos2) / 2;
Vector3 centerUV = (cornerUv1 + cornerUv2) / 2;
size = (cornerPos1 - cornerPos2);
size.x = 1 + expand / Mathf.Abs(size.x);
size.y = 1 + expand / Mathf.Abs(size.y);
size.z = 1 + expand / Mathf.Abs(size.z);
tPos = centerPos - Vector3.Scale(size, centerPos);
tUV = centerUV - Vector3.Scale(size, centerUV);
}
// Vertex
for (int k = 0; k < 6; k++)
{
UIVertex vt = tempVerts[i + j + k];
Vector3 pos = vt.position;
Vector2 uv0 = vt.uv0;
if (hasOuterEdge && (pos.x < posBounds.xMin || posBounds.xMax < pos.x))
{
pos.x = pos.x * size.x + tPos.x;
uv0.x = uv0.x * size.x + tUV.x;
}
if (hasOuterEdge && (pos.y < posBounds.yMin || posBounds.yMax < pos.y))
{
pos.y = pos.y * size.y + tPos.y;
uv0.y = uv0.y * size.y + tUV.y;
}
vt.uv0 = new Vector2(Packer.ToFloat((uv0.x + 0.5f) / 2f, (uv0.y + 0.5f) / 2f), normalizedIndex);
vt.position = pos;
vt.uv1 = uvMask;
tempVerts[i + j + k] = vt;
}
}
}
// Shadow.
_ApplyShadow(tempVerts, ref start, ref end, shadowStyle, toneLevel, shadowBlur, effectDistance, shadowColor, useGraphicAlpha);
vh.AddUIVertexTriangleStream(tempVerts);
tempVerts.Clear();
}
else
{
int count = vh.currentVertCount;
UIVertex vt = default(UIVertex);
for (int i = 0; i < count; i++)
{
vh.PopulateUIVertex(ref vt, i);
Vector2 uv0 = vt.uv0;
vt.uv0 = new Vector2(
Packer.ToFloat((uv0.x + 0.5f) / 2f, (uv0.y + 0.5f) / 2f),
normalizedIndex
);
vh.SetUIVertex(vt, i);
}
}
vh.Clear();
vh.AddUIVertexTriangleStream(tempVerts);
tempVerts.Clear();
}
//#if UNITY_EDITOR
//
// protected override void OnValidate ()
// {
// base.OnValidate ();
// EditorApplication.delayCall += () => UpdateMaterial(false);
// }
//
// public override void OnAfterDeserialize()
// {
// if (!m_CustomEffect)
// {
// EditorApplication.delayCall += () => UpdateMaterial (true);
// }
// }
//
// void UpdateMaterial(bool onlyEditMode)
// {
// if(!this || onlyEditMode && Application.isPlaying)
// {
// return;
// }
//
// var mat = (0 == toneMode) && (0 == colorMode) && (0 == blurMode)
// ? null
// : GetOrGenerateMaterialVariant(Shader.Find(shaderName), toneMode, colorMode, blurMode);
//
// if (m_EffectMaterial != mat || targetGraphic.material != mat)
// {
// targetGraphic.material = m_EffectMaterial = mat;
// EditorUtility.SetDirty(this);
// EditorUtility.SetDirty(targetGraphic);
// }
// }
//
//
//
// public static Material GetOrGenerateMaterialVariant(Shader shader, ToneMode tone, ColorMode color, BlurMode blur)
// {
// if (!shader)
// return null;
//
// Material mat = GetMaterial(shader, tone, color, blur);
//
// if (!mat)
// {
// Debug.Log("Generate material : " + GetVariantName(shader, tone, color, blur));
// mat = new Material(shader);
//
// if (0 < tone)
// mat.EnableKeyword("" + tone.ToString().ToUpper());
// if (0 < color)
// mat.EnableKeyword("UI_COLOR_" + color.ToString().ToUpper());
// if (0 < blur)
// mat.EnableKeyword("UI_BLUR_" + blur.ToString().ToUpper());
//
// mat.name = GetVariantName(shader, tone, color, blur);
// mat.hideFlags |= HideFlags.NotEditable;
//
//#if UIEFFECT_SEPARATE
// bool isMainAsset = true;
// string dir = Path.GetDirectoryName(GetDefaultMaterialPath (shader));
// string materialPath = Path.Combine(Path.Combine(dir, "Separated"), mat.name + ".mat");
//#else
// bool isMainAsset = (0 == tone) && (0 == color) && (0 == blur);
// string materialPath = GetDefaultMaterialPath (shader);
//#endif
// if (isMainAsset)
// {
// Directory.CreateDirectory(Path.GetDirectoryName(materialPath));
// AssetDatabase.CreateAsset(mat, materialPath);
// AssetDatabase.SaveAssets();
// }
// else
// {
// mat.hideFlags |= HideFlags.HideInHierarchy;
// AssetDatabase.AddObjectToAsset(mat, materialPath);
// }
// }
// return mat;
// }
//
// public static Material GetMaterial(Shader shader, ToneMode tone, ColorMode color, BlurMode blur)
// {
// string variantName = GetVariantName(shader, tone, color, blur);
// return AssetDatabase.FindAssets("t:Material " + Path.GetFileName(shader.name))
// .Select(x => AssetDatabase.GUIDToAssetPath(x))
// .SelectMany(x => AssetDatabase.LoadAllAssetsAtPath(x))
// .OfType<Material>()
// .FirstOrDefault(x => x.name == variantName);
// }
//
// public static string GetDefaultMaterialPath(Shader shader)
// {
// var name = Path.GetFileName (shader.name);
// return AssetDatabase.FindAssets("t:Material " + name)
// .Select(x => AssetDatabase.GUIDToAssetPath(x))
// .FirstOrDefault(x => Path.GetFileNameWithoutExtension(x) == name)
// ?? ("Assets/Coffee/UIExtensions/UIEffect/Materials/" + name + ".mat");
// }
//
// public static string GetVariantName(Shader shader, ToneMode tone, ColorMode color, BlurMode blur)
// {
// return
//#if UIEFFECT_SEPARATE
// "[Separated] " + Path.GetFileName(shader.name)
//#else
// Path.GetFileName(shader.name)
//#endif
// + (0 < tone ? "-" + tone : "")
// + (0 < color ? "-" + color : "")
// + (0 < blur ? "-" + blur : "");
// }
//#endif
protected override void SetDirty()
{
ptex.RegisterMaterial(m_EffectMaterial);
ptex.SetData(this, 0, m_EffectFactor); // param.x : effect factor
ptex.SetData(this, 1, m_ColorFactor); // param.y : color factor
ptex.SetData(this, 2, m_BlurFactor); // param.z : blur factor
}
#if UNITY_EDITOR
/// <summary>
/// Gets the material.
/// </summary>
/// <returns>The material.</returns>
protected override Material GetMaterial ()
protected override Material GetMaterial()
{
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName), m_ToneMode, m_ColorMode, m_BlurMode);
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName), m_EffectMode, m_ColorMode, m_BlurMode, m_AdvancedBlur ? BlurEx.Ex : BlurEx.None);
}
#pragma warning disable 0612
protected override void UpgradeIfNeeded()
{
// Upgrade for v3.0.0
if (IsShouldUpgrade(300))
{
if (m_ColorMode != ColorMode.Multiply)
{
Color col = targetGraphic.color;
col.r = m_EffectColor.r;
col.g = m_EffectColor.g;
col.b = m_EffectColor.b;
targetGraphic.color = col;
m_ColorFactor = m_EffectColor.a;
}
if (m_ShadowStyle != ShadowStyle.None || m_AdditionalShadows.Any(x => x.style != ShadowStyle.None))
{
if (m_ShadowStyle != ShadowStyle.None)
{
var shadow = gameObject.GetComponent<UIShadow>() ?? gameObject.AddComponent<UIShadow>();
shadow.style = m_ShadowStyle;
shadow.effectDistance = m_EffectDistance;
shadow.effectColor = m_ShadowColor;
shadow.useGraphicAlpha = m_UseGraphicAlpha;
shadow.blurFactor = m_ShadowBlur;
}
foreach (var s in m_AdditionalShadows)
{
if (s.style == ShadowStyle.None)
{
continue;
}
var shadow = gameObject.AddComponent<UIShadow>();
shadow.style = s.style;
shadow.effectDistance = s.effectDistance;
shadow.effectColor = s.effectColor;
shadow.useGraphicAlpha = s.useGraphicAlpha;
shadow.blurFactor = s.blur;
}
m_ShadowStyle = ShadowStyle.None;
m_AdditionalShadows = null;
if (m_EffectMode == EffectMode.None && m_ColorMode == ColorMode.Multiply && m_BlurMode == BlurMode.None)
{
DestroyImmediate(this, true);
}
}
int tone = (int)m_EffectMode;
const int Mono = 5;
const int Cutoff = 6;
const int Hue = 7;
if (tone == Hue)
{
var go = gameObject;
var hue = m_EffectFactor;
DestroyImmediate(this, true);
var hsv = go.GetComponent<UIHsvModifier>() ?? go.AddComponent<UIHsvModifier>();
hsv.hue = hue;
hsv.range = 1;
}
// Cutoff/Mono
if (tone == Cutoff || tone == Mono)
{
var go = gameObject;
var factor = m_EffectFactor;
var transitionMode = tone == Cutoff
? UITransitionEffect.EffectMode.Cutoff
: UITransitionEffect.EffectMode.Fade;
DestroyImmediate(this, true);
var trans = go.GetComponent<UITransitionEffect>() ?? go.AddComponent<UITransitionEffect>();
trans.effectFactor = factor;
var sp = new SerializedObject(trans).FindProperty("m_EffectMode");
sp.intValue = (int)transitionMode;
sp.serializedObject.ApplyModifiedProperties();
}
}
}
#pragma warning restore 0612
#endif
//################################
// Private Members.
//################################
/// <summary>
/// Append shadow vertices.
/// * It is similar to Shadow component implementation.
/// </summary>
void _ApplyShadow(List<UIVertex> verts, ref int start, ref int end, ShadowStyle mode, float toneLevel, float blur, Vector2 effectDistance, Color color, bool useGraphicAlpha)
static void GetBounds(List<UIVertex> verts, int start, int count, ref Rect posBounds, ref Rect uvBounds, bool global)
{
if (ShadowStyle.None == mode)
return;
var factor = new Vector2(
Packer.ToFloat(toneLevel, 0, blur, 0),
Packer.ToFloat(color.r, color.g, color.b, 1)
);
// Append Shadow.
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, effectDistance.x, effectDistance.y, factor, color, useGraphicAlpha);
// Append Shadow3.
if (ShadowStyle.Shadow3 == mode)
Vector2 minPos = new Vector2(float.MaxValue, float.MaxValue);
Vector2 maxPos = new Vector2(float.MinValue, float.MinValue);
Vector2 minUV = new Vector2(float.MaxValue, float.MaxValue);
Vector2 maxUV = new Vector2(float.MinValue, float.MinValue);
for (int i = start; i < start + count; i++)
{
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, effectDistance.x, 0, factor, color, useGraphicAlpha);
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, 0, effectDistance.y, factor, color, useGraphicAlpha);
}
UIVertex vt = verts[i];
// Append Outline.
else if (ShadowStyle.Outline == mode)
{
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, effectDistance.x, -effectDistance.y, factor, color, useGraphicAlpha);
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, -effectDistance.x, effectDistance.y, factor, color, useGraphicAlpha);
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, -effectDistance.x, -effectDistance.y, factor, color, useGraphicAlpha);
}
Vector2 uv = vt.uv0;
Vector3 pos = vt.position;
// Append Outline8.
else if (ShadowStyle.Outline8 == mode)
{
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, effectDistance.x, -effectDistance.y, factor, color, useGraphicAlpha);
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, -effectDistance.x, effectDistance.y, factor, color, useGraphicAlpha);
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, -effectDistance.x, -effectDistance.y, factor, color, useGraphicAlpha);
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, -effectDistance.x, 0, factor, color, useGraphicAlpha);
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, 0, -effectDistance.y, factor, color, useGraphicAlpha);
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, effectDistance.x, 0, factor, color, useGraphicAlpha);
_ApplyShadowZeroAlloc(tempVerts, ref start, ref end, 0, effectDistance.y, factor, color, useGraphicAlpha);
}
}
/// <summary>
/// Append shadow vertices.
/// * It is similar to Shadow component implementation.
/// </summary>
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;
if (verts.Capacity < neededCapacity)
verts.Capacity = neededCapacity;
// Append shadow vertices to the front of list.
// * The original vertex is pushed backward.
UIVertex vt;
for (int i = start; i < end; ++i)
{
vt = verts[i];
verts.Add(vt);
Vector3 v = vt.position;
vt.position.Set(v.x + x, v.y + y, v.z);
Color vertColor = color;
if(colorMode != ColorMode.Multiply)
// Left-Bottom
if (minPos.x >= pos.x && minPos.y >= pos.y)
{
vertColor.r = vertColor.g = vertColor.b = 1;
minPos = pos;
}
// Right-Top
else if (maxPos.x <= pos.x && maxPos.y <= pos.y)
{
maxPos = pos;
}
vertColor.a = useGraphicAlpha ? color.a * vt.color.a / 255 : color.a;
vt.color = vertColor;
// Set UIEffect prameters to vertex.
vt.uv1 = factor;
verts[i] = vt;
// Left-Bottom
if (minUV.x >= uv.x && minUV.y >= uv.y)
{
minUV = uv;
}
// Right-Top
else if (maxUV.x <= uv.x && maxUV.y <= uv.y)
{
maxUV = uv;
}
}
// Update next shadow offset.
start = end;
end = verts.Count;
// Shrink coordinate for detect edge
posBounds.Set(minPos.x + 0.001f, minPos.y + 0.001f, maxPos.x - minPos.x - 0.002f, maxPos.y - minPos.y - 0.002f);
uvBounds.Set(minUV.x, minUV.y, maxUV.x - minUV.x, maxUV.y - minUV.y);
}
}
}
@@ -1,5 +1,7 @@
using System.Collections;
using System.Linq;
using UnityEngine;
using UnityEngine.Serialization;
using UnityEngine.Rendering;
using UnityEngine.UI;
@@ -8,6 +10,7 @@ namespace Coffee.UIExtensions
/// <summary>
/// UIEffectCapturedImage
/// </summary>
[AddComponentMenu("UI/UIEffect/UIEffectCapturedImage", 200)]
public class UIEffectCapturedImage : RawImage
#if UNITY_EDITOR
, ISerializationCallbackReceiver
@@ -35,47 +38,107 @@ namespace Coffee.UIExtensions
//################################
// Serialize Members.
//################################
[SerializeField][Range(0, 1)] float m_ToneLevel = 1;
[SerializeField][Range(0, 1)] float m_Blur = 0;
[SerializeField] ToneMode m_ToneMode;
[SerializeField] ColorMode m_ColorMode;
[SerializeField] BlurMode m_BlurMode;
[Tooltip("Effect factor between 0(no effect) and 1(complete effect).")]
[FormerlySerializedAs("m_ToneLevel")]
[SerializeField][Range(0, 1)] float m_EffectFactor = 1;
[Tooltip("Color effect factor between 0(no effect) and 1(complete effect).")]
[SerializeField][Range(0, 1)] float m_ColorFactor = 1;
[Tooltip("How far is the blurring from the graphic.")]
[FormerlySerializedAs("m_Blur")]
[SerializeField][Range(0, 1)] float m_BlurFactor = 1;
[Tooltip("Effect mode.")]
[FormerlySerializedAs("m_ToneMode")]
[SerializeField] EffectMode m_EffectMode = EffectMode.None;
[Tooltip("Color effect mode.")]
[SerializeField] ColorMode m_ColorMode = ColorMode.Multiply;
[Tooltip("Blur effect mode.")]
[SerializeField] BlurMode m_BlurMode = BlurMode.DetailBlur;
[Tooltip("Color for the color effect.")]
[SerializeField] Color m_EffectColor = Color.white;
[SerializeField] DesamplingRate m_DesamplingRate;
[SerializeField] DesamplingRate m_ReductionRate;
[Tooltip("Desampling rate of the generated RenderTexture.")]
[SerializeField] DesamplingRate m_DesamplingRate = DesamplingRate.x1;
[Tooltip("Desampling rate of reduction buffer to apply effect.")]
[SerializeField] DesamplingRate m_ReductionRate = DesamplingRate.x1;
[Tooltip("FilterMode for capturing.")]
[SerializeField] FilterMode m_FilterMode = FilterMode.Bilinear;
[Tooltip("Effect material.")]
[SerializeField] Material m_EffectMaterial;
[SerializeField][Range(1, 8)] int m_Iterations = 1;
[SerializeField] bool m_KeepCanvasSize = true;
[Tooltip("Blur iterations.")]
[FormerlySerializedAs("m_Iterations")]
[SerializeField][Range(1, 8)] int m_BlurIterations = 3;
[Tooltip("Fits graphic size to screen on captured.")]
[FormerlySerializedAs("m_KeepCanvasSize")]
[SerializeField] bool m_FitToScreen = true;
[Tooltip("Capture automatically on enable.")]
[SerializeField] bool m_CaptureOnEnable = false;
[Tooltip("Capture immediately.")]
[SerializeField] bool m_ImmediateCapturing = true;
//################################
// Public Members.
//################################
/// <summary>
/// Tone effect level between 0(no effect) and 1(complete effect).
/// Effect factor between 0(no effect) and 1(complete effect).
/// </summary>
public float toneLevel { get { return m_ToneLevel; } set { m_ToneLevel = Mathf.Clamp(value, 0, 1); } }
[System.Obsolete("Use effectFactor instead (UnityUpgradable) -> effectFactor")]
public float toneLevel { get { return m_EffectFactor; } set { m_EffectFactor = Mathf.Clamp(value, 0, 1); } }
/// <summary>
/// Effect factor between 0(no effect) and 1(complete effect).
/// </summary>
public float effectFactor { get { return m_EffectFactor; } set { m_EffectFactor = Mathf.Clamp(value, 0, 1); } }
/// <summary>
/// Color effect factor between 0(no effect) and 1(complete effect).
/// </summary>
public float colorFactor { get { return m_ColorFactor; } set { m_ColorFactor = Mathf.Clamp(value, 0, 1); } }
/// <summary>
/// How far is the blurring from the graphic.
/// </summary>
public float blur { get { return m_Blur; } set { m_Blur = Mathf.Clamp(value, 0, 4); } }
[System.Obsolete("Use blurFactor instead (UnityUpgradable) -> blurFactor")]
public float blur { get { return m_BlurFactor; } set { m_BlurFactor = Mathf.Clamp(value, 0, 4); } }
/// <summary>
/// How far is the blurring from the graphic.
/// </summary>
public float blurFactor { get { return m_BlurFactor; } set { m_BlurFactor = Mathf.Clamp(value, 0, 4); } }
/// <summary>
/// Tone effect mode.
/// </summary>
public ToneMode toneMode { get { return m_ToneMode; } set { m_ToneMode = value; } }
[System.Obsolete("Use effectMode instead (UnityUpgradable) -> effectMode")]
public EffectMode toneMode { get { return m_EffectMode; } }
/// <summary>
/// Effect mode.
/// </summary>
public EffectMode effectMode { get { return m_EffectMode; } }
/// <summary>
/// Color effect mode.
/// </summary>
public ColorMode colorMode { get { return m_ColorMode; } set { m_ColorMode = value; } }
public ColorMode colorMode { get { return m_ColorMode; } }
/// <summary>
/// Blur effect mode.
/// </summary>
public BlurMode blurMode { get { return m_BlurMode; } set { m_BlurMode = value; } }
public BlurMode blurMode { get { return m_BlurMode; } }
/// <summary>
/// Color for the color effect.
@@ -98,7 +161,7 @@ namespace Coffee.UIExtensions
public DesamplingRate reductionRate { get { return m_ReductionRate; } set { m_ReductionRate = value; } }
/// <summary>
/// FilterMode for capture.
/// FilterMode for capturing.
/// </summary>
public FilterMode filterMode { get { return m_FilterMode; } set { m_FilterMode = value; } }
@@ -106,23 +169,73 @@ namespace Coffee.UIExtensions
/// Captured texture.
/// </summary>
public RenderTexture capturedTexture { get { return _rt; } }
/// <summary>
/// Iterations.
/// </summary>
public int iterations { get { return m_Iterations; } set { m_Iterations = value; } }
/// <summary>
/// Fits graphic size to the root canvas.
/// Blur iterations.
/// </summary>
public bool keepCanvasSize { get { return m_KeepCanvasSize; } set { m_KeepCanvasSize = value; } }
[System.Obsolete("Use blurIterations instead (UnityUpgradable) -> blurIterations")]
public int iterations { get { return m_BlurIterations; } set { m_BlurIterations = value; } }
/// <summary>
/// Blur iterations.
/// </summary>
public int blurIterations { get { return m_BlurIterations; } set { m_BlurIterations = value; } }
/// <summary>
/// Fits graphic size to screen.
/// </summary>
[System.Obsolete("Use fitToScreen instead (UnityUpgradable) -> fitToScreen")]
public bool keepCanvasSize { get { return m_FitToScreen; } set { m_FitToScreen = value; } }
/// <summary>
/// Fits graphic size to screen on captured.
/// </summary>
public bool fitToScreen { get { return m_FitToScreen; } set { m_FitToScreen = value; } }
/// <summary>
/// Target RenderTexture to capture.
/// </summary>
[System.Obsolete]
public RenderTexture targetTexture { get { return null; } set { } }
/// <summary>
/// Capture automatically on enable.
/// </summary>
public bool captureOnEnable { get { return m_CaptureOnEnable; } set { m_CaptureOnEnable = value; } }
/// <summary>
/// Capture immediately.
/// </summary>
public bool immediateCapturing { get { return m_ImmediateCapturing; } set { m_ImmediateCapturing = value; } }
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected override void OnEnable()
{
base.OnEnable();
if (m_CaptureOnEnable && Application.isPlaying)
{
Capture();
}
}
protected override void OnDisable()
{
base.OnDisable();
if (m_CaptureOnEnable && Application.isPlaying)
{
_Release(false);
texture = null;
}
}
/// <summary>
/// This function is called when the MonoBehaviour will be destroyed.
/// </summary>
protected override void OnDestroy()
{
_Release(true);
Release();
base.OnDestroy();
}
@@ -132,10 +245,23 @@ namespace Coffee.UIExtensions
protected override void OnPopulateMesh(VertexHelper vh)
{
// When not displaying, clear vertex.
if (texture == null || effectColor.a < 1 / 255f || canvasRenderer.GetAlpha() < 1 / 255f)
if (texture == null || color.a < 1 / 255f || canvasRenderer.GetAlpha() < 1 / 255f)
{
vh.Clear();
}
else
{
base.OnPopulateMesh(vh);
int count = vh.currentVertCount;
UIVertex vt = default(UIVertex);
Color c = new Color(1, 1, 1, color.a);
for (int i = 0; i < count; i++)
{
vh.PopulateUIVertex(ref vt, i);
vt.color = c;
vh.SetUIVertex(vt, i);
}
}
}
/// <summary>
@@ -143,13 +269,33 @@ namespace Coffee.UIExtensions
/// </summary>
public void GetDesamplingSize(DesamplingRate rate, out int w, out int h)
{
var cam = canvas.worldCamera ?? Camera.main;
h = cam.pixelHeight;
w = cam.pixelWidth;
if (rate != DesamplingRate.None)
#if UNITY_EDITOR
if (!Application.isPlaying)
{
var res = UnityEditor.UnityStats.screenRes.Split('x');
w = int.Parse(res[0]);
h = int.Parse(res[1]);
}
else
#endif
{
w = Screen.width;
h = Screen.height;
}
if (rate == DesamplingRate.None)
return;
float aspect = (float)w / h;
if (w < h)
{
h = Mathf.ClosestPowerOfTwo(h / (int)rate);
w = Mathf.CeilToInt(h * aspect);
}
else
{
w = Mathf.ClosestPowerOfTwo(w / (int)rate);
h = Mathf.CeilToInt(w / aspect);
}
}
@@ -158,104 +304,120 @@ namespace Coffee.UIExtensions
/// </summary>
public void Capture()
{
// Camera for command buffer.
_camera = canvas.worldCamera ?? Camera.main;
// Fit to screen.
var rootCanvas = canvas.rootCanvas;
if (m_FitToScreen)
{
var rootTransform = rootCanvas.transform as RectTransform;
var size = rootTransform.rect.size;
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x);
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y);
rectTransform.position = rootTransform.position;
}
// Cache id for RT.
// Cache some ids.
if (s_CopyId == 0)
{
s_CopyId = Shader.PropertyToID("_UIEffectCapturedImage_ScreenCopyId");
s_EffectId1 = Shader.PropertyToID("_UIEffectCapturedImage_EffectId1");
s_EffectId2 = Shader.PropertyToID("_UIEffectCapturedImage_EffectId2");
s_EffectFactorId = Shader.PropertyToID("_EffectFactor");
s_ColorFactorId = Shader.PropertyToID("_ColorFactor");
s_CommandBuffer = new CommandBuffer();
}
// If size of generated result RT has changed, relese it.
// If size of result RT has changed, release it.
int w, h;
GetDesamplingSize(m_DesamplingRate, out w, out h);
if (_rt && (_rt.width != w || _rt.height != h))
{
_rtToRelease = _rt;
_rt = null;
_Release(ref _rt);
}
// Generate result RT.
// Generate RT for result.
if (_rt == null)
{
_rt = new RenderTexture(w, h, 0, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Default);
_rt = RenderTexture.GetTemporary(w, h, 0, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Default);
_rt.filterMode = m_FilterMode;
_rt.useMipMap = false;
_rt.wrapMode = TextureWrapMode.Clamp;
_rt.hideFlags = HideFlags.HideAndDontSave;
_rtId = new RenderTargetIdentifier(_rt);
}
SetupCommandBuffer();
}
void SetupCommandBuffer()
{
// Material for effect.
Material mat = m_EffectMaterial;
if (s_CommandBuffer == null)
{
s_CommandBuffer = new CommandBuffer();
}
// Create command buffer.
if (_buffer == null)
// [1] Capture from back buffer (back buffer -> copied screen).
int w, h;
GetDesamplingSize(DesamplingRate.None, out w, out h);
s_CommandBuffer.GetTemporaryRT(s_CopyId, w, h, 0, m_FilterMode);
#if UNITY_EDITOR
s_CommandBuffer.Blit(Resources.FindObjectsOfTypeAll<RenderTexture>().FirstOrDefault(x => x.name == "GameView RT"), s_CopyId);
#else
s_CommandBuffer.Blit(BuiltinRenderTextureType.BindableTexture, s_CopyId);
#endif
// Set properties for effect.
s_CommandBuffer.SetGlobalVector(s_EffectFactorId, new Vector4(m_EffectFactor, 0));
s_CommandBuffer.SetGlobalVector(s_ColorFactorId, new Vector4(m_EffectColor.r, m_EffectColor.g, m_EffectColor.b, m_EffectColor.a));
// [2] Apply base effect with reduction buffer (copied screen -> effect1).
GetDesamplingSize(m_ReductionRate, out w, out h);
s_CommandBuffer.GetTemporaryRT(s_EffectId1, w, h, 0, m_FilterMode);
s_CommandBuffer.Blit(s_CopyId, s_EffectId1, mat, 0);
s_CommandBuffer.ReleaseTemporaryRT(s_CopyId);
// Iterate blurring operation.
if (m_BlurMode != BlurMode.None)
{
var rtId = new RenderTargetIdentifier(_rt);
// Material for effect.
Material mat = effectMaterial;
_buffer = new CommandBuffer();
_buffer.name =
_rt.name =
mat ? mat.name : "noeffect";
// Copy to temporary RT.
_buffer.GetTemporaryRT(s_CopyId, -1, -1, 0, m_FilterMode);
_buffer.Blit(BuiltinRenderTextureType.CurrentActive, s_CopyId);
// Set properties.
_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.
if (!mat)
s_CommandBuffer.GetTemporaryRT(s_EffectId2, w, h, 0, m_FilterMode);
for (int i = 0; i < m_BlurIterations; i++)
{
_buffer.Blit(s_CopyId, rtId);
_buffer.ReleaseTemporaryRT(s_CopyId);
}
// Blit with effect.
else
{
GetDesamplingSize(m_ReductionRate, out w, out h);
_buffer.GetTemporaryRT(s_EffectId1, w, h, 0, m_FilterMode);
_buffer.Blit(s_CopyId, s_EffectId1, mat); // Apply effect (copied screen -> effect1).
_buffer.ReleaseTemporaryRT(s_CopyId);
// 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++)
{
// Apply effect (effect1 -> effect2, or effect2 -> effect1).
_buffer.Blit(i % 2 == 0 ? s_EffectId2 : s_EffectId1, i % 2 == 0 ? s_EffectId1 : s_EffectId2, mat);
}
}
_buffer.Blit(m_Iterations % 2 == 0 ? s_EffectId2 : s_EffectId1, rtId);
_buffer.ReleaseTemporaryRT(s_EffectId1);
if (1 < m_Iterations)
{
_buffer.ReleaseTemporaryRT(s_EffectId2);
}
// [3] Apply blurring with reduction buffer (effect1 -> effect2, or effect2 -> effect1).
s_CommandBuffer.SetGlobalVector(s_EffectFactorId, new Vector4(m_BlurFactor, 0));
s_CommandBuffer.Blit(s_EffectId1, s_EffectId2, mat, 1);
s_CommandBuffer.SetGlobalVector(s_EffectFactorId, new Vector4(0, m_BlurFactor));
s_CommandBuffer.Blit(s_EffectId2, s_EffectId1, mat, 1);
}
s_CommandBuffer.ReleaseTemporaryRT(s_EffectId2);
}
// Add command buffer to camera.
_camera.AddCommandBuffer(kCameraEvent, _buffer);
// [4] Copy to result RT.
s_CommandBuffer.Blit(s_EffectId1, _rtId);
s_CommandBuffer.ReleaseTemporaryRT(s_EffectId1);
// StartCoroutine by CanvasScaler.
var rootCanvas = canvas.rootCanvas;
var scaler = rootCanvas.GetComponent<CanvasScaler>();
scaler.StartCoroutine(_CoUpdateTextureOnNextFrame());
if (m_KeepCanvasSize)
#if UNITY_EDITOR
if (!Application.isPlaying)
{
var size = (rootCanvas.transform as RectTransform).rect.size;
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x);
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y);
Graphics.ExecuteCommandBuffer(s_CommandBuffer);
UpdateTexture();
return;
}
else
{
Graphics.ExecuteCommandBuffer(s_CommandBuffer);
}
#endif
if (m_ImmediateCapturing)
{
UpdateTexture();
}
else
{
// Execute command buffer.
canvas.rootCanvas.GetComponent<CanvasScaler>().StartCoroutine(_CoUpdateTextureOnNextFrame());
}
}
@@ -265,9 +427,21 @@ namespace Coffee.UIExtensions
public void Release()
{
_Release(true);
texture = null;
_SetDirty();
}
#if UNITY_EDITOR
protected override void Reset()
{
// Set parameters as 'Medium'.
m_BlurIterations = 3;
m_FilterMode = FilterMode.Bilinear;
m_DesamplingRate = DesamplingRate.x1;
m_ReductionRate = DesamplingRate.x1;
base.Reset();
}
/// <summary>
/// Raises the before serialize event.
/// </summary>
@@ -286,9 +460,9 @@ namespace Coffee.UIExtensions
/// <summary>
/// Raises the validate event.
/// </summary>
protected override void OnValidate ()
protected override void OnValidate()
{
base.OnValidate ();
base.OnValidate();
UnityEditor.EditorApplication.delayCall += () => UpdateMaterial(false);
}
@@ -298,17 +472,17 @@ namespace Coffee.UIExtensions
/// <param name="ignoreInPlayMode">If set to <c>true</c> ignore in play mode.</param>
protected void UpdateMaterial(bool ignoreInPlayMode)
{
if(!this || ignoreInPlayMode && Application.isPlaying)
if (!this || ignoreInPlayMode && Application.isPlaying)
{
return;
}
var mat = MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName), m_ToneMode, m_ColorMode, m_BlurMode);
var mat = MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName), m_EffectMode, m_ColorMode, m_BlurMode);
if (m_EffectMaterial != mat)
{
material = null;
m_EffectMaterial = mat;
UnityEditor.EditorUtility.SetDirty(this);
_SetDirty();
}
}
#endif
@@ -318,15 +492,15 @@ namespace Coffee.UIExtensions
//################################
// Private Members.
//################################
const CameraEvent kCameraEvent = CameraEvent.AfterEverything;
Camera _camera;
RenderTexture _rt;
RenderTexture _rtToRelease;
CommandBuffer _buffer;
RenderTargetIdentifier _rtId;
static int s_CopyId;
static int s_EffectId1;
static int s_EffectId2;
static int s_EffectFactorId;
static int s_ColorFactorId;
static CommandBuffer s_CommandBuffer;
/// <summary>
/// Release genarated objects.
@@ -337,26 +511,38 @@ namespace Coffee.UIExtensions
if (releaseRT)
{
texture = null;
_Release(ref _rt);
}
if (_rt != null)
if (s_CommandBuffer != null)
{
s_CommandBuffer.Clear();
if (releaseRT)
{
_rt.Release();
_rt = null;
s_CommandBuffer.Release();
s_CommandBuffer = null;
}
}
}
if (_buffer != null)
[System.Diagnostics.Conditional("UNITY_EDITOR")]
void _SetDirty()
{
#if UNITY_EDITOR
if (!Application.isPlaying)
{
if (_camera != null)
_camera.RemoveCommandBuffer(kCameraEvent, _buffer);
_buffer.Release();
_buffer = null;
UnityEditor.EditorUtility.SetDirty(this);
}
#endif
}
if (_rtToRelease)
void _Release(ref RenderTexture obj)
{
if (obj)
{
_rtToRelease.Release();
_rtToRelease = null;
RenderTexture.ReleaseTemporary (obj);
obj = null;
}
}
@@ -366,9 +552,19 @@ namespace Coffee.UIExtensions
IEnumerator _CoUpdateTextureOnNextFrame()
{
yield return new WaitForEndOfFrame();
_Release(false);
texture = _rt;
UpdateTexture();
}
void UpdateTexture()
{
#if !UNITY_EDITOR
// Execute command buffer.
Graphics.ExecuteCommandBuffer (s_CommandBuffer);
#endif
_Release(false);
texture = capturedTexture;
_SetDirty();
}
}
}
@@ -8,12 +8,17 @@ namespace Coffee.UIExtensions
[RequireComponent(typeof(Graphic))]
[DisallowMultipleComponent]
[AddComponentMenu("UI/UIEffect/UIFlip",102)]
public class UIFlip : BaseMeshEffect
{
//################################
// Serialize Members.
//################################
[Tooltip("Flip horizontally.")]
[SerializeField] private bool m_Horizontal = false;
[Tooltip("Flip vertically.")]
[SerializeField] private bool m_Veritical = false;
//################################
@@ -7,6 +7,7 @@ namespace Coffee.UIExtensions
/// UIGradient.
/// </summary>
[DisallowMultipleComponent]
[AddComponentMenu("UI/UIEffect/UIGradient",101)]
public class UIGradient : BaseMeshEffect
{
//################################
@@ -38,48 +39,125 @@ namespace Coffee.UIExtensions
//################################
// Serialize Members.
//################################
[Tooltip("Gradient Direction.")]
[SerializeField] Direction m_Direction;
[Tooltip("Color1: Top or Left.")]
[SerializeField] Color m_Color1 = Color.white;
[Tooltip("Color2: Bottom or Right.")]
[SerializeField] Color m_Color2 = Color.white;
[Tooltip("Color3: For diagonal.")]
[SerializeField] Color m_Color3 = Color.white;
[Tooltip("Color4: For diagonal.")]
[SerializeField] Color m_Color4 = Color.white;
[Tooltip("Gradient rotation.")]
[SerializeField][Range(-180, 180)] float m_Rotation;
[Tooltip("Gradient offset for Horizontal, Vertical or Angle.")]
[SerializeField][Range(-1, 1)] float m_Offset1;
[Tooltip("Gradient offset for Diagonal.")]
[SerializeField][Range(-1, 1)] float m_Offset2;
[Tooltip("Gradient style for Text.")]
[SerializeField] GradientStyle m_GradientStyle;
[Tooltip("Color space to correct color.")]
[SerializeField] ColorSpace m_ColorSpace = ColorSpace.Uninitialized;
[Tooltip("Ignore aspect ratio.")]
[SerializeField] bool m_IgnoreAspectRatio = true;
//################################
// Public Members.
//################################
new public Graphic graphic { get { return base.graphic; } }
public Graphic targetGraphic { get { return base.graphic; } }
/// <summary>
/// Gradient Direction.
/// </summary>
public Direction direction { get { return m_Direction; } set { if (m_Direction != value) { m_Direction = value; graphic.SetVerticesDirty(); } } }
public Direction direction
{
get { return m_Direction; }
set
{
if (m_Direction != value)
{
m_Direction = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Color1: Top or Left.
/// </summary>
public Color color1 { get { return m_Color1; } set { if (m_Color1 != value) { m_Color1 = value; graphic.SetVerticesDirty(); } } }
public Color color1
{
get { return m_Color1; }
set
{
if (m_Color1 != value)
{
m_Color1 = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Color2: Bottom or Right.
/// </summary>
public Color color2 { get { return m_Color2; } set { if (m_Color2 != value) { m_Color2 = value; graphic.SetVerticesDirty(); } } }
public Color color2
{
get { return m_Color2; }
set
{
if (m_Color2 != value)
{
m_Color2 = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Color3: For diagonal.
/// </summary>
public Color color3 { get { return m_Color3; } set { if (m_Color3 != value) { m_Color3 = value; graphic.SetVerticesDirty(); } } }
public Color color3
{
get { return m_Color3; }
set
{
if (m_Color3 != value)
{
m_Color3 = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Color4: For diagonal.
/// </summary>
public Color color4 { get { return m_Color4; } set { if (m_Color4 != value) { m_Color4 = value; graphic.SetVerticesDirty(); } } }
public Color color4
{
get { return m_Color4; }
set
{
if (m_Color4 != value)
{
m_Color4 = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Gradient rotation.
@@ -92,33 +170,96 @@ namespace Coffee.UIExtensions
: m_Direction == Direction.Vertical ? 0
: m_Rotation;
}
set { if (!Mathf.Approximately(m_Rotation, value)) { m_Rotation = value; graphic.SetVerticesDirty(); } }
set
{
if (!Mathf.Approximately(m_Rotation, value))
{
m_Rotation = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Gradient offset for Horizontal, Vertical or Angle.
/// </summary>
public float offset { get { return m_Offset1; } set { if (m_Offset1 != value) { m_Offset1 = value; graphic.SetVerticesDirty(); } } }
public float offset
{
get { return m_Offset1; }
set
{
if (m_Offset1 != value)
{
m_Offset1 = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Gradient offset for Diagonal.
/// </summary>
public Vector2 offset2 { get { return new Vector2(m_Offset2, m_Offset1); } set { if (m_Offset1 != value.y || m_Offset2 != value.x) { m_Offset1 = value.y; m_Offset2 = value.x; graphic.SetVerticesDirty(); } } }
public Vector2 offset2
{
get { return new Vector2(m_Offset2, m_Offset1); }
set
{
if (m_Offset1 != value.y || m_Offset2 != value.x)
{
m_Offset1 = value.y;
m_Offset2 = value.x;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Gradient style for Text.
/// </summary>
public GradientStyle gradientStyle { get { return m_GradientStyle; } set { if (m_GradientStyle != value) { m_GradientStyle = value; graphic.SetVerticesDirty(); } } }
public GradientStyle gradientStyle
{
get { return m_GradientStyle; }
set
{
if (m_GradientStyle != value)
{
m_GradientStyle = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Color space to correct color.
/// </summary>
public ColorSpace colorSpace { get { return m_ColorSpace; } set { if (m_ColorSpace != value) { m_ColorSpace = value; graphic.SetVerticesDirty(); } } }
public ColorSpace colorSpace
{
get { return m_ColorSpace; }
set
{
if (m_ColorSpace != value)
{
m_ColorSpace = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Ignore aspect ratio.
/// </summary>
public bool ignoreAspectRatio { get { return m_IgnoreAspectRatio; } set { if (m_IgnoreAspectRatio != value) { m_IgnoreAspectRatio = value; graphic.SetVerticesDirty(); } } }
public bool ignoreAspectRatio
{
get { return m_IgnoreAspectRatio; }
set
{
if (m_IgnoreAspectRatio != value)
{
m_IgnoreAspectRatio = value;
graphic.SetVerticesDirty();
}
}
}
/// <summary>
@@ -0,0 +1,185 @@
using UnityEngine;
using UnityEngine.Serialization;
using UnityEngine.UI;
namespace Coffee.UIExtensions
{
/// <summary>
/// HSV Modifier.
/// </summary>
[AddComponentMenu("UI/UIEffect/UIHsvModifier", 4)]
public class UIHsvModifier : UIEffectBase
{
//################################
// Constant or Static Members.
//################################
public const string shaderName = "UI/Hidden/UI-Effect-HSV";
static readonly ParameterTexture _ptex = new ParameterTexture(7, 128, "_ParamTex");
//################################
// Serialize Members.
//################################
[Header("Target")]
[Tooltip("Target color to affect hsv shift.")]
[SerializeField] [ColorUsage(false)] Color m_TargetColor = Color.red;
[Tooltip("Color range to affect hsv shift [0 ~ 1].")]
[SerializeField] [Range(0, 1)] float m_Range = 0.1f;
[Header("Adjustment")]
[Tooltip("Hue shift [-0.5 ~ 0.5].")]
[SerializeField] [Range(-0.5f, 0.5f)] float m_Hue;
[Tooltip("Saturation shift [-0.5 ~ 0.5].")]
[SerializeField] [Range(-0.5f, 0.5f)] float m_Saturation;
[Tooltip("Value shift [-0.5 ~ 0.5].")]
[SerializeField] [Range(-0.5f, 0.5f)] float m_Value;
//################################
// Public Members.
//################################
/// <summary>
/// Target color to affect hsv shift.
/// </summary>
public Color targetColor
{
get { return m_TargetColor; }
set
{
if (m_TargetColor != value)
{
m_TargetColor = value;
SetDirty();
}
}
}
/// <summary>
/// Color range to affect hsv shift [0 ~ 1].
/// </summary>
public float range
{
get { return m_Range; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_Range, value))
{
m_Range = value;
SetDirty();
}
}
}
/// <summary>
/// Saturation shift [-0.5 ~ 0.5].
/// </summary>
public float saturation
{
get { return m_Saturation; }
set
{
value = Mathf.Clamp(value, -0.5f, 0.5f);
if (!Mathf.Approximately(m_Saturation, value))
{
m_Saturation = value;
SetDirty();
}
}
}
/// <summary>
/// Value shift [-0.5 ~ 0.5].
/// </summary>
public float value
{
get { return m_Value; }
set
{
value = Mathf.Clamp(value, -0.5f, 0.5f);
if (!Mathf.Approximately(m_Value, value))
{
m_Value = value;
SetDirty();
}
}
}
/// <summary>
/// Hue shift [-0.5 ~ 0.5].
/// </summary>
public float hue
{
get { return m_Hue; }
set
{
value = Mathf.Clamp(value, -0.5f, 0.5f);
if (!Mathf.Approximately(m_Hue, value))
{
m_Hue = value;
SetDirty();
}
}
}
/// <summary>
/// Gets the parameter texture.
/// </summary>
public override ParameterTexture ptex { get { return _ptex; } }
#if UNITY_EDITOR
protected override Material GetMaterial()
{
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName));
}
#endif
/// <summary>
/// Modifies the mesh.
/// </summary>
public override void ModifyMesh(VertexHelper vh)
{
if (!isActiveAndEnabled)
return;
float normalizedIndex = ptex.GetNormalizedIndex(this);
UIVertex vertex = default(UIVertex);
int count = vh.currentVertCount;
for (int i = 0; i < count; i++)
{
vh.PopulateUIVertex(ref vertex, i);
vertex.uv0 = new Vector2(
Packer.ToFloat(vertex.uv0.x, vertex.uv0.y),
normalizedIndex
);
vh.SetUIVertex(vertex, i);
}
}
protected override void SetDirty()
{
float h, s, v;
Color.RGBToHSV(m_TargetColor, out h, out s, out v);
ptex.RegisterMaterial(targetGraphic.material);
ptex.SetData(this, 0, h); // param1.x : target hue
ptex.SetData(this, 1, s); // param1.y : target saturation
ptex.SetData(this, 2, v); // param1.z : target value
ptex.SetData(this, 3, m_Range); // param1.w : target range
ptex.SetData(this, 4, m_Hue + 0.5f); // param2.x : hue shift
ptex.SetData(this, 5, m_Saturation + 0.5f); // param2.y : saturation shift
ptex.SetData(this, 6, m_Value + 0.5f); // param2.z : value shift
}
//################################
// Private Members.
//################################
}
}
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: efe700dddcd8341ff8607ac2c827b4b5
timeCreated: 1523859834
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Serialization;
using UnityEngine.UI;
#if UNITY_EDITOR
@@ -14,30 +15,37 @@ namespace Coffee.UIExtensions
/// <summary>
/// UIEffect.
/// </summary>
[ExecuteInEditMode]
[RequireComponent(typeof(Graphic))]
[DisallowMultipleComponent]
public class UIShadow : Shadow
[AddComponentMenu("UI/UIEffect/UIShadow", 100)]
public class UIShadow : Shadow, IParameterTexture
#if UNITY_EDITOR
, ISerializationCallbackReceiver
#endif
{
/// <summary>
/// Additional shadow.
/// </summary>
[System.Obsolete]
[System.Serializable]
public class AdditionalShadow
{
/// <summary>
/// How far is the blurring shadow from the graphic.
/// </summary>
[FormerlySerializedAs("shadowBlur")]
[Range(0, 1)] public float blur = 0.25f;
/// <summary>
/// Shadow effect mode.
/// </summary>
[FormerlySerializedAs("shadowMode")]
public ShadowStyle style = ShadowStyle.Shadow;
/// <summary>
/// Color for the shadow effect.
/// </summary>
[FormerlySerializedAs("shadowColor")]
public Color effectColor = Color.black;
/// <summary>
@@ -54,8 +62,14 @@ namespace Coffee.UIExtensions
//################################
// Serialize Members.
//################################
[SerializeField][Range(0, 1)] float m_Blur = 0.25f;
[Tooltip("How far is the blurring shadow from the graphic.")]
[FormerlySerializedAs("m_Blur")]
[SerializeField][Range(0, 1)] float m_BlurFactor = 1;
[Tooltip("Shadow effect style.")]
[SerializeField] ShadowStyle m_Style = ShadowStyle.Shadow;
[HideInInspector][System.Obsolete]
[SerializeField] List<AdditionalShadow> m_AdditionalShadows = new List<AdditionalShadow>();
@@ -63,57 +77,128 @@ namespace Coffee.UIExtensions
// Public Members.
//################################
/// <summary>
/// Graphic affected by the UIEffect.
/// How far is the blurring shadow from the graphic.
/// </summary>
new public Graphic graphic { get { return base.graphic; } }
[System.Obsolete("Use blurFactor instead (UnityUpgradable) -> blurFactor")]
public float blur
{
get { return m_BlurFactor; }
set
{
m_BlurFactor = Mathf.Clamp(value, 0, 2);
_SetDirty();
}
}
/// <summary>
/// How far is the blurring shadow from the graphic.
/// </summary>
public float blur { get { return m_Blur; } set { m_Blur = Mathf.Clamp(value, 0, 2); _SetDirty(); } }
public float blurFactor
{
get { return m_BlurFactor; }
set
{
m_BlurFactor = Mathf.Clamp(value, 0, 2);
_SetDirty();
}
}
/// <summary>
/// Shadow effect mode.
/// Shadow effect style.
/// </summary>
public ShadowStyle style { get { return m_Style; } set { m_Style = value; _SetDirty(); } }
public ShadowStyle style
{
get { return m_Style; }
set
{
m_Style = value;
_SetDirty();
}
}
/// <summary>
/// Additional Shadows.
/// Gets or sets the parameter index.
/// </summary>
public List<AdditionalShadow> additionalShadows { get { return m_AdditionalShadows; } }
public int parameterIndex { get; set; }
/// <summary>
/// Gets the parameter texture.
/// </summary>
public ParameterTexture ptex{ get; private set; }
int _graphicVertexCount;
static readonly List<UIShadow> tmpShadows = new List<UIShadow>();
protected override void OnEnable()
{
base.OnEnable();
_uiEffect = GetComponent<UIEffect>();
if (_uiEffect)
{
ptex = _uiEffect.ptex;
ptex.Register(this);
}
}
protected override void OnDisable()
{
base.OnDisable();
_uiEffect = null;
if (ptex != null)
{
ptex.Unregister(this);
ptex = null;
}
}
/// <summary>
/// Modifies the mesh.
/// </summary>
public override void ModifyMesh(VertexHelper vh)
{
if (!isActiveAndEnabled || vh.currentVertCount <= 0)
if (!isActiveAndEnabled || vh.currentVertCount <= 0 || m_Style == ShadowStyle.None)
{
return;
}
vh.GetUIVertexStream(s_Verts);
GetComponents<UIShadow>(tmpShadows);
foreach (var s in tmpShadows)
{
if (s.isActiveAndEnabled)
{
if (s == this)
{
foreach (var s2 in tmpShadows)
{
s2._graphicVertexCount = s_Verts.Count;
}
}
break;
}
}
tmpShadows.Clear();
//================================
// Append shadow vertices.
//================================
{
_uiEffect = GetComponent<UIEffect>();
var inputVertCount = s_Verts.Count;
var start = 0;
var end = inputVertCount;
var toneLevel = _uiEffect && _uiEffect.isActiveAndEnabled ? _uiEffect.toneLevel : 0;
_uiEffect = _uiEffect ?? GetComponent<UIEffect>();
var start = s_Verts.Count - _graphicVertexCount;
var end = s_Verts.Count;
// Additional Shadows.
for (int i = additionalShadows.Count - 1; 0 <= i; i--)
if (ptex != null && _uiEffect && _uiEffect.isActiveAndEnabled)
{
AdditionalShadow shadow = additionalShadows[i];
UpdateFactor(toneLevel, shadow.blur, shadow.effectColor);
_ApplyShadow(s_Verts, shadow.effectColor, ref start, ref end, shadow.effectDistance, shadow.style, shadow.useGraphicAlpha);
ptex.SetData(this, 0, _uiEffect.effectFactor); // param.x : effect factor
ptex.SetData(this, 1, 255); // param.y : color factor
ptex.SetData(this, 2, m_BlurFactor); // param.z : blur factor
}
// Shadow.
UpdateFactor(toneLevel, blur, effectColor);
_ApplyShadow(s_Verts, effectColor, ref start, ref end, effectDistance, style, useGraphicAlpha);
}
@@ -124,21 +209,12 @@ namespace Coffee.UIExtensions
}
UIEffect _uiEffect;
Vector2 _factor;
//################################
// Private Members.
//################################
static readonly List<UIVertex> s_Verts = new List<UIVertex>();
void UpdateFactor(float tone, float blur, Color color)
{
if (_uiEffect && _uiEffect.isActiveAndEnabled)
{
_factor = new Vector2(Packer.ToFloat(tone, 0, blur, 0), Packer.ToFloat(color.r, color.g, color.b, 1));
}
}
/// <summary>
/// Append shadow vertices.
/// * It is similar to Shadow component implementation.
@@ -186,28 +262,51 @@ namespace Coffee.UIExtensions
void _ApplyShadowZeroAlloc(List<UIVertex> verts, Color color, ref int start, ref int end, float x, float y, bool useGraphicAlpha)
{
// Check list capacity.
var neededCapacity = verts.Count + end - start;
int count = end - start;
var neededCapacity = verts.Count + count;
if (verts.Capacity < neededCapacity)
verts.Capacity = neededCapacity;
float normalizedIndex = ptex != null && _uiEffect && _uiEffect.isActiveAndEnabled
? ptex.GetNormalizedIndex(this)
: -1;
// Add
UIVertex vt = default(UIVertex);
for (int i = 0; i < count; i++)
{
verts.Add(vt);
}
// Move
for (int i = verts.Count - 1; count <= i; i--)
{
verts[i] = verts[i - count];
}
// Append shadow vertices to the front of list.
// * The original vertex is pushed backward.
UIVertex vt;
for (int i = start; i < end; ++i)
for (int i = 0; i < count; ++i)
{
vt = verts[i];
verts.Add(vt);
vt = verts[i + start + count];
Vector3 v = vt.position;
vt.position.Set(v.x + x, v.y + y, v.z);
Color vertColor = color;
Color vertColor = effectColor;
vertColor.a = useGraphicAlpha ? color.a * vt.color.a / 255 : color.a;
vt.color = vertColor;
// Set UIEffect prameters to vertex.
if(_uiEffect)
vt.uv1 = _factor;
// Set UIEffect prameters
if (0 <= normalizedIndex)
{
vt.uv0 = new Vector2(
vt.uv0.x,
normalizedIndex
);
}
verts[i] = vt;
}
@@ -221,8 +320,44 @@ namespace Coffee.UIExtensions
/// </summary>
void _SetDirty()
{
if(graphic)
if (graphic)
graphic.SetVerticesDirty();
}
#if UNITY_EDITOR
public void OnBeforeSerialize()
{
}
public void OnAfterDeserialize()
{
EditorApplication.delayCall += UpgradeIfNeeded;
}
#pragma warning disable 0612
void UpgradeIfNeeded()
{
if (0 < m_AdditionalShadows.Count)
{
foreach (var s in m_AdditionalShadows)
{
if (s.style == ShadowStyle.None)
{
continue;
}
var shadow = gameObject.AddComponent<UIShadow>();
shadow.style = s.style;
shadow.effectDistance = s.effectDistance;
shadow.effectColor = s.effectColor;
shadow.useGraphicAlpha = s.useGraphicAlpha;
shadow.blurFactor = s.blur;
}
m_AdditionalShadows = null;
}
}
#pragma warning restore 0612
#endif
}
}
@@ -16,55 +16,91 @@ namespace Coffee.UIExtensions
/// <summary>
/// UIEffect.
/// </summary>
[ExecuteInEditMode]
[DisallowMultipleComponent]
[AddComponentMenu("UI/UIEffect/UIShiny", 2)]
public class UIShiny : UIEffectBase
{
//################################
// Constant or Static Members.
//################################
public const string shaderName = "UI/Hidden/UI-Effect-Shiny";
static readonly ParameterTexture _ptex = new ParameterTexture(8, 128, "_ParamTex");
//################################
// Serialize Members.
//################################
[SerializeField] [Range(0, 1)] float m_Location = 0;
[Tooltip("Location for shiny effect.")]
[FormerlySerializedAs("m_Location")]
[SerializeField] [Range(0, 1)] float m_EffectFactor = 0;
[Tooltip("Width for shiny effect.")]
[SerializeField] [Range(0, 1)] float m_Width = 0.25f;
[Tooltip("Rotation for shiny effect.")]
[SerializeField] [Range(-180, 180)] float m_Rotation;
[Tooltip("Softness for shiny effect.")]
[SerializeField][Range(0.01f, 1)] float m_Softness = 1f;
[Tooltip("Brightness for shiny effect.")]
[FormerlySerializedAs("m_Alpha")]
[SerializeField][Range(0, 1)] float m_Brightness = 1f;
[SerializeField][Range(0, 1)] float m_Highlight = 1;
[Tooltip("Gloss factor for shiny effect.")]
[FormerlySerializedAs("m_Highlight")]
[SerializeField][Range(0, 1)] float m_Gloss = 1;
[Tooltip("The area for effect.")]
[SerializeField] protected EffectArea m_EffectArea;
[Header("Play Effect")]
[SerializeField] EffectPlayer m_Player;
[Obsolete][HideInInspector]
[SerializeField] bool m_Play = false;
[Obsolete][HideInInspector]
[SerializeField] bool m_Loop = false;
[Obsolete][HideInInspector]
[SerializeField][Range(0.1f, 10)] float m_Duration = 1;
[Obsolete][HideInInspector]
[SerializeField][Range(0, 10)] float m_LoopDelay = 1;
[Obsolete][HideInInspector]
[SerializeField] AnimatorUpdateMode m_UpdateMode = AnimatorUpdateMode.Normal;
//################################
// Public Members.
//################################
// /// <summary>
// /// Graphic affected by the UIEffect.
// /// </summary>
// new public Graphic graphic { get { return base.graphic; } }
/// <summary>
/// Location for shiny effect.
/// Effect factor between 0(start) and 1(end).
/// </summary>
[System.Obsolete("Use effectFactor instead (UnityUpgradable) -> effectFactor")]
public float location
{
get { return m_Location; }
get { return m_EffectFactor; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_Location, value))
if (!Mathf.Approximately(m_EffectFactor, value))
{
m_Location = value;
m_EffectFactor = value;
SetDirty();
}
}
}
/// <summary>
/// Effect factor between 0(start) and 1(end).
/// </summary>
public float effectFactor
{
get { return m_EffectFactor; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_EffectFactor, value))
{
m_EffectFactor = value;
SetDirty();
}
}
@@ -105,7 +141,7 @@ namespace Coffee.UIExtensions
}
/// <summary>
/// Alpha for shiny effect.
/// Brightness for shiny effect.
/// </summary>
[System.Obsolete("Use brightness instead (UnityUpgradable) -> brightness")]
public float alpha
@@ -140,17 +176,35 @@ namespace Coffee.UIExtensions
}
/// <summary>
/// Highlight factor for shiny effect.
/// Gloss factor for shiny effect.
/// </summary>
[System.Obsolete("Use gloss instead (UnityUpgradable) -> gloss")]
public float highlight
{
get { return m_Highlight; }
get { return m_Gloss; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_Highlight, value))
if (!Mathf.Approximately(m_Gloss, value))
{
m_Highlight = value;
m_Gloss = value;
SetDirty();
}
}
}
/// <summary>
/// Gloss factor for shiny effect.
/// </summary>
public float gloss
{
get { return m_Gloss; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_Gloss, value))
{
m_Gloss = value;
SetDirty();
}
}
@@ -191,47 +245,51 @@ namespace Coffee.UIExtensions
/// <summary>
/// Play shinning on enable.
/// </summary>
public bool play { get { return m_Play; } set { m_Play = value; } }
public bool play { get { return _player.play; } set { _player.play = value; } }
/// <summary>
/// Play shinning loop.
/// </summary>
public bool loop { get { return m_Loop; } set { m_Loop = value; } }
public bool loop { get { return _player.loop; } set { _player.loop = value; } }
/// <summary>
/// Shinning duration.
/// </summary>
public float duration { get { return m_Duration; } set { m_Duration = Mathf.Max(value, 0.1f); } }
public float duration { get { return _player.duration; } set { _player.duration = Mathf.Max(value, 0.1f); } }
/// <summary>
/// Delay on loop.
/// </summary>
public float loopDelay { get { return m_LoopDelay; } set { m_LoopDelay = Mathf.Max(value, 0); } }
public float loopDelay { get { return _player.loopDelay; } set { _player.loopDelay = Mathf.Max(value, 0); } }
/// <summary>
/// Shinning update mode.
/// </summary>
public AnimatorUpdateMode updateMode { get { return m_UpdateMode; } set { m_UpdateMode = value; } }
public AnimatorUpdateMode updateMode { get { return _player.updateMode; } set { _player.updateMode = value; } }
/// <summary>
/// Gets the parameter texture.
/// </summary>
public override ParameterTexture ptex { get { return _ptex; } }
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected override void OnEnable()
{
_time = 0;
// graphic.material = effectMaterial;
base.OnEnable();
_player.OnEnable(f => effectFactor = f);
}
/// <summary>
/// This function is called when the behaviour becomes disabled () or inactive.
/// </summary>
protected override void OnDisable()
{
base.OnDisable();
_player.OnDisable();
}
// /// <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
protected override Material GetMaterial()
@@ -239,38 +297,21 @@ namespace Coffee.UIExtensions
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName));
}
// 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);
// }
#pragma warning disable 0612
protected override void UpgradeIfNeeded()
{
// Upgrade for v3.0.0
if (IsShouldUpgrade(300))
{
_player.play = m_Play;
_player.duration = m_Duration;
_player.loop = m_Loop;
_player.loopDelay = m_LoopDelay;
_player.updateMode = m_UpdateMode;
}
}
#pragma warning restore 0612
#endif
/// <summary>
@@ -281,11 +322,13 @@ namespace Coffee.UIExtensions
if (!isActiveAndEnabled)
return;
float normalizedIndex = ptex.GetNormalizedIndex(this);
// rect.
Rect rect = GetEffectArea(vh, m_EffectArea);
Rect rect = m_EffectArea.GetEffectArea(vh, graphic);
// rotation.
float rad = rotation * Mathf.Deg2Rad;
float rad = m_Rotation * Mathf.Deg2Rad;
Vector2 dir = new Vector2(Mathf.Cos(rad), Mathf.Sin(rad));
dir.x *= rect.height / rect.width;
dir = dir.normalized;
@@ -300,13 +343,10 @@ namespace Coffee.UIExtensions
{
vh.PopulateUIVertex(ref vertex, i);
// Normalize vertex position by local matrix.
nomalizedPos = localMatrix * vertex.position;
// Normalize vertex position by local matrix.
if (effectEachCharacter)
{
// Each characters.
nomalizedPos = localMatrix * splitedCharacterPosition[i % 4];
}
else
@@ -314,9 +354,9 @@ namespace Coffee.UIExtensions
nomalizedPos = localMatrix * vertex.position;
}
vertex.uv1 = new Vector2(
Packer.ToFloat(Mathf.Clamp01(nomalizedPos.y), softness, width, brightness),
Packer.ToFloat(location, highlight)
vertex.uv0 = new Vector2(
Packer.ToFloat(vertex.uv0.x, vertex.uv0.y),
Packer.ToFloat(nomalizedPos.y, normalizedIndex)
);
vh.SetUIVertex(vertex, i);
@@ -328,42 +368,38 @@ namespace Coffee.UIExtensions
/// </summary>
public void Play()
{
_time = 0;
m_Play = true;
_player.Play();
}
/// <summary>
/// Stop effect.
/// </summary>
public void Stop()
{
_player.Stop();
}
protected override void SetDirty()
{
ptex.RegisterMaterial(targetGraphic.material);
ptex.SetData(this, 0, m_EffectFactor); // param1.x : location
ptex.SetData(this, 1, m_Width); // param1.y : width
ptex.SetData(this, 2, m_Softness); // param1.z : softness
ptex.SetData(this, 3, m_Brightness);// param1.w : blightness
ptex.SetData(this, 4, m_Gloss); // param2.x : gloss
if (!Mathf.Approximately(_lastRotation, m_Rotation) && targetGraphic)
{
_lastRotation = m_Rotation;
targetGraphic.SetVerticesDirty();
}
}
//################################
// Private Members.
//################################
float _time = 0;
float _lastRotation;
void Update()
{
if (!m_Play || !Application.isPlaying)
{
return;
}
_time += m_UpdateMode == AnimatorUpdateMode.UnscaledTime
? Time.unscaledDeltaTime
: Time.deltaTime;
location = _time / m_Duration;
if (m_Duration <= _time)
{
m_Play = m_Loop;
_time = m_Loop ? -m_LoopDelay : 0;
}
}
// /// <summary>
// /// Mark the UIEffect as dirty.
// /// </summary>
// void _SetDirty()
// {
// if (graphic)
// graphic.SetVerticesDirty();
// }
EffectPlayer _player{ get { return m_Player ?? (m_Player = new EffectPlayer()); } }
}
}
@@ -0,0 +1,354 @@
using UnityEngine;
using UnityEngine.UI;
namespace Coffee.UIExtensions
{
/// <summary>
/// Transition effect.
/// </summary>
[AddComponentMenu("UI/UIEffect/UITransitionEffect", 5)]
public class UITransitionEffect : UIEffectBase
{
//################################
// Constant or Static Members.
//################################
public const string shaderName = "UI/Hidden/UI-Effect-Transition";
static readonly ParameterTexture _ptex = new ParameterTexture(8, 128, "_ParamTex");
/// <summary>
/// Effect mode.
/// </summary>
public enum EffectMode
{
Fade = 1,
Cutoff = 2,
Dissolve = 3,
}
//################################
// Serialize Members.
//################################
[Tooltip("Effect mode.")]
[SerializeField] EffectMode m_EffectMode = EffectMode.Cutoff;
[Tooltip("Effect factor between 0(hidden) and 1(shown).")]
[SerializeField][Range(0, 1)] float m_EffectFactor = 1;
[Tooltip("Transition texture (single channel texture).")]
[SerializeField] Texture m_TransitionTexture;
[Tooltip("The area for effect.")]
[SerializeField] EffectArea m_EffectArea = EffectArea.RectTransform;
[Tooltip("Keep effect aspect ratio.")]
[SerializeField] bool m_KeepAspectRatio;
[Tooltip("Dissolve edge width.")]
[SerializeField] [Range(0, 1)] float m_DissolveWidth = 0.5f;
[Tooltip("Dissolve edge softness.")]
[SerializeField] [Range(0, 1)] float m_DissolveSoftness = 0.5f;
[Tooltip("Dissolve edge color.")]
[SerializeField] [ColorUsage(false)] Color m_DissolveColor = new Color(0.0f, 0.25f, 1.0f);
[Tooltip("Disable graphic's raycast target on hidden.")]
[SerializeField] bool m_PassRayOnHidden;
[Header("Effect Player")]
[SerializeField] EffectPlayer m_Player;
//################################
// Public Members.
//################################
/// <summary>
/// Effect factor between 0(no effect) and 1(complete effect).
/// </summary>
public float effectFactor
{
get { return m_EffectFactor; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_EffectFactor, value))
{
m_EffectFactor = value;
SetDirty();
}
}
}
/// <summary>
/// Transition texture.
/// </summary>
public Texture transitionTexture
{
get { return m_TransitionTexture; }
set
{
if (m_TransitionTexture != value)
{
m_TransitionTexture = value;
if (graphic)
{
ModifyMaterial();
}
}
}
}
/// <summary>
/// Effect mode.
/// </summary>
public EffectMode effectMode { get { return m_EffectMode; } }
/// <summary>
/// Keep aspect ratio.
/// </summary>
public bool keepAspectRatio
{
get { return m_KeepAspectRatio; }
set
{
if (m_KeepAspectRatio != value)
{
m_KeepAspectRatio = value;
targetGraphic.SetVerticesDirty();
}
}
}
/// <summary>
/// Gets the parameter texture.
/// </summary>
public override ParameterTexture ptex { get { return _ptex; } }
/// <summary>
/// Dissolve edge width.
/// </summary>
public float dissolveWidth
{
get { return m_DissolveWidth; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_DissolveWidth, value))
{
m_DissolveWidth = value;
SetDirty();
}
}
}
/// <summary>
/// Dissolve edge softness.
/// </summary>
public float dissolveSoftness
{
get { return m_DissolveSoftness; }
set
{
value = Mathf.Clamp(value, 0, 1);
if (!Mathf.Approximately(m_DissolveSoftness, value))
{
m_DissolveSoftness = value;
SetDirty();
}
}
}
/// <summary>
/// Dissolve edge color.
/// </summary>
public Color dissolveColor
{
get { return m_DissolveColor; }
set
{
if (m_DissolveColor != value)
{
m_DissolveColor = value;
SetDirty();
}
}
}
/// <summary>
/// Duration for showing/hiding.
/// </summary>
public float duration { get { return _player.duration; } set { _player.duration = Mathf.Max(value, 0.1f); } }
/// <summary>
/// Disable graphic's raycast target on hidden.
/// </summary>
public bool passRayOnHidden { get { return m_PassRayOnHidden; } set { m_PassRayOnHidden = value; } }
/// <summary>
/// Update mode for showing/hiding.
/// </summary>
public AnimatorUpdateMode updateMode { get { return _player.updateMode; } set { _player.updateMode = value; } }
/// <summary>
/// Show transition.
/// </summary>
public void Show()
{
_player.loop = false;
_player.Play(f => effectFactor = f);
}
/// <summary>
/// Hide transition.
/// </summary>
public void Hide()
{
_player.loop = false;
_player.Play(f => effectFactor = 1 - f);
}
/// <summary>
/// Modifies the material.
/// </summary>
public override void ModifyMaterial()
{
ulong hash = (m_TransitionTexture ? (uint)m_TransitionTexture.GetInstanceID() : 0) + ((ulong)2 << 32) + ((ulong)m_EffectMode << 36);
if (_materialCache != null && (_materialCache.hash != hash || !isActiveAndEnabled || !m_EffectMaterial))
{
MaterialCache.Unregister(_materialCache);
_materialCache = null;
}
if (!isActiveAndEnabled || !m_EffectMaterial)
{
graphic.material = null;
}
else if (!m_TransitionTexture)
{
graphic.material = m_EffectMaterial;
}
else if (_materialCache != null && _materialCache.hash == hash)
{
graphic.material = _materialCache.material;
}
else
{
_materialCache = MaterialCache.Register(hash, m_TransitionTexture, () =>
{
var mat = new Material(m_EffectMaterial);
mat.name += "_" + m_TransitionTexture.name;
mat.SetTexture("_TransitionTexture", m_TransitionTexture);
return mat;
});
graphic.material = _materialCache.material;
}
}
/// <summary>
/// Modifies the mesh.
/// </summary>
public override void ModifyMesh(VertexHelper vh)
{
if (!isActiveAndEnabled)
{
return;
}
// rect.
var tex = transitionTexture;
var aspectRatio = m_KeepAspectRatio && tex ? ((float)tex.width) / tex.height : -1;
Rect rect = m_EffectArea.GetEffectArea(vh, graphic, aspectRatio);
// Set prameters to vertex.
float normalizedIndex = ptex.GetNormalizedIndex(this);
UIVertex vertex = default(UIVertex);
bool effectEachCharacter = graphic is Text && m_EffectArea == EffectArea.Character;
float x, y;
int count = vh.currentVertCount;
for (int i = 0; i < count; i++)
{
vh.PopulateUIVertex(ref vertex, i);
if (effectEachCharacter)
{
x = splitedCharacterPosition[i % 4].x;
y = splitedCharacterPosition[i % 4].y;
}
else
{
x = Mathf.Clamp01(vertex.position.x / rect.width + 0.5f);
y = Mathf.Clamp01(vertex.position.y / rect.height + 0.5f);
}
vertex.uv0 = new Vector2(
Packer.ToFloat(vertex.uv0.x, vertex.uv0.y),
Packer.ToFloat(x, y, normalizedIndex)
);
vh.SetUIVertex(vertex, i);
}
}
//################################
// Protected Members.
//################################
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected override void OnEnable()
{
base.OnEnable();
_player.OnEnable(null);
_player.loop = false;
}
/// <summary>
/// This function is called when the behaviour becomes disabled () or inactive.
/// </summary>
protected override void OnDisable()
{
MaterialCache.Unregister(_materialCache);
_materialCache = null;
base.OnDisable();
_player.OnDisable();
}
protected override void SetDirty()
{
ptex.RegisterMaterial(targetGraphic.material);
ptex.SetData(this, 0, m_EffectFactor); // param1.x : effect factor
if (m_EffectMode == EffectMode.Dissolve)
{
ptex.SetData(this, 1, m_DissolveWidth); // param1.y : width
ptex.SetData(this, 2, m_DissolveSoftness); // param1.z : softness
ptex.SetData(this, 4, m_DissolveColor.r); // param2.x : red
ptex.SetData(this, 5, m_DissolveColor.g); // param2.y : green
ptex.SetData(this, 6, m_DissolveColor.b); // param2.z : blue
}
// Disable graphic's raycastTarget on hidden.
if (m_PassRayOnHidden)
{
graphic.raycastTarget = 0 < m_EffectFactor;
}
}
#if UNITY_EDITOR
/// <summary>
/// Gets the material.
/// </summary>
/// <returns>The material.</returns>
protected override Material GetMaterial()
{
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName), m_EffectMode);
}
#endif
//################################
// Private Members.
//################################
MaterialCache _materialCache = null;
EffectPlayer _player{ get { return m_Player ?? (m_Player = new EffectPlayer()); } }
}
}
@@ -0,0 +1,16 @@
fileFormatVersion: 2
guid: 922b805bc01c243e5853d9cbb544118c
timeCreated: 1538827562
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences:
- m_EffectMaterial: {instanceID: 0}
- m_PtexMaterial: {instanceID: 0}
- m_TransitionTexture: {fileID: 2800000, guid: 3e04c247fb2604af186173fce0bc62de,
type: 3}
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -15,6 +15,8 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
_ParamTex ("Parameter Texture", 2D) = "white" {}
[Header(Dissolve)]
_NoiseTex("Noise Texture (A)", 2D) = "white" {}
}
@@ -68,8 +70,6 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
float4 color : COLOR;
float2 texcoord : TEXCOORD0;
UNITY_VERTEX_INPUT_INSTANCE_ID
float2 uv1 : TEXCOORD1;
};
struct v2f
@@ -79,9 +79,8 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
float2 texcoord : TEXCOORD0;
float4 worldPosition : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
fixed4 effectFactor : TEXCOORD2;
fixed4 effectFactor2 : TEXCOORD3;
half3 param : TEXCOORD2;
};
fixed4 _Color;
@@ -89,7 +88,8 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
float4 _ClipRect;
sampler2D _MainTex;
sampler2D _NoiseTex;
sampler2D _ParamTex;
v2f vert(appdata_t IN)
{
v2f OUT;
@@ -103,32 +103,33 @@ Shader "UI/Hidden/UI-Effect-Dissolve"
OUT.color = IN.color * _Color;
//xy: Noize uv, z: Dissolve factor, w: width
OUT.effectFactor = UnpackToVec4(IN.uv1.x);
//xyz: color, w: softness
OUT.effectFactor2 = UnpackToVec4(IN.uv1.y);
OUT.texcoord = UnpackToVec2(IN.texcoord.x);
OUT.param = UnpackToVec3(IN.texcoord.y);
return OUT;
}
fixed4 frag(v2f IN) : SV_Target
{
fixed4 param1 = tex2D(_ParamTex, float2(0.25, IN.param.z));
fixed location = param1.x;
fixed width = param1.y/4;
fixed softness = param1.z;
fixed3 dissolveColor = tex2D(_ParamTex, float2(0.75, IN.param.z)).rgb;
float cutout = tex2D(_NoiseTex, IN.param.xy).a;
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
float cutout = tex2D(_NoiseTex, IN.effectFactor.xy).a;
float location = IN.effectFactor.z;
float width = IN.effectFactor.w/4;
float factor = cutout - location * ( 1 + width ) + width;
#ifdef UNITY_UI_ALPHACLIP
clip (min(color.a - 0.01, factor));
#endif
fixed edgeLerp = step(factor, color.a) * saturate((width - factor)*16/ IN.effectFactor2.w);
color = ApplyColorEffect(color, fixed4(IN.effectFactor2.rgb, edgeLerp));
color.a *= saturate((factor)*32/ IN.effectFactor2.w);
fixed edgeLerp = step(factor, color.a) * saturate((width - factor)*16/ softness);
color = ApplyColorEffect(color, fixed4(dissolveColor, edgeLerp));
color.a *= saturate((factor)*32/ softness);
return color;
}
@@ -0,0 +1,146 @@
Shader "UI/Hidden/UI-Effect-HSV"
{
Properties
{
[PerRendererData] _MainTex ("Main Texture", 2D) = "white" {}
_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
_ParamTex ("Parameter Texture", 2D) = "white" {}
}
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
{
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma multi_compile __ UNITY_UI_ALPHACLIP
#include "UnityCG.cginc"
#include "UnityUI.cginc"
#include "UI-Effect.cginc"
sampler2D _MainTex;
fixed4 _TextureSampleAdd;
float4 _ClipRect;
sampler2D _ParamTex;
struct appdata_t
{
float4 vertex : POSITION;
float4 color : COLOR;
float2 texcoord : TEXCOORD0;
UNITY_VERTEX_INPUT_INSTANCE_ID
};
struct v2f
{
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
float2 texcoord : TEXCOORD0;
float4 wpos : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
half param : TEXCOORD2;
};
v2f vert(appdata_t IN)
{
v2f OUT;
UNITY_SETUP_INSTANCE_ID(IN);
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
OUT.wpos = IN.vertex;
OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord;
OUT.color = IN.color;
OUT.texcoord = UnpackToVec2(IN.texcoord.x);
OUT.param = IN.texcoord.y;
return OUT;
}
half3 rgb2hsv(half3 c) {
half4 K = half4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
half4 p = lerp(half4(c.bg, K.wz), half4(c.gb, K.xy), step(c.b, c.g));
half4 q = lerp(half4(p.xyw, c.r), half4(c.r, p.yzx), step(p.x, c.r));
half d = q.x - min(q.w, q.y);
half e = 1.0e-10;
return half3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
}
half3 hsv2rgb(half3 c) {
c = half3(c.x, clamp(c.yz, 0.0, 1.0));
half4 K = half4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
half3 p = abs(frac(c.xxx + K.xyz) * 6.0 - K.www);
return c.z * lerp(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
}
fixed4 frag(v2f IN) : COLOR
{
fixed4 param1 = tex2D(_ParamTex, float2(0.25, IN.param));
fixed4 param2 = tex2D(_ParamTex, float2(0.75, IN.param));
fixed3 targetHsv = param1.rgb;
fixed3 targetRange = param1.w;
fixed3 hsvShift = param2.xyz - 0.5;
half4 color = tex2D(_MainTex, IN.texcoord);// + _TextureSampleAdd) * IN.color;
color.a *= UnityGet2DClipping(IN.wpos.xy, _ClipRect);
#ifdef UNITY_UI_ALPHACLIP
clip (color.a - 0.001);
#endif
half3 hsv = rgb2hsv(color.rgb);
half3 range = abs(hsv - targetHsv);
half diff = max(max(min(1-range.x, range.x), min(1-range.y, range.y)/10), min(1-range.z, range.z)/10);
fixed masked = step(diff, targetRange);
color.rgb = hsv2rgb(hsv + hsvShift * masked);
return (color + _TextureSampleAdd) * IN.color;
}
ENDCG
}
}
}
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 7fc74090480c84f8b977cfcd55cdfe82
timeCreated: 1531882595
licenseType: Pro
ShaderImporter:
defaultTextures: []
userData:
assetBundleName:
assetBundleVariant:
@@ -14,6 +14,8 @@ Shader "UI/Hidden/UI-Effect-Shiny"
_ColorMask ("Color Mask", Float) = 15
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
_ParamTex ("Parameter Texture", 2D) = "white" {}
}
SubShader
@@ -56,15 +58,14 @@ Shader "UI/Hidden/UI-Effect-Shiny"
#include "UnityCG.cginc"
#include "UnityUI.cginc"
#include "UI-Effect.cginc"
struct appdata_t
{
float4 vertex : POSITION;
float4 color : COLOR;
float2 texcoord : TEXCOORD0;
UNITY_VERTEX_INPUT_INSTANCE_ID
float2 uv1 : TEXCOORD1;
};
struct v2f
@@ -74,9 +75,8 @@ Shader "UI/Hidden/UI-Effect-Shiny"
float2 texcoord : TEXCOORD0;
float4 worldPosition : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
half4 effectFactor : TEXCOORD2;
half2 effectFactor2 : TEXCOORD3;
half2 param : TEXCOORD2;
};
fixed4 _Color;
@@ -84,38 +84,7 @@ Shader "UI/Hidden/UI-Effect-Shiny"
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;
}
half2 UnpackToVec2(float value)
{
const int PACKER_STEP = 4096;
const int PRECISION = PACKER_STEP - 1;
fixed4 color;
color.x = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
color.y = (value % PACKER_STEP) / PRECISION;
return color;
}
sampler2D _ParamTex;
v2f vert(appdata_t IN)
{
@@ -126,19 +95,25 @@ Shader "UI/Hidden/UI-Effect-Shiny"
OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord;
OUT.color = IN.color * _Color;
OUT.effectFactor = UnpackToVec4(IN.uv1.x);
OUT.effectFactor2 = UnpackToVec2(IN.uv1.y);
OUT.effectFactor2.x = OUT.effectFactor2.x * 2 - 0.5;
OUT.texcoord = UnpackToVec2(IN.texcoord.x);
OUT.param = UnpackToVec2(IN.texcoord.y);
return OUT;
}
fixed4 frag(v2f IN) : SV_Target
{
fixed nomalizedPos = IN.param.x;
fixed4 param1 = tex2D(_ParamTex, float2(0.25, IN.param.y));
fixed4 param2 = tex2D(_ParamTex, float2(0.75, IN.param.y));
half location = param1.x * 2 - 0.5;
fixed width = param1.y;
fixed softness = param1.z;
fixed brightness = param1.w;
fixed gloss = param2.x;
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd);
fixed4 originAlpha = color.a;
color *= IN.color;
@@ -148,13 +123,11 @@ Shader "UI/Hidden/UI-Effect-Shiny"
clip (color.a - 0.001);
#endif
half pos = IN.effectFactor.x - IN.effectFactor2.x;
half normalized = 1 - saturate(abs((nomalizedPos - location) / width));
half shinePower = smoothstep(0, softness*2, normalized);
half3 reflectColor = lerp(1, color.rgb * 10, gloss);
half normalized = 1 - saturate(abs(pos / IN.effectFactor.z));
half shinePower = smoothstep(0, IN.effectFactor.y*2, normalized);
half3 reflectColor = lerp(1, color.rgb * 10, IN.effectFactor2.y);
color.rgb += originAlpha * (shinePower / 2) * IN.effectFactor.w * reflectColor;
color.rgb += originAlpha * (shinePower / 2) * brightness * reflectColor;
return color;
}
ENDCG
@@ -0,0 +1,145 @@
Shader "UI/Hidden/UI-Effect-Transition"
{
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(Transition)]
_TransitionTexture("Transition Texture (A)", 2D) = "white" {}
_ParamTex ("Parameter Texture", 2D) = "white" {}
}
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
#pragma shader_feature __ FADE CUTOFF DISSOLVE
#include "UnityCG.cginc"
#include "UnityUI.cginc"
#include "UI-Effect.cginc"
struct appdata_t
{
float4 vertex : POSITION;
float4 color : COLOR;
float2 texcoord : TEXCOORD0;
UNITY_VERTEX_INPUT_INSTANCE_ID
};
struct v2f
{
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
float2 texcoord : TEXCOORD0;
float4 wpos : TEXCOORD1;
half3 param : TEXCOORD2;
UNITY_VERTEX_OUTPUT_STEREO
};
fixed4 _Color;
fixed4 _TextureSampleAdd;
float4 _ClipRect;
sampler2D _MainTex;
sampler2D _TransitionTexture;
sampler2D _ParamTex;
v2f vert(appdata_t IN)
{
v2f OUT;
UNITY_SETUP_INSTANCE_ID(IN);
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
OUT.wpos = IN.vertex;
OUT.vertex = UnityObjectToClipPos(OUT.wpos);
OUT.texcoord = UnpackToVec2(IN.texcoord.x);
OUT.param = UnpackToVec3(IN.texcoord.y);
OUT.color = IN.color * _Color;
return OUT;
}
fixed4 frag(v2f IN) : SV_Target
{
fixed4 param1 = tex2D(_ParamTex, float2(0.25, IN.param.z));
fixed effectFactor = param1.x;
float alpha = tex2D(_TransitionTexture, IN.param.xy).a;
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd);
color.a *= UnityGet2DClipping(IN.wpos.xy, _ClipRect);
#if FADE
color.a *= saturate(alpha + (effectFactor * 2 - 1));
#elif CUTOFF
color.a *= step(0.001, color.a * alpha - 1 + effectFactor);
#elif DISSOLVE
fixed width = param1.y/4;
fixed softness = param1.z;
fixed3 dissolveColor = tex2D(_ParamTex, float2(0.75, IN.param.z)).rgb;
float factor = alpha - (1 - effectFactor) * ( 1 + width ) + width;
fixed edgeLerp = step(factor, color.a) * saturate((width - factor)*16/ softness);
color.rgb += dissolveColor.rgb * edgeLerp;
color.a *= saturate((factor)*32/ softness);
#endif
color *= IN.color;
#if UNITY_UI_ALPHACLIP
clip (color.a - 0.001);
#endif
return color;
}
ENDCG
}
}
}
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 85ad24dd0759947ddb117625e108d49c
timeCreated: 1482973535
licenseType: Pro
ShaderImporter:
defaultTextures:
- _MainTex: {instanceID: 0}
- _TransitionTexture: {fileID: 2800000, guid: a74d3d4a498866d44b094d3d3717604d,
type: 3}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,8 +1,6 @@
#ifndef UI_EFFECT_INCLUDED
#define UI_EFFECT_INCLUDED
#define PACKER_STEP 64
#if GRAYSCALE | SEPIA | NEGA | PIXEL | MONO | CUTOFF | HUE
#define UI_TONE
#endif
@@ -15,30 +13,123 @@
#define UI_BLUR
#endif
// Unpack float to low-precision [0-1] fixed4.
// Unpack float to low-precision [0-1] fixed4.
fixed4 UnpackToVec4(float value)
{
{
const int PACKER_STEP = 64;
const int PRECISION = PACKER_STEP - 1;
fixed4 color;
fixed4 unpacked;
color.r = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
unpacked.x = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
color.g = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
unpacked.y = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
color.b = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
unpacked.z = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
color.a = (value % PACKER_STEP) / PRECISION;
return color;
unpacked.w = (value % PACKER_STEP) / PRECISION;
return unpacked;
}
// Unpack float to low-precision [0-1] fixed3.
fixed3 UnpackToVec3(float value)
{
const int PACKER_STEP = 256;
const int PRECISION = PACKER_STEP - 1;
fixed3 unpacked;
unpacked.x = (value % (PACKER_STEP)) / (PACKER_STEP - 1);
value = floor(value / (PACKER_STEP));
unpacked.y = (value % PACKER_STEP) / (PACKER_STEP - 1);
value = floor(value / PACKER_STEP);
unpacked.z = (value % PACKER_STEP) / (PACKER_STEP - 1);
return unpacked;
}
// Unpack float to low-precision [0-1] half2.
half2 UnpackToVec2(float value)
{
const int PACKER_STEP = 4096;
const int PRECISION = PACKER_STEP - 1;
half2 unpacked;
unpacked.x = (value % (PACKER_STEP)) / (PACKER_STEP - 1);
value = floor(value / (PACKER_STEP));
unpacked.y = (value % PACKER_STEP) / (PACKER_STEP - 1);
return unpacked;
}
// Sample texture with blurring.
// * Fast: Sample texture with 3x3 kernel.
// * Medium: Sample texture with 5x5 kernel.
// * Detail: Sample texture with 7x7 kernel.
fixed4 Tex2DBlurring (sampler2D tex, half2 uv, half2 blur)
fixed4 Tex2DBlurring (sampler2D tex, half2 texcood, half2 blur, half4 mask)
{
#if FASTBLUR && EX
const int KERNEL_SIZE = 5;
const float KERNEL_[5] = { 0.2486, 0.7046, 1.0, 0.7046, 0.2486};
#elif MEDIUMBLUR && EX
const int KERNEL_SIZE = 9;
const float KERNEL_[9] = { 0.0438, 0.1719, 0.4566, 0.8204, 1.0, 0.8204, 0.4566, 0.1719, 0.0438};
#elif DETAILBLUR && EX
const int KERNEL_SIZE = 13;
const float KERNEL_[13] = { 0.0438, 0.1138, 0.2486, 0.4566, 0.7046, 0.9141, 1.0, 0.9141, 0.7046, 0.4566, 0.2486, 0.1138, 0.0438};
#elif FASTBLUR
const int KERNEL_SIZE = 3;
const float KERNEL_[3] = { 0.4566, 1.0, 0.4566};
#elif MEDIUMBLUR
const int KERNEL_SIZE = 5;
const float KERNEL_[5] = { 0.2486, 0.7046, 1.0, 0.7046, 0.2486};
#elif DETAILBLUR
const int KERNEL_SIZE = 7;
const float KERNEL_[7] = { 0.1719, 0.4566, 0.8204, 1.0, 0.8204, 0.4566, 0.1719};
#else
const int KERNEL_SIZE = 1;
const float KERNEL_[1] = { 1.0 };
#endif
float4 o = 0;
float sum = 0;
float2 shift = 0;
for(int x = 0; x < KERNEL_SIZE; x++)
{
shift.x = blur.x * (float(x) - KERNEL_SIZE/2);
for(int y = 0; y < KERNEL_SIZE; y++)
{
shift.y = blur.y * (float(y) - KERNEL_SIZE/2);
float2 uv = texcood + shift;
float weight = KERNEL_[x] * KERNEL_[y];
sum += weight;
#if EX
fixed masked = min(mask.x <= uv.x, uv.x <= mask.z) * min(mask.y <= uv.y, uv.y <= mask.w);
o += lerp(fixed4(0.5, 0.5, 0.5, 0), tex2D(tex, uv), masked) * weight;
#else
o += tex2D(tex, uv) * weight;
#endif
}
}
return o / sum;
}
// Sample texture with blurring.
// * Fast: Sample texture with 3x3 kernel.
// * Medium: Sample texture with 5x5 kernel.
// * Detail: Sample texture with 7x7 kernel.
fixed4 Tex2DBlurring (sampler2D tex, half2 texcood, half2 blur)
{
return Tex2DBlurring(tex, texcood, blur, half4(0,0,1,1));
}
// Sample texture with blurring.
// * Fast: Sample texture with 3x1 kernel.
// * Medium: Sample texture with 5x1 kernel.
// * Detail: Sample texture with 7x1 kernel.
fixed4 Tex2DBlurring1D (sampler2D tex, half2 uv, half2 blur)
{
#if FASTBLUR
const int KERNEL_SIZE = 3;
@@ -53,17 +144,14 @@ fixed4 Tex2DBlurring (sampler2D tex, half2 uv, half2 blur)
float sum = 0;
float weight;
half2 texcood;
for(int x = -KERNEL_SIZE/2; x <= KERNEL_SIZE/2; x++)
for(int i = -KERNEL_SIZE/2; i <= KERNEL_SIZE/2; i++)
{
for(int y = -KERNEL_SIZE/2; y <= KERNEL_SIZE/2; y++)
{
texcood = uv;
texcood.x += blur.x * x;
texcood.y += blur.y * y;
weight = 1.0/(abs(x)+abs(y)+2);
o += tex2D(tex, texcood)*weight;
sum += weight;
}
texcood = uv;
texcood.x += blur.x * i;
texcood.y += blur.y * i;
weight = 1.0/(abs(i)+2);
o += tex2D(tex, texcood)*weight;
sum += weight;
}
return o / sum;
}
@@ -14,6 +14,8 @@ Shader "UI/Hidden/UI-Effect"
_ColorMask ("Color Mask", Float) = 15
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
_ParamTex ("Parameter Texture", 2D) = "white" {}
}
SubShader
@@ -50,13 +52,18 @@ Shader "UI/Hidden/UI-Effect"
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#if !defined(SHADER_API_D3D11_9X) && !defined(SHADER_API_D3D9)
#pragma target 2.0
#else
#pragma target 3.0
#endif
#pragma multi_compile __ UNITY_UI_ALPHACLIP
#pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL MONO CUTOFF HUE
#pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL
#pragma shader_feature __ ADD SUBTRACT FILL
#pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR
#pragma shader_feature __ EX
#include "UnityCG.cginc"
#include "UnityUI.cginc"
@@ -69,7 +76,9 @@ Shader "UI/Hidden/UI-Effect"
float2 texcoord : TEXCOORD0;
UNITY_VERTEX_INPUT_INSTANCE_ID
float2 uv1 : TEXCOORD1;
#if defined(EX)
float2 uvMask : TEXCOORD1;
#endif
};
struct v2f
@@ -79,16 +88,11 @@ Shader "UI/Hidden/UI-Effect"
float2 texcoord : TEXCOORD0;
float4 worldPosition : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
#if defined (UI_COLOR)
fixed4 colorFactor : COLOR1;
#endif
#if defined (UI_TONE) || defined (UI_BLUR)
half4 effectFactor : TEXCOORD2;
#endif
#if HUE || PIXEL
half4 extraFactor : TEXCOORD3;
half param : TEXCOORD2;
#if defined(EX)
half4 uvMask : TEXCOORD3;
#endif
};
@@ -97,6 +101,7 @@ Shader "UI/Hidden/UI-Effect"
float4 _ClipRect;
sampler2D _MainTex;
float4 _MainTex_TexelSize;
sampler2D _ParamTex;
v2f vert(appdata_t IN)
{
@@ -106,23 +111,15 @@ Shader "UI/Hidden/UI-Effect"
OUT.worldPosition = IN.vertex;
OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
OUT.texcoord = IN.texcoord;
OUT.color = IN.color * _Color;
#if defined (UI_TONE) || defined (UI_BLUR)
OUT.effectFactor = UnpackToVec4(IN.uv1.x);
#endif
OUT.texcoord = UnpackToVec2(IN.texcoord.x) * 2 - 0.5;
#if HUE
OUT.extraFactor.x = cos(OUT.effectFactor.x*3.14159265359 * 2);
OUT.extraFactor.y = sin(OUT.effectFactor.x*3.14159265359 * 2);
#elif PIXEL
OUT.extraFactor.xy = max(2, (1-OUT.effectFactor.x*0.98) * _MainTex_TexelSize.zw);
#endif
#if defined (UI_COLOR)
OUT.colorFactor = UnpackToVec4(IN.uv1.y);
OUT.param = IN.texcoord.y;
#if defined(EX)
OUT.uvMask.xy = UnpackToVec2(IN.uvMask.x);
OUT.uvMask.zw = UnpackToVec2(IN.uvMask.y);
#endif
return OUT;
@@ -131,35 +128,36 @@ Shader "UI/Hidden/UI-Effect"
fixed4 frag(v2f IN) : SV_Target
{
fixed4 param = tex2D(_ParamTex, float2(0.5, IN.param));
fixed effectFactor = param.x;
fixed colorFactor = param.y;
fixed blurFactor = param.z;
#if PIXEL
IN.texcoord = round(IN.texcoord * IN.extraFactor.xy) / IN.extraFactor.xy;
half2 pixelSize = max(2, (1-effectFactor*0.95) * _MainTex_TexelSize.zw);
IN.texcoord = round(IN.texcoord * pixelSize) / pixelSize;
#endif
#if defined (UI_BLUR)
half4 color = (Tex2DBlurring(_MainTex, IN.texcoord, IN.effectFactor.z * _MainTex_TexelSize.xy * 2) + _TextureSampleAdd) * IN.color;
#if defined(UI_BLUR) && EX
half4 color = (Tex2DBlurring(_MainTex, IN.texcoord, blurFactor * _MainTex_TexelSize.xy * 2, IN.uvMask) + _TextureSampleAdd);
#elif defined(UI_BLUR)
half4 color = (Tex2DBlurring(_MainTex, IN.texcoord, blurFactor * _MainTex_TexelSize.xy * 2) + _TextureSampleAdd);
#else
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd);
#endif
color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
#ifdef CUTOFF
clip (color.a - 1 + IN.effectFactor.x * 1.001);
#elif UNITY_UI_ALPHACLIP
#if UNITY_UI_ALPHACLIP
clip (color.a - 0.001);
#endif
#if MONO
color.rgb = IN.color.rgb;
color.a = color.a * tex2D(_MainTex, IN.texcoord).a + IN.effectFactor.x * 2 - 1;
#elif HUE
color.rgb = shift_hue(color.rgb, IN.extraFactor.x, IN.extraFactor.y);
#elif defined (UI_TONE) & !CUTOFF
color = ApplyToneEffect(color, IN.effectFactor.x);
#if defined (UI_TONE)
color = ApplyToneEffect(color, effectFactor);
#endif
#if defined (UI_COLOR)
color = ApplyColorEffect(color, IN.colorFactor) * IN.color;
#endif
color = ApplyColorEffect(color, fixed4(IN.color.rgb, colorFactor));
color.a *= IN.color.a;
return color;
}
@@ -14,76 +14,48 @@ Shader "UI/Hidden/UI-EffectCapture"
Pass
{
Name "Default"
Name "Effect-Base"
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma target 2.0
#pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL MONO CUTOFF HUE
#pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL
#pragma shader_feature __ ADD SUBTRACT FILL
#pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR
#include "UnityCG.cginc"
#include "UI-Effect.cginc"
struct v2f
{
float4 vertex : SV_POSITION;
float2 texcoord : TEXCOORD0;
#if HUE || PIXEL
half2 extraFactor : TEXCOORD1;
#endif
};
sampler2D _MainTex;
float4 _MainTex_TexelSize;
half4 _EffectFactor;
fixed4 _ColorFactor;
v2f vert(appdata_img v)
v2f_img vert(appdata_img v)
{
v2f OUT;
OUT.vertex = UnityObjectToClipPos(v.vertex);
OUT.texcoord = v.texcoord;
#if HUE
OUT.extraFactor.y = sin(_EffectFactor.x*3.14159265359*2);
OUT.extraFactor.x = cos(_EffectFactor.x*3.14159265359*2);
#elif PIXEL
OUT.extraFactor.xy = max(2, (1-_EffectFactor.x) * _MainTex_TexelSize.zw);
#endif
v2f_img o;
o.pos = UnityObjectToClipPos(v.vertex);
o.uv = v.texcoord;
#if UNITY_UV_STARTS_AT_TOP
fixed flip = _EffectFactor.w;
OUT.texcoord.y = lerp(OUT.texcoord.y, 1 - OUT.texcoord.y, flip);
o.uv.y = 1 - o.uv.y;
#endif
return OUT;
return o;
}
fixed4 frag(v2f IN) : SV_Target
fixed4 frag(v2f_img IN) : SV_Target
{
fixed effectFactor = _EffectFactor.x;
fixed blurFactor = _EffectFactor.z;
fixed colorFactor = _ColorFactor;
half effectFactor = _EffectFactor.x;
fixed4 colorFactor = _ColorFactor;
#if PIXEL
IN.texcoord = round(IN.texcoord * IN.extraFactor.xy) / IN.extraFactor.xy;
#endif
#if defined (UI_BLUR)
half4 color = Tex2DBlurring(_MainTex, IN.texcoord, blurFactor * _MainTex_TexelSize.xy * 2);
#else
half4 color = tex2D(_MainTex, IN.texcoord);
half2 pixelScale = max(2, (1 - effectFactor) * _MainTex_TexelSize.zw);
IN.uv = round(IN.uv * pixelScale) / pixelScale;
#endif
#if HUE
color.rgb = shift_hue(color.rgb, IN.extraFactor.x, IN.extraFactor.y);
#elif defined (UI_TONE)
half4 color = tex2D(_MainTex, IN.uv);
#if defined (UI_TONE)
color = ApplyToneEffect(color, effectFactor);
#endif
@@ -96,5 +68,34 @@ Shader "UI/Hidden/UI-EffectCapture"
}
ENDCG
}
Pass
{
Name "Effect-Blur"
CGPROGRAM
#pragma vertex vert_img
#pragma fragment frag_blur
#pragma target 2.0
#pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR
#include "UnityCG.cginc"
#include "UI-Effect.cginc"
sampler2D _MainTex;
float4 _MainTex_TexelSize;
half4 _EffectFactor;
fixed4 frag_blur(v2f_img IN) : SV_Target
{
half2 blurFactor = _EffectFactor.xy;
half4 color = Tex2DBlurring1D(_MainTex, IN.uv, blurFactor * _MainTex_TexelSize.xy * 2);
color.a = 1;
return color;
}
ENDCG
}
}
}
-9
View File
@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: f2381d5cb31034d1fbcdb9c1e70fad2d
folderAsset: yes
timeCreated: 1527748593
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
-67
View File
@@ -1,67 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEngine.UI;
namespace Coffee.UIExtensions
{
public static class MaterialBundle
{
[MenuItem("UIEffect/Generate Material Bundle")]
static void Generate()
{
#if UIEFFECT_SEPARATE
// On "UIEFFECT_SEPARATE" mode, generate effect materials on demand.
return;
#endif
// Export materials.
AssetDatabase.StartAssetEditing();
GenerateMaterialVariants(
Shader.Find(UIEffect.shaderName)
, (ToneMode[])Enum.GetValues(typeof(ToneMode))
, (ColorMode[])Enum.GetValues(typeof(ColorMode))
, (BlurMode[])Enum.GetValues(typeof(BlurMode))
);
GenerateMaterialVariants(
Shader.Find(UIEffectCapturedImage.shaderName)
, new[] { ToneMode.None, ToneMode.Grayscale, ToneMode.Sepia, ToneMode.Nega, ToneMode.Pixel, ToneMode.Hue, }
, (ColorMode[])Enum.GetValues(typeof(ColorMode))
, (BlurMode[])Enum.GetValues(typeof(BlurMode))
);
GenerateMaterialVariants(
Shader.Find(UIDissolve.shaderName)
, new ToneMode[]{ToneMode.None}
, (ColorMode[])Enum.GetValues(typeof(ColorMode))
, new BlurMode[]{BlurMode.None}
);
AssetDatabase.StopAssetEditing();
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
}
static void GenerateMaterialVariants(Shader shader, ToneMode[] tones, ColorMode[] colors, BlurMode[] blurs)
{
var combinations = (from tone in tones
from color in colors
from blur in blurs
select new { tone, color, blur }).ToArray();
for (int i = 0; i < combinations.Length; i++)
{
var comb = combinations[i];
var name = MaterialResolver.GetVariantName(shader, comb.tone, comb.color, comb.blur);
EditorUtility.DisplayProgressBar("Genarate Effect Material Bundle", name, (float)i / combinations.Length);
MaterialResolver.GetOrGenerateMaterialVariant(shader, comb.tone, comb.color, comb.blur);
}
EditorUtility.ClearProgressBar();
}
}
}
+148
View File
@@ -1,5 +1,153 @@
# Changelog
## [v3.0.2](https://github.com/mob-sakai/UIEffect/tree/v3.0.2) (2019-01-15)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.1...v3.0.2)
**Fixed bugs:**
- UIEffect & UIHsvModifier & UITransitionEffect Strange action [\#144](https://github.com/mob-sakai/UIEffect/issues/144)
## [v3.0.1](https://github.com/mob-sakai/UIEffect/tree/v3.0.1) (2018-11-07)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v3.0.0...v3.0.1)
**Fixed bugs:**
- Compile error in 2018.3 [\#139](https://github.com/mob-sakai/UIEffect/issues/139)
## [v3.0.0](https://github.com/mob-sakai/UIEffect/tree/v3.0.0) (2018-10-09)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.8.3...v3.0.0)
### New architecture: easier, faster and more beautiful.
* Simple & easy-to-use
* 20% faster
* High precision parameter
### Immediate capturing (UIEffectCapturedImage option)
* Capture the previous frame immediately without any camera.
* You no longer have to wait one frame to capture!
* *NOTE: LWRP, WebGL and Unity 5.x for iOS/Mac are not supported.*
### Advanced blur (UIEffect option)
* Remove common artifacts in the blur effect for uGUI.
![](https://user-images.githubusercontent.com/12690315/42547121-80134788-84fb-11e8-97a0-048bba9634ea.png)
* It is effective for small padding size atlases, including dynamic fonts!
**Breaking changes:**
- UIEffectCapturedImage: Remove 'TargetTexture' feature [\#136](https://github.com/mob-sakai/UIEffect/issues/136)
- Remove 'additional shadow' in UIShadow component [\#110](https://github.com/mob-sakai/UIEffect/issues/110)
- Remove 'custom effect' feature in UIEffect component [\#98](https://github.com/mob-sakai/UIEffect/issues/98)
- Remove 'shadow effect' feature in UIEffect component [\#97](https://github.com/mob-sakai/UIEffect/issues/97)
- Remove 'hue effect' in UIEffect component [\#91](https://github.com/mob-sakai/UIEffect/issues/91)
- Remove 'cutoff' and 'mono' effect in UIEffect component [\#78](https://github.com/mob-sakai/UIEffect/issues/78)
- New architecture: Shared texture for effect parameter [\#63](https://github.com/mob-sakai/UIEffect/issues/63)
- Change: Change `ToneMode` to `EffectMode` [\#61](https://github.com/mob-sakai/UIEffect/issues/61)
- Separate shadow effect to other component [\#52](https://github.com/mob-sakai/UIEffect/issues/52)
- Use the graphic color as effect color, to reduce parameters [\#50](https://github.com/mob-sakai/UIEffect/issues/50)
**Implemented enhancements:**
- UITransitionEffect: "Pass ray on hidden" option [\#135](https://github.com/mob-sakai/UIEffect/issues/135)
- Add component menu in editor [\#133](https://github.com/mob-sakai/UIEffect/issues/133)
- UITransitionEffect: Add Show/Hide method [\#132](https://github.com/mob-sakai/UIEffect/issues/132)
- UIEffectCapturedImage: Immediate capturing [\#130](https://github.com/mob-sakai/UIEffect/issues/130)
- Improve blurring for atlas [\#95](https://github.com/mob-sakai/UIEffect/issues/95)
- Use Canvas.willRenderCanvases event instead of Update method [\#87](https://github.com/mob-sakai/UIEffect/issues/87)
**Closed issues:**
- Add tooltip [\#92](https://github.com/mob-sakai/UIEffect/issues/92)
- UIShiny: change parameter name `highlight` to `gloss` [\#93](https://github.com/mob-sakai/UIEffect/issues/93)
## [v2.8.3](https://github.com/mob-sakai/UIEffect/tree/v2.8.3) (2018-09-29)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.8.2...v2.8.3)
**Fixed bugs:**
- UIEffectCapturedImage: Black screen with Unity 2018.1+ editor on Windows [\#131](https://github.com/mob-sakai/UIEffect/issues/131)
## [v2.8.2](https://github.com/mob-sakai/UIEffect/tree/v2.8.2) (2018-09-26)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.8.1...v2.8.2)
**Fixed bugs:**
- UICapturedEffectImage does not work with 'ScreenSpace - Overlay' in edit mode [\#128](https://github.com/mob-sakai/UIEffect/issues/128)
- The UIEffectCapturedImage is upside down with 'ScreenSpace - Overlay' mode [\#127](https://github.com/mob-sakai/UIEffect/issues/127)
- When "UI-Effect.mat" is created automatically, Unity hangs up. [\#126](https://github.com/mob-sakai/UIEffect/issues/126)
- UICapturedEffectImage does not work with Lightweight Render Pipeline LWRP [\#125](https://github.com/mob-sakai/UIEffect/issues/125)
## [v2.8.1](https://github.com/mob-sakai/UIEffect/tree/v2.8.1) (2018-08-17)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.8.0...v2.8.1)
**Fixed bugs:**
- \(Demo\) "Transition capture & dissolve" is incorrect [\#119](https://github.com/mob-sakai/UIEffect/issues/119)
## [v2.8.0](https://github.com/mob-sakai/UIEffect/tree/v2.8.0) (2018-08-14)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.7.1...v2.8.0)
* Create a screen transition!
![8 -08-2018 19-29-38](https://user-images.githubusercontent.com/12690315/43832265-dbdecc98-9b41-11e8-8ab5-9f49420a6a16.gif)
* Some updates make UIEffectCapturedImage easier to use!
**Implemented enhancements:**
- UIEffectCapturedImage: Supports 'ScreenSpace - Overlay' [\#115](https://github.com/mob-sakai/UIEffect/issues/115)
- UIEffectCapturedImage: Keep aspect ratio [\#114](https://github.com/mob-sakai/UIEffect/issues/114)
- UIEffectCapturedImage: 'Capture on enable' option [\#113](https://github.com/mob-sakai/UIEffect/issues/113)
- UITransitionEffect: Change transition texture [\#111](https://github.com/mob-sakai/UIEffect/issues/111)
**Closed issues:**
- UIEffectCapturedImage: change parameter name `keepCanvasSize` to `fitToScreen` [\#116](https://github.com/mob-sakai/UIEffect/issues/116)
## [v2.7.1](https://github.com/mob-sakai/UIEffect/tree/v2.7.1) (2018-08-06)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.7.0...v2.7.1)
**Fixed bugs:**
- In v2.7.0, UIEffectCapturedImage is flipped vertically on Windows [\#112](https://github.com/mob-sakai/UIEffect/issues/112)
## [v2.7.0](https://github.com/mob-sakai/UIEffect/tree/v2.7.0) (2018-07-26)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.6.2...v2.7.0)
UIHsvModifier: Modify hue, saturation, and value as you like!
![](https://user-images.githubusercontent.com/12690315/43200006-d6e2bf54-904e-11e8-9f22-0c0f9ce5912f.gif)
* Note: `Hue` mode in UIEffect component will be obsolete in the near future. Please use UIHsvModifier component instead.
* Note: `Cutoff` and `Mono` mode in UIEffect component will be obsolete in the near future. Please use UITransitionEffect component instead.
**Implemented enhancements:**
- UIEffectCapturedImage: Support target RenderTexture to use external component [\#108](https://github.com/mob-sakai/UIEffect/issues/108)
- Transition effect as other component [\#105](https://github.com/mob-sakai/UIEffect/issues/105)
- Use multi-pass blurring to capture screenshot [\#96](https://github.com/mob-sakai/UIEffect/issues/96)
- Feature: HSV modifier [\#44](https://github.com/mob-sakai/UIEffect/issues/44)
**Fixed bugs:**
- UIEffectCapturedImage: ColorMode is not working [\#109](https://github.com/mob-sakai/UIEffect/issues/109)
- UIDissolve is not maskable [\#101](https://github.com/mob-sakai/UIEffect/issues/101)
## [v2.6.2](https://github.com/mob-sakai/UIEffect/tree/v2.6.2) (2018-07-18)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.6.1...v2.6.2)
**Fixed bugs:**
- Shader has compile errors in D3D9 or D3D11\_9X\(WSA\) [\#99](https://github.com/mob-sakai/UIEffect/issues/99)
## [v2.6.1](https://github.com/mob-sakai/UIEffect/tree/v2.6.1) (2018-06-14)
[Full Changelog](https://github.com/mob-sakai/UIEffect/compare/v2.6.0...v2.6.1)
+2 -1
View File
@@ -35,7 +35,8 @@ GraphicsSettings:
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_PreloadedShaders:
- {fileID: 20000000, guid: 73036fa061ee340dcb3c04b9d8872e66, type: 2}
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
m_TierSettings_Tier1:
+1 -1
View File
@@ -1 +1 @@
m_EditorVersion: 5.5.0p4
m_EditorVersion: 5.5.4p5
+51 -17
View File
@@ -1,19 +1,20 @@
UIEffect
===
UIEffect contains visual effect components for uGUI element in Unity.
UIEffect provide visual effect components for uGUI element in Unity.
[![](https://img.shields.io/github/release/mob-sakai/UIEffect.svg?label=latest%20version)](https://github.com/mob-sakai/UIEffect/releases)
[![](https://img.shields.io/github/release-date/mob-sakai/UIEffect.svg)](https://github.com/mob-sakai/UIEffect/releases)
![](https://img.shields.io/badge/unity-5.5%2B-green.svg)
[![](https://img.shields.io/github/license/mob-sakai/UIEffect.svg)](https://github.com/mob-sakai/UIEffect/blob/master/LICENSE.txt)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-orange.svg)](http://makeapullrequest.com)
[![](https://img.shields.io/twitter/follow/mob_sakai.svg?label=Follow&style=social)](https://twitter.com/intent/follow?screen_name=mob_sakai)
<< [Description](#Description) | [WebGL Demo](#demo) | [Download](https://github.com/mob-sakai/UIEffect/releases) | [Usage](#usage) | [Example of using](#example-of-using) | [Development Note](#development-note) >>
<< [Description](#Description) | [WebGL Demo](#demo) | [Download](https://github.com/mob-sakai/UIEffect/releases) | [Usage](#usage) | [Development Note](#development-note) >>
### What's new? Please see [RELEASE NOTE ![](https://img.shields.io/github/release-date/mob-sakai/UIEffect.svg?label=last%20updated&style=for-the-badge)](https://github.com/mob-sakai/UIEffect/blob/develop/CHANGELOG.md)
### What's new? [See changelog ![](https://img.shields.io/github/release-date/mob-sakai/UIEffect.svg?label=last%20updated)](https://github.com/mob-sakai/UIEffect/blob/develop/CHANGELOG.md)
### Do you want to receive notifications for new releases? [Watch this repo ![](https://img.shields.io/github/watchers/mob-sakai/UIEffect.svg?style=social&label=Watch)](https://github.com/mob-sakai/UIEffect/subscription)
### Support me on Patreon! [![become_a_patron](https://user-images.githubusercontent.com/12690315/50731629-3b18b480-11ad-11e9-8fad-4b13f27969c1.png)](https://www.patreon.com/join/2343451?)
@@ -32,19 +33,21 @@ AnimationClip is supported as a matter of course!
| Component | Features | Screenshot |
|-|-|-|
|**UIEffect**|Combine some visual effects.<br>See also [Development note](#why-is-uieffect-lightweight).<br><br>**ToneMode:** Grayscale, Sepia, Nega, Pixelation, Hue shift, Cutoff (alpha-based), Mono (alpha-based)<br>**ColorMode:** Overwrite, Additive, Subtract<br>**BlurMode:** Fast, Medium, Detail<br><br>*NOTE: ToneMode, ColorMode and BlurMode are changeable only in editor.*<br>*NOTE: Custom Effect feature will be obsolete. Please use `UICustomEffect` component instead.*<br>*NOTE: Shadow feature will be obsolete. Please use `UIShadow` component instead.*|<img src="https://user-images.githubusercontent.com/12690315/40757428-68277f0c-64c3-11e8-89e5-4a19616a85c1.png" width="1000px">|
|**UICaptured EffectImage**|Capture a screenshot of a specific frame with effect, and display it.<br>See also [Development note](#how-does-uieffectcapturedimage-work).<br><br>**ToneMode:** Grayscale, Sepia, Nega, Pixelation, Hue shift<br>**ColorMode:** Overwrite, Additive, Subtract<br>**BlurMode:** Fast, Medium, Detail|<img src="https://user-images.githubusercontent.com/12690315/34619468-97e3c134-f285-11e7-90b2-3a75bde13911.gif" width="1000px">|
|**UIShiny**|Apply shinning effect to a graphic.<br>The effect does not require Mask component or normal map.<br><br>**Options:** Location, Width, Rotation, Softness, Brightness, Highlight|<img src="https://user-images.githubusercontent.com/12690315/41398144-5c2ca126-6ff1-11e8-954b-394b611e2316.gif" width="1000px">|
|**UIDissolve**|Apply dissolve effect to a graphic.<br><br>**ColorMode:** Overwrite, Additive, Subtract<br>**Options:** Location, Width, Rotation, Softness, Color|<img src="https://user-images.githubusercontent.com/12690315/41397973-d1038f7e-6ff0-11e8-919f-affb427393ee.gif" width="1000px">|
|**UIEffect**|Combine some visual effects.<br><br>**Effect Mode:** Grayscale, Sepia, Nega, Pixelation<br>**Color Mode:** Multiply, Fill, Additive, Subtract<br>**Blur Mode:** Fast, Medium, Detail<br>**Advanced Blur:** Enable more beautiful blurring.|<img src="https://user-images.githubusercontent.com/12690315/46639603-258df180-cba2-11e8-8f50-9e93bdc4c96e.png" width="600px">|
|**UICaptured EffectImage**|Capture a screenshot of a specific frame with effect, and display it.<br>This effect is non-realtime, light-weight, less-camera, but be effective enough.<br><br>**Effect Mode:** Grayscale, Sepia, Nega, Pixelation<br>**Color Mode:** Multiply, Fill, Additive, Subtract<br>**Blur Mode:** Fast, Medium, Detail<br>**Quality Mode:** Fast, Medium, Detail, Custom<br>**Capture On Enable:** When the component is enable, capture screen automatically.<br>**Blur iterations:** Number of blur iterations.<br>**Reduction/Downsampling Rate:** None, x1, x2, x4, x8<br>**Fit size to screen:** Fit RectTransform to the screen on captured.<br>**Immediate Capturing:**<br><br>*NOTE: This component can be used with UIEffect, UITransition etc.*<br>*NOTE: Immediate capturing does not support LWRP, WebGL and Unity 5.x for iOS/Mac.*|<img src="https://user-images.githubusercontent.com/12690315/44078752-4c2e4114-9fe2-11e8-97f0-54d3a36a562e.gif" width="600px">|
|**UIShiny**|Apply shining effect to a graphic.<br>The effect does not require Mask component or normal map.<br><br>**Parameters:** Effect factor, Width, Rotation, Softness, Brightness, Gloss<br>**Effect Player:** To play shining, enable `Play` in inspector or call `Play()` from script.|<img src="https://user-images.githubusercontent.com/12690315/46639689-b1078280-cba2-11e8-8716-cbc634af7293.gif" width="600px">|
|**UIDissolve**|Apply dissolve effect to a graphic.<br><br>**Color Mode for edge:** Multiply, Fill, Additive, Subtract<br>**Parameters:** Effect factor, Width, Rotation, Softness, Edge color<br>**Options:** Effect area, Keep effect aspect ratio<br>**Effect Player:** To play dissolving, call `Play()` from script.|<img src="https://user-images.githubusercontent.com/12690315/46639690-b1078280-cba2-11e8-8aa9-1d2650fe9a62.gif" width="600px">|
|**UIHsvModifier**|Modify HSV for graphic.<br><br>**Target:** Color, Range<br>**Adjustment:** Hue, Saturation, Value|<img src="https://user-images.githubusercontent.com/12690315/43200006-d6e2bf54-904e-11e8-9f22-0c0f9ce5912f.gif" width="600px">|
|**UITransition Effect**|Apply transition effect with a single channel texture.<br><br>**Effect Mode:** Cutoff, Fade, Dissolve<br>**Options:** Effect area, Keep effect aspect ratio, transition texture<br>**Pass Ray On Hidden:** Disable the graphic's raycastTarget on hidden.<br>**Effect Player:** To show/hide transition, call `Show()/Hide()` from script.|<img src="https://user-images.githubusercontent.com/12690315/46639688-b1078280-cba2-11e8-8bbb-16b8498bca5f.gif" width="600px">|
<br><br>
##### The following effects can be used with the above components.
| Component | Features | Screenshot |
|-|-|-|
|**UIShadow**|Add shadows/outlines to a graphic.<br>Performance is better than the default Shadow/Outline component.<br>See also [Development note](#the-issue-of-default-outline-component).<br><br>**ShadowStyle:** Shadow, Shadow3, Outline, Outline8<br>**Additional Shadows** reduce vertices for multiple Shadows or Outlines.|<img src="https://user-images.githubusercontent.com/12690315/40716994-ca5c13d2-6445-11e8-96d0-25a3ce704e2e.png" width="1000px">|
|**UIGradient**|Change vertex color as gradient with angle and offset.<br><br>**Direction:** Horizontal, Vertical, Angle, Diagonal<br>**Options:** Offset, Color space|<img src="https://user-images.githubusercontent.com/12690315/40716995-ca87665e-6445-11e8-8233-ec2e21fefd6b.png" width="1000px">|
|**UIFlip**|Flip a graphic.<br><br>**Direction:** Horizontal, Vertical, Both|<img src="https://user-images.githubusercontent.com/12690315/40716996-cab1fd7e-6445-11e8-9753-962d23991d86.png" width="1000px">|
|**UIShadow**|Add shadow/outline to a graphic.<br>The performance is better than the default Shadow/Outline component.<br><br>**ShadowStyle:** Shadow, Shadow3, Outline, Outline8|<img src="https://user-images.githubusercontent.com/12690315/46639604-258df180-cba2-11e8-98a9-aa31f04c695d.png" width="600px">|
|**UIGradient**|Change vertex color as gradient with angle and offset.<br><br>**Direction:** Horizontal, Vertical, Angle, Diagonal<br>**Options:** Offset, Color space|<img src="https://user-images.githubusercontent.com/12690315/40716995-ca87665e-6445-11e8-8233-ec2e21fefd6b.png" width="600px">|
|**UIFlip**|Flip a graphic.<br><br>**Direction:** Horizontal, Vertical, Both|<img src="https://user-images.githubusercontent.com/12690315/40716996-cab1fd7e-6445-11e8-9753-962d23991d86.png" width="600px">|
@@ -66,10 +69,15 @@ AnimationClip is supported as a matter of course!
## Usage
1. Download UIEffect.unitypackage from [Releases](https://github.com/mob-sakai/UIEffect/releases).
1. Import the package into your Unity project. Select `Import Package > Custom Package` from the `Assets` menu.
1. In Unity5.6+, enable `TexCoord1` channel of canvas. See also [Development Note](##note-unity-56).
1. Add any effect component to UI element (Image, RawImage, Text, etc...) from `Add Component` in inspector.
1. Enjoy!
2. Import the package into your Unity project. Select `Import Package > Custom Package` from the `Assets` menu.
![](https://user-images.githubusercontent.com/12690315/46570979-edbb5a00-c9a7-11e8-845d-c5ee279effec.png)
3. In Unity5.6+, enable `TexCoord1` channel of canvas. See also [Development Note](##note-unity-56).
![](https://user-images.githubusercontent.com/12690315/46567584-3525f400-c970-11e8-9839-5c9e810b0b80.png)
4. Add any effect component to UI element (Image, RawImage, Text, etc...) from `Add Component` in inspector or `Component > UI > UIEffect > ...` menu.
![](https://user-images.githubusercontent.com/12690315/46570977-ebf19680-c9a7-11e8-9ffb-174f56107070.png)
6. Adjust the parameters of the effect as you like, in inspector.
![image](https://user-images.githubusercontent.com/12690315/38594668-636dd3ac-3d82-11e8-9951-820964a6a95f.gif)
7. Enjoy!
##### Requirement
@@ -80,6 +88,24 @@ AnimationClip is supported as a matter of course!
<br><br><br><br>
## Example of using
| Case | Description | Screenshot |
|-|-|-|
|Lock/unlock contents|Use UIEffect to apply grayscale.<br>Indicate to user that the content is unavailable.|![](https://user-images.githubusercontent.com/12690315/46563469-aba8fe80-c93c-11e8-850f-949f6f8da742.png)|
|Silhouette|Use UIEffect for filling color.|![](https://user-images.githubusercontent.com/12690315/46563576-3db10700-c93d-11e8-960e-4336ff3ce481.png)|
|Soft shadow/<br>Outer glow|Use UIEffect and UIShadow to blur the shadow.<br>To blur only shadow, set `Blur Factor` in UIEffect to 0.|![](https://user-images.githubusercontent.com/12690315/46566001-452edb00-c952-11e8-9cc4-6098a9eb67f3.png)|
|Colored shadow|Use UIEffect and UIShadow to fill shadow with color.<br>To fill only shadow, set `Color Factor` in UIEffect to 0.|![](https://user-images.githubusercontent.com/12690315/46566000-452edb00-c952-11e8-8d20-6ccc3fa92ae4.png)|
|Blurred dynamic font|Use UIEffect to blur text.<br>To blur dynamic font cleanly, enable `Advanced Blur` option.|![](https://user-images.githubusercontent.com/12690315/46566002-45c77180-c952-11e8-87cb-4d915e0614be.png)|
|Text with outline & shadow|Use two UIShadows to add outline and shadow.<br>There is less overdraw than default Outline/Shadow `(Default: 1 x 5 x 2 = 10 overdraws, UIShadow: 1 + 4 + 1 = 6 overdraws)`.|![](https://user-images.githubusercontent.com/12690315/46566003-45c77180-c952-11e8-9b47-7bf563ffbaa7.png)|
|Shining button|Use UIShiny for shining button.<br>Shine the button and indicate to user that you can press the button.<br>Enable `Play` and `Loop` option to shine it without any AnimationClip.|![](https://user-images.githubusercontent.com/12690315/46563539-fb87c580-c93c-11e8-8c08-0f21872c47d4.gif)|
|Blurring the background of a menu|Use UIEffectCapturedImage to blur the background of a menu.<br>UIEffectCapturedImage applies an effect to the screen of the previous frame, without adding a camera or layer.<br>It's not a real-time post effect, so it's good performance and works well on mobile.|![](https://user-images.githubusercontent.com/12690315/46565712-735dec00-c94d-11e8-81b4-4e848d8fdb2e.png)|
|Screen transition|Use UITransitionEffect to add screen transition.<br>You can change transition texture (single channel texture).<br>Enable `Pass Ray On Hidden` option and use `Show()/Hide()` method to play transition without AnimationClip.|![](https://user-images.githubusercontent.com/12690315/46565182-dfd5ec80-c947-11e8-834f-a2ef67ad0d95.gif)|
<br><br><br><br>
## Development Note
@@ -119,6 +145,12 @@ See also [Demo](#demo).
| x(32bit float) | Tone level | *Empty* | Blur level | *Empty* |
| y(32bit float) | Red channel | Green channel | Blue channel | Alpha channel |
* In v3.0.0+, UIEffect uploads the parameter value to a shared texture and the shader refers to it.
This approach has the following advantages:
* More parameters for the effect are available.
* The parameter accuracy is improved from 6 bits to 8 bits.
* ModifyMesh is not called when parameter value is changed.
#### Note: Unity 5.6+
@@ -176,6 +208,8 @@ UIShadow's 'Addition Shadow' feature solves this issue by adding only the necess
## Author
[mob-sakai](https://github.com/mob-sakai)
[![](https://img.shields.io/twitter/follow/mob_sakai.svg?label=Follow&style=social)](https://twitter.com/intent/follow?screen_name=mob_sakai)
[![become_a_patron](https://user-images.githubusercontent.com/12690315/50731629-3b18b480-11ad-11e9-8fad-4b13f27969c1.png)](https://www.patreon.com/join/2343451?)
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "UIEffect",
"version": "2.6.1",
"version": "3.0.2",
"repository": {
"type": "git",
"url": "git+https://github.com/mob-sakai/UIEffect.git"
+1 -74
View File
@@ -2,77 +2,4 @@
# 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. Open unity project to check compile error.
# 3. Update "CHANGELOG.md" using "github_changelog_generator-1.15.0.pre.rc".
# 4. Check changelog and continue proccess.
# 5. Export unitypackage.
# 6. Commit package.json and CHANGELOG.md.
# 7. Merge into master branch.
# 8. Release using "gh-release-3.2.0". (with upload unitypackage)
# input release version
echo -e ">> Start Github Release:"
PACKAGE_NAME=`node -pe 'require("./package.json").name'`
echo -e ">> Package name: ${PACKAGE_NAME}"
CURRENT_VERSION=`grep -o -e "\"version\".*$" package.json | sed -e "s/\"version\": \"\(.*\)\".*$/\1/"`
read -p "[? release version (for current: ${CURRENT_VERSION}): " RELEASE_VERSION
[ -z "${RELEASE_VERSION}" ] && exit
# update version in package.json
echo -e "\n>> Update version... package.json"
git checkout -B release develop
sed -i -e "s/\"version\": \(.*\)/\"version\": \"${RELEASE_VERSION}\",/g" package.json
# check unity editor
UNITY_VER=`sed -e "s/m_EditorVersion: \(.*\)/\1/g" ProjectSettings/ProjectVersion.txt`
UNITY_EDITOR="/Applications/Unity/Hub/Editor/${UNITY_VER}/Unity.app/Contents/MacOS/Unity"
echo -e "\n>> Check unity editor... ${UNITY_VER} (${UNITY_EDITOR})"
"$UNITY_EDITOR" -quit -batchmode -projectPath "`pwd`"
echo -e ">> OK"
# generate change log
CHANGELOG_GENERATOR_ARG=`grep -o -e ".*git\"$" package.json | sed -e "s/^.*\/\([^\/]*\)\/\([^\/]*\).git.*$/--user \1 --project \2/"`
CHANGELOG_GENERATOR_ARG="--future-release v${RELEASE_VERSION} ${CHANGELOG_GENERATOR_ARG}"
echo -e "\n>> Generate change log... ${CHANGELOG_GENERATOR_ARG}"
github_changelog_generator ${CHANGELOG_GENERATOR_ARG}
git diff -- CHANGELOG.md
read -p "[? is the change log correct? (y/N):" yn
case "$yn" in [yY]*) ;; *) exit ;; esac
# export unitypackage
PACKAGE_SRC=`node -pe 'require("./package.json").src'`
echo -e "\n>> Export unitypackage... ${PACKAGE_SRC}"
"$UNITY_EDITOR" -quit -batchmode -projectPath "`pwd`" -exportpackage "$PACKAGE_SRC" "$PACKAGE_NAME.unitypackage"
echo -e ">> OK"
# commit release files
echo -e "\n>> Commit release files..."
git add CHANGELOG.md -f
git add package.json -f
git commit -m "update change log"
# merge and push
echo -e "\n>> Merge and push..."
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
# upload unitypackage and release on Github
gh-release --assets "$PACKAGE_NAME.unitypackage"
echo -e "\n\n>> $PACKAGE_NAME v$RELEASE_VERSION has been successfully released!\n"
bash <(curl -sL 'https://gist.github.com/mob-sakai/a883999a32dd8b1927639e46b3cd6801/raw/unity_release.sh')