pengtaihao
/
ParticleEffectForUGUI
mirror of https://github.com/mob-sakai/ParticleEffectForUGUI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

release v1.2.0

pull/33/head
mob-sakai 2018-12-13 10:23:08 +09:00
parent 79922a80cf 662516406d
commit 221e0f325b
18 changed files with 16316 additions and 878 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo.cs
View File

@ -1,4 +1,5 @@
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using System.Collections.Generic;
@ -37,7 +38,15 @@ namespace Coffee.UIExtensions.Demo
public void EnableMask (bool enabled)
{
foreach (var m in m_Masks)
foreach (var m in FindObjectsOfType<Mask> ())
{
m.enabled = enabled;
}
}
public void EnableMask2D (bool enabled)
{
foreach (var m in FindObjectsOfType<RectMask2D> ())
{
m.enabled = enabled;
}
@ -48,5 +57,18 @@ namespace Coffee.UIExtensions.Demo
m_ScalingByTransforms.ForEach (x => x.localScale = Vector3.one * (10 * scale));
m_ScalingByUIParticles.ForEach (x => x.scale = scale);
}
public void SetUIParticleScale(float scale)
{
foreach(var uip in FindObjectsOfType<UIParticle>())
{
uip.scale = scale;
}
}
public void LoadScene(string name)
{
SceneManager.LoadScene (name);
}
}
}

2588
Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo_Fire.mat
View File

@ -5,7 +5,8 @@ Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UIParticle_Demo_Fire
m_Shader: {fileID: 4800000, guid: ecfa8f5732b504ef98fba10aa18d0326, type: 3}
m_ShaderKeywords:
@ -77,6 +78,7 @@ Material:
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}

9446
Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo_FlameStream_Root(ScaleTest).prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo_FlameStream_Root(ScaleTest).prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d6b0ba590556a45cd8c5a92ee22ddf1c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4842
Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo_ScaleTest.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo_ScaleTest.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 728f1c107bd0b49418a7e499b481b8da
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo_Spread.mat
View File

@ -5,7 +5,8 @@ Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UIParticle_Demo_Spread
m_Shader: {fileID: 4800000, guid: ecfa8f5732b504ef98fba10aa18d0326, type: 3}
m_ShaderKeywords:
@ -77,6 +78,7 @@ Material:
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}

3
Assets/Coffee/UIExtensions/UIParticle/UIAdditive.mat
View File

@ -5,7 +5,8 @@ Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UIAdditive
m_Shader: {fileID: 4800000, guid: ecfa8f5732b504ef98fba10aa18d0326, type: 3}
m_ShaderKeywords:

181
Assets/Coffee/UIExtensions/UIParticle/UIAdditive.shader
View File

@ -1,93 +1,114 @@
Shader "UI/Additive"
{
Properties
{
_MainTex ("Sprite 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
Properties
{
[PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
_Color ("Tint", Color) = (1,1,1,1)
_ColorMask ("Color Mask", Float) = 15
}
_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
SubShader
{
Tags
{
"Queue"="Transparent"
"IgnoreProjector"="True"
"RenderType"="Transparent"
"PreviewType"="Plane"
"CanUseSpriteAtlas"="True"
}
Stencil
{
Ref [_Stencil]
Comp [_StencilComp]
Pass [_StencilOp]
ReadMask [_StencilReadMask]
WriteMask [_StencilWriteMask]
}
_ColorMask ("Color Mask", Float) = 15
Cull Off
Lighting Off
ZWrite Off
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
}
SubShader
{
Tags
{
"Queue"="Transparent"
"IgnoreProjector"="True"
"RenderType"="Transparent"
"PreviewType"="Plane"
"CanUseSpriteAtlas"="True"
}
Stencil
{
Ref [_Stencil]
Comp [_StencilComp]
Pass [_StencilOp]
ReadMask [_StencilReadMask]
WriteMask [_StencilWriteMask]
}
Cull Off
Lighting Off
ZWrite Off
ZTest [unity_GUIZTestMode]
Fog { Mode Off }
Blend One One
Blend SrcAlpha One
ColorMask [_ColorMask]
ColorMask [_ColorMask]
Pass
{
Name "Default"
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma target 2.0
Pass
{
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#include "UnityCG.cginc"
struct appdata_t
{
float4 vertex : POSITION;
float4 color : COLOR;
float2 texcoord : TEXCOORD0;
};
#include "UnityCG.cginc"
#include "UnityUI.cginc"
struct v2f
{
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
half2 texcoord : TEXCOORD0;
};
fixed4 _Color;
#pragma multi_compile __ UNITY_UI_CLIP_RECT
#pragma multi_compile __ UNITY_UI_ALPHACLIP
v2f vert(appdata_t IN)
{
v2f OUT;
OUT.vertex = UnityObjectToClipPos(IN.vertex);
OUT.texcoord = IN.texcoord;
#ifdef UNITY_HALF_TEXEL_OFFSET
OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
#endif
OUT.color = IN.color * _Color;
return OUT;
}
struct appdata_t
{
float4 vertex : POSITION;
float4 color : COLOR;
float2 texcoord : TEXCOORD0;
UNITY_VERTEX_INPUT_INSTANCE_ID
};
sampler2D _MainTex;
struct v2f
{
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
float2 texcoord : TEXCOORD0;
float4 worldPosition : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
};
fixed4 frag(v2f IN) : SV_Target
{
half4 color = tex2D(_MainTex, IN.texcoord) * IN.color;
color.rgb *= color.a;
clip (color.a - 0.01);
return color;
}
ENDCG
}
}
sampler2D _MainTex;
fixed4 _Color;
fixed4 _TextureSampleAdd;
float4 _ClipRect;
float4 _MainTex_ST;
v2f vert(appdata_t v)
{
v2f OUT;
UNITY_SETUP_INSTANCE_ID(v);
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
OUT.worldPosition = v.vertex;
OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
OUT.color = v.color * _Color;
return OUT;
}
fixed4 frag(v2f IN) : SV_Target
{
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
#ifdef UNITY_UI_CLIP_RECT
color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
#endif
#ifdef UNITY_UI_ALPHACLIP
clip (color.a - 0.001);
#endif
return color;
}
ENDCG
}
}
}

26
Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs
View File

@ -19,7 +19,7 @@ namespace Coffee.UIExtensions
static readonly int s_IdMainTex = Shader.PropertyToID ("_MainTex");
static readonly List<Vector3> s_Vertices = new List<Vector3> ();
static readonly List<UIParticle> s_TempRelatables = new List<UIParticle> ();
static readonly List<UIParticle> s_ActiveSoftMasks = new List<UIParticle> ();
static readonly List<UIParticle> s_ActiveParticles = new List<UIParticle> ();
//################################
@ -109,11 +109,11 @@ namespace Coffee.UIExtensions
protected override void OnEnable ()
{
// Register.
if (s_ActiveSoftMasks.Count == 0)
if (s_ActiveParticles.Count == 0)
{
Canvas.willRenderCanvases += UpdateMeshes;
}
s_ActiveSoftMasks.Add (this);
s_ActiveParticles.Add (this);
// Reset the parent-child relation.
GetComponentsInChildren<UIParticle> (false, s_TempRelatables);
@ -137,8 +137,8 @@ namespace Coffee.UIExtensions
protected override void OnDisable ()
{
// Unregister.
s_ActiveSoftMasks.Remove (this);
if (s_ActiveSoftMasks.Count == 0)
s_ActiveParticles.Remove (this);
if (s_ActiveParticles.Count == 0)
{
Canvas.willRenderCanvases -= UpdateMeshes;
}
@ -179,6 +179,8 @@ namespace Coffee.UIExtensions
}
}
SetParent (newParent);
base.OnTransformParentChanged ();
}
protected override void OnDidApplyAnimationProperties ()
@ -208,9 +210,12 @@ namespace Coffee.UIExtensions
static void UpdateMeshes ()
{
foreach (var uip in s_ActiveSoftMasks)
foreach (var uip in s_ActiveParticles)
{
uip.UpdateMesh ();
if(uip)
{
uip.UpdateMesh ();
}
}
}
@ -222,7 +227,7 @@ namespace Coffee.UIExtensions
CheckTrail ();
Profiler.EndSample ();
if (m_ParticleSystem)
if (m_ParticleSystem && canvas)
{
Profiler.BeginSample ("Disable ParticleSystemRenderer");
if (Application.isPlaying)
@ -232,8 +237,9 @@ namespace Coffee.UIExtensions
Profiler.EndSample ();
Profiler.BeginSample ("Make Matrix");
var s = scale;
scaleaMatrix = Matrix4x4.Scale (new Vector3 (s, s, s));
scaleaMatrix = m_ParticleSystem.main.scalingMode == ParticleSystemScalingMode.Hierarchy
? Matrix4x4.Scale (scale * Vector3.one)
: Matrix4x4.Scale (scale * canvas.rootCanvas.transform.localScale);
Matrix4x4 matrix = default (Matrix4x4);
switch (m_ParticleSystem.main.simulationSpace)
{

28
CHANGELOG.md
View File

@ -1,5 +1,33 @@
# Changelog
## [v1.2.0](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v1.2.0) (2018-12-13)
[Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v1.1.0...v1.2.0)
New scaling system solves the particle effect scaling problem in most cases.
* All ParticleSystem.ScalingModes are supported
* All Canvas.RenderModes are supported
* They look almost the same in all modes
New scaling system scales particle effect well even if you change the following parameters:
* Camera.FieldOfView
* CanvasScaler.MatchWidthOrHeight
* Canvas.PlaneDistance
![](https://user-images.githubusercontent.com/12690315/49866926-6c22f500-fe4c-11e8-8393-d5a546e9e2d3.gif)
**NOTE: If upgrading from v1.1.0, readjust the UIParticle.Scale property.**
**Implemented enhancements:**
- New scaling system [\#18](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/18)
**Fixed bugs:**
- Rect mask 2D doesn't work [\#17](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/17)
- Using prefab view will cause a lot of errors [\#16](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/16)
- Canvas.scaleFactor not take into account [\#15](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/15)
## [v1.1.0](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v1.1.0) (2018-11-28)
[Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v1.0.0...v1.1.0)

11
Packages/manifest.json
View File

@ -1,10 +1,11 @@
{
"dependencies": {
"com.unity.ads": "2.0.8",
"com.unity.analytics": "2.0.16",
"com.unity.package-manager-ui": "1.9.9",
"com.unity.purchasing": "2.0.1",
"com.unity.textmeshpro": "1.2.1",
"com.unity.ads": "2.3.1",
"com.unity.analytics": "3.2.2",
"com.unity.collab-proxy": "1.2.15",
"com.unity.package-manager-ui": "2.0.3",
"com.unity.purchasing": "2.0.3",
"com.unity.textmeshpro": "1.3.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",

3
ProjectSettings/EditorBuildSettings.asset
View File

@ -8,4 +8,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo.unity
guid: 1fc4d0f41c2bd3745b97b439cca95c22
- enabled: 1
path: Assets/Coffee/UIExtensions/UIParticle/Demo/UIParticle_Demo_ScaleTest.unity
guid: 728f1c107bd0b49418a7e499b481b8da
m_configObjects: {}

2
ProjectSettings/ProjectVersion.txt
View File

@ -1 +1 @@
m_EditorVersion: 2018.2.14f1
m_EditorVersion: 2018.3.0f1

11
ProjectSettings/VFXManager.asset Normal file
View File

@ -0,0 +1,11 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!937362698 &1
VFXManager:
m_ObjectHideFlags: 0
m_IndirectShader: {fileID: 0}
m_CopyBufferShader: {fileID: 0}
m_SortShader: {fileID: 0}
m_RenderPipeSettingsPath:
m_FixedTimeStep: 0.016666668
m_MaxDeltaTime: 0.05

5
README.md
View File

@ -50,7 +50,7 @@ Compares this "Baking mesh" approach with the conventional approach:
* Change alpha with CanvasGroup
* Scaling independent of Transform
* No heavy allocation every frame
* All ParticleSystem.ScalingModes and all Canvas.RenderModes are supported. They look almost the same in all modes.
<br><br><br><br>
@ -74,8 +74,7 @@ Compares this "Baking mesh" approach with the conventional approach:
![](https://user-images.githubusercontent.com/12690315/49148942-1c243880-f34c-11e8-9cf5-d871d65c4dbe.png)
7. Adjust the Scale property to change the size of the effect.
![](https://user-images.githubusercontent.com/12690315/49148937-19c1de80-f34c-11e8-87fc-138192777540.gif)
8. That's all. There are no properties you must set in the inspector!
9. Enjoy!
8. Enjoy!
##### Requirement

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ParticleEffectForUGUI",
"version": "1.1.0",
"version": "1.2.0",
"repository": {
"type": "git",
"url": "git+https://github.com/mob-sakai/ParticleEffectForUGUI.git"