Merge branch 'release/0.8.2'

Arvtesh · Nov 10, 2020 · e34961d · e34961d
2 parents 4191ba6 + a73a103
commit e34961d
Show file tree

Hide file tree

Showing 61 changed files with 2,164 additions and 1,054 deletions.
diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml
@@ -16,7 +16,6 @@ jobs:
           registry-url: https://registry.npmjs.org/
       - run: |
           npm publish Outline.Core/Packages/UnityFx.Outline
-          npm publish Outline.PostProcessing/Packages/UnityFx.Outline.PostProcessing
           npm publish Outline.URP/Packages/UnityFx.Outline.URP
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/); this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.8.2] - 2020.11.10
+
+[URP](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@8.1/manual/index.html) per-layer outlines and misc improvements.
+
+### Added
+- Added URP-specific shader versions.
+- Added URP layer-based outline rendering ([#9](https://github.com/Arvtesh/UnityFx.Outline/issues/9)).
+- Added support for Single Pass Instanced XR rendering for built-in and URP ([#13](https://github.com/Arvtesh/UnityFx.Outline/issues/13)).
+
+### Fixed
+- Fixed URP outlines rendering issue in Unity 2020.2 ([#21](https://github.com/Arvtesh/UnityFx.Outline/issues/21)).
+
 ## [0.8.1] - 2020.09.21
 
 Alpha test support, bugfixes and misc improvements.

diff --git a/NpmPublish.bat b/NpmPublish.bat
@@ -1,3 +1,2 @@
 npm publish Outline.Core\Packages\UnityFx.Outline
-npm publish Outline.PostProcessing\Packages\UnityFx.Outline.PostProcessing
 npm publish Outline.HDRP\Packages\UnityFx.Outline.HDRP
diff --git a/Outline.Core/Assets/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs b/Outline.Core/Assets/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs
@@ -97,12 +97,6 @@ public void Insert_SetsCount()
 			Assert.AreEqual(1, _layerCollection.Count);
 		}
 
-		[Test]
-		public void Remove_DoesNotThrowOnNullArgument()
-		{
-			Assert.DoesNotThrow(() => _layerCollection.Remove(null));
-		}
-
 		[Test]
 		public void Remove_SetsCount()
 		{

diff --git a/Outline.Core/Assets/XR.meta b/Outline.Core/Assets/XR.meta
diff --git a/Outline.Core/Assets/XR/Loaders.meta b/Outline.Core/Assets/XR/Loaders.meta
diff --git a/Outline.Core/Assets/XR/Loaders/Mock HMD Loader.asset b/Outline.Core/Assets/XR/Loaders/Mock HMD Loader.asset
@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0660e8fc444734757ae6f6c40c2d33a0, type: 3}
+  m_Name: Mock HMD Loader
+  m_EditorClassIdentifier: 
diff --git a/Outline.Core/Assets/XR/Loaders/Mock HMD Loader.asset.meta b/Outline.Core/Assets/XR/Loaders/Mock HMD Loader.asset.meta
diff --git a/Outline.Core/Assets/XR/Settings.meta b/Outline.Core/Assets/XR/Settings.meta
diff --git a/Outline.Core/Assets/XR/Settings/Mock HMD Build Settings.asset b/Outline.Core/Assets/XR/Settings/Mock HMD Build Settings.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c8bf066bf8a4947a1be502d267edb82f, type: 3}
+  m_Name: Mock HMD Build Settings
+  m_EditorClassIdentifier: 
+  renderMode: 1
diff --git a/Outline.Core/Assets/XR/Settings/Mock HMD Build Settings.asset.meta b/Outline.Core/Assets/XR/Settings/Mock HMD Build Settings.asset.meta
diff --git a/Outline.Core/Assets/XR/XRGeneralSettings.asset b/Outline.Core/Assets/XR/XRGeneralSettings.asset
@@ -0,0 +1,48 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6957712260415362079
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
+  m_Name: Standalone Settings
+  m_EditorClassIdentifier: 
+  m_LoaderManagerInstance: {fileID: 3934069634805112854}
+  m_InitManagerOnStart: 1
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
+  m_Name: XRGeneralSettings
+  m_EditorClassIdentifier: 
+  Keys: 01000000
+  Values:
+  - {fileID: -6957712260415362079}
+--- !u!114 &3934069634805112854
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
+  m_Name: Standalone Providers
+  m_EditorClassIdentifier: 
+  m_RequiresSettingsUpdate: 0
+  m_AutomaticLoading: 0
+  m_AutomaticRunning: 0
+  m_Loaders:
+  - {fileID: 11400000, guid: fcabf9da944033d4d9ca7914d91c03e7, type: 2}
diff --git a/Outline.Core/Assets/XR/XRGeneralSettings.asset.meta b/Outline.Core/Assets/XR/XRGeneralSettings.asset.meta
diff --git a/Outline.Core/Packages/UnityFx.Outline/CHANGELOG.md b/Outline.Core/Packages/UnityFx.Outline/CHANGELOG.md
@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/); this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.8.2] - 2020.11.10
+
+Misc improvements.
+
+### Added
+- Added support for Single Pass Instanced XR rendering for built-in render pipeline ([#13](https://github.com/Arvtesh/UnityFx.Outline/issues/13)).
+
+### Changed
+- Misc inspector improvements.
+
 ## [0.8.1] - 2020.09.21
 
 Alpha test support, bugfixes and misc improvements.

diff --git a/Outline.Core/Packages/UnityFx.Outline/Editor/Scripts/OutlineBuilderEditor.cs b/Outline.Core/Packages/UnityFx.Outline/Editor/Scripts/OutlineBuilderEditor.cs
@@ -84,9 +84,16 @@ private void OnEnable()
 
 				_content.drawElementCallback += (rect, index, isActive, isFocused) =>
 				{
-					var item = _builder.Content[index];
-					item.Go = (GameObject)EditorGUI.ObjectField(new Rect(rect.x + rect.width * 0.3f + 1, rect.y, rect.width * 0.7f, EditorGUIUtility.singleLineHeight), item.Go, typeof(GameObject), true);
-					item.LayerIndex = EditorGUI.IntField(new Rect(rect.x, rect.y, rect.width * 0.3f - 1, EditorGUIUtility.singleLineHeight), item.LayerIndex);
+					if (_builder && _builder.Content != null && index < _builder.Content.Count)
+					{
+						var item = _builder.Content[index];
+
+						if (item != null)
+						{
+							item.Go = (GameObject)EditorGUI.ObjectField(new Rect(rect.x + rect.width * 0.3f + 1, rect.y, rect.width * 0.7f, EditorGUIUtility.singleLineHeight), item.Go, typeof(GameObject), true);
+							item.LayerIndex = EditorGUI.IntField(new Rect(rect.x, rect.y, rect.width * 0.3f - 1, EditorGUIUtility.singleLineHeight), item.LayerIndex);
+						}
+					}
 				};
 
 				_content.drawHeaderCallback += (rect) =>