Merge branch 'release/0.2.0'

.gitignore

@@ -6,6 +6,8 @@
 [Pp]roject[Ss]ettings/
 [Pp]ackages/
 [Uu]nity[Pp]ackage[Mm]anager/
+
+Assets/Plugins/UnityFx.Outline/CHANGELOG.md
 Assets/AssetStoreTools*
 
 # Visual Studio cache directory

Assets/Examples/Scenes/Outline.unity

@@ -88,6 +88,7 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ShowResolutionOverlay: 1
   m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
@@ -138,7 +139,7 @@ Light:
   serializedVersion: 8
   m_Type: 1
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
+  m_Intensity: 0.5
   m_Range: 10
   m_SpotAngle: 30
   m_CookieSize: 10
@@ -258,6 +259,7 @@ Transform:
   m_Children:
   - {fileID: 1579373806}
   - {fileID: 748173443}
+  - {fileID: 1789341921}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -275,8 +277,8 @@ MonoBehaviour:
   _outlineGos:
   - {fileID: 1579373802}
   - {fileID: 748173439}
-  _outlineWidth: 5
   _outlineColor: {r: 1, g: 0, b: 0, a: 1}
+  _outlineWidth: 8
 --- !u!114 &692811818
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -288,8 +290,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 270d3185d159bf54fb4cddbb42235437, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _renderColorShader: {fileID: 4800000, guid: ac20fbf75bafe454aba5ef3c098349df, type: 3}
-  _postProcessShader: {fileID: 4800000, guid: 41c9acbf41c8245498ac9beab378de12, type: 3}
+  _outlineResources: {fileID: 11400000, guid: d28e70f030b1a634db9a6a6d5478ef19, type: 2}
 --- !u!1 &748173439
 GameObject:
   m_ObjectHideFlags: 0
@@ -368,7 +369,7 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 748173439}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.51, y: 0, z: 3.39}
+  m_LocalPosition: {x: -1.51, y: 0, z: 4}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 692811816}
@@ -452,9 +453,109 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1579373802}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.52, y: 0, z: 3.35}
+  m_LocalPosition: {x: 0, y: 0, z: 4}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 692811816}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1789341920
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1789341921}
+  - component: {fileID: 1789341925}
+  - component: {fileID: 1789341924}
+  - component: {fileID: 1789341923}
+  - component: {fileID: 1789341922}
+  m_Layer: 0
+  m_Name: Cylinder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1789341921
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1789341920}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.5, y: 0, z: 4}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 692811816}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1789341922
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1789341920}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 271c580db5fd384429cdac899152e9e0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _outlineResources: {fileID: 11400000, guid: d28e70f030b1a634db9a6a6d5478ef19, type: 2}
+  _outlineColor: {r: 0, g: 1, b: 0, a: 1}
+  _outlineWidth: 8
+--- !u!23 &1789341923
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1789341920}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!136 &1789341924
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1789341920}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.5
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &1789341925
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1789341920}
+  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}

Assets/Examples/Scripts/OutlineEffectBuilder.cs

@@ -19,9 +19,10 @@ public class OutlineEffectBuilder : MonoBehaviour
 		[SerializeField]
 		private GameObject[] _outlineGos;
 		[SerializeField]
-		private int _outlineWidth = 5;
-		[SerializeField]
 		private Color _outlineColor = Color.red;
+		[SerializeField]
+		[Range(OutlineRenderer.MinWidth, OutlineRenderer.MaxWidth)]
+		private int _outlineWidth = 5;
 
 #pragma warning restore 0649
 
@@ -34,17 +35,37 @@ public class OutlineEffectBuilder : MonoBehaviour
 
 		private void Awake()
 		{
-			_outlineEffect = GetComponent<OutlineEffect>();
-			_outlineLayer = _outlineEffect.AddLayer();
+			if (_outlineEffect == null)
+			{
+				_outlineEffect = GetComponent<OutlineEffect>();
+			}
+
+			if (_outlineLayer == null)
+			{
+				_outlineLayer = _outlineEffect.AddLayer();
+			}
 		}
 
-		private void Update()
+		private void OnValidate()
 		{
+			if (_outlineEffect == null)
+			{
+				_outlineEffect = GetComponent<OutlineEffect>();
+			}
+
+			if (_outlineLayer == null)
+			{
+				_outlineLayer = _outlineEffect.AddLayer();
+			}
+
 			foreach (var go in _outlineGos)
 			{
-				_outlineLayer.OutlineColor = _outlineColor;
-				_outlineLayer.OutlineWidth = _outlineWidth;
-				_outlineLayer.Add(go);
+				if (go)
+				{
+					_outlineLayer.OutlineColor = _outlineColor;
+					_outlineLayer.OutlineWidth = _outlineWidth;
+					_outlineLayer.Add(go);
+				}
 			}
 		}
 

Assets/Plugins/UnityFx.Outline/README.md

@@ -0,0 +1,11 @@
+# UnityFx.Outline
+
+## SUMMARY
+Outline post-effects for Unity.
+
+## USEFUL LINKS
+* [Github project](https://github.com/Arvtesh/UnityFx.Outline)
+* [npm package](https://www.npmjs.com/package/com.unityfx.outline)
+* [Documentation](https://github.com/Arvtesh/UnityFx.Outline/blob/master/README.md)
+* [License](https://github.com/Arvtesh/UnityFx.Outline/blob/master/LICENSE.md)
+* [Support](mailto:arvtesh@gmail.com)

Assets/Plugins/UnityFx.Outline/Runtime/Prefabs/OutlineResources.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b503341e0a514e3489c4851727e68257, type: 3}
+  m_Name: OutlineResources
+  m_EditorClassIdentifier: 
+  RenderShader: {fileID: 4800000, guid: ac20fbf75bafe454aba5ef3c098349df, type: 3}
+  PostProcessShader: {fileID: 4800000, guid: 41c9acbf41c8245498ac9beab378de12, type: 3}