Skip to content

Commit 9f4e35d

Browse files
Graphics Tools v0.5.0 - Enforce 2021.3 as minimum version, upgrade sample project to 2021.3.16f1 (#144)
* Update project to to 2021.3.16f1
1 parent 0da4d29 commit 9f4e35d

24 files changed

+84
-97
lines changed

GraphicsToolsUnityProject/Packages/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"dependencies": {
33
"com.microsoft.mrtk.graphicstools.unity": "file:../../com.microsoft.mrtk.graphicstools.unity",
4-
"com.unity.ide.visualstudio": "2.0.16",
4+
"com.unity.ide.visualstudio": "2.0.17",
55
"com.unity.ide.vscode": "1.2.5",
6-
"com.unity.inputsystem": "1.3.0",
7-
"com.unity.render-pipelines.universal": "10.9.0",
6+
"com.unity.inputsystem": "1.4.4",
7+
"com.unity.render-pipelines.universal": "12.1.8",
88
"com.unity.textmeshpro": "3.0.6",
99
"com.unity.ugui": "1.0.0",
1010
"com.unity.xr.management": "4.2.1",
11-
"com.unity.xr.oculus": "3.0.1",
11+
"com.unity.xr.oculus": "3.2.2",
1212
"com.unity.modules.ai": "1.0.0",
1313
"com.unity.modules.androidjni": "1.0.0",
1414
"com.unity.modules.animation": "1.0.0",

GraphicsToolsUnityProject/Packages/packages-lock.json

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
"source": "local",
77
"dependencies": {}
88
},
9+
"com.unity.burst": {
10+
"version": "1.8.2",
11+
"depth": 1,
12+
"source": "registry",
13+
"dependencies": {
14+
"com.unity.mathematics": "1.2.1"
15+
},
16+
"url": "https://packages.unity.com"
17+
},
918
"com.unity.ext.nunit": {
1019
"version": "1.0.6",
1120
"depth": 2,
@@ -14,7 +23,7 @@
1423
"url": "https://packages.unity.com"
1524
},
1625
"com.unity.ide.visualstudio": {
17-
"version": "2.0.16",
26+
"version": "2.0.17",
1827
"depth": 0,
1928
"source": "registry",
2029
"dependencies": {
@@ -30,7 +39,7 @@
3039
"url": "https://packages.unity.com"
3140
},
3241
"com.unity.inputsystem": {
33-
"version": "1.3.0",
42+
"version": "1.4.4",
3443
"depth": 0,
3544
"source": "registry",
3645
"dependencies": {
@@ -39,56 +48,56 @@
3948
"url": "https://packages.unity.com"
4049
},
4150
"com.unity.mathematics": {
42-
"version": "1.1.0",
51+
"version": "1.2.6",
4352
"depth": 1,
4453
"source": "registry",
4554
"dependencies": {},
4655
"url": "https://packages.unity.com"
4756
},
4857
"com.unity.render-pipelines.core": {
49-
"version": "10.9.0",
58+
"version": "12.1.8",
5059
"depth": 1,
51-
"source": "registry",
60+
"source": "builtin",
5261
"dependencies": {
5362
"com.unity.ugui": "1.0.0",
5463
"com.unity.modules.physics": "1.0.0",
5564
"com.unity.modules.jsonserialize": "1.0.0"
56-
},
57-
"url": "https://packages.unity.com"
65+
}
5866
},
5967
"com.unity.render-pipelines.universal": {
60-
"version": "10.9.0",
68+
"version": "12.1.8",
6169
"depth": 0,
62-
"source": "registry",
70+
"source": "builtin",
6371
"dependencies": {
64-
"com.unity.mathematics": "1.1.0",
65-
"com.unity.render-pipelines.core": "10.9.0",
66-
"com.unity.shadergraph": "10.9.0"
67-
},
68-
"url": "https://packages.unity.com"
72+
"com.unity.mathematics": "1.2.1",
73+
"com.unity.burst": "1.8.2",
74+
"com.unity.render-pipelines.core": "12.1.8",
75+
"com.unity.shadergraph": "12.1.8"
76+
}
6977
},
7078
"com.unity.searcher": {
71-
"version": "4.3.2",
79+
"version": "4.9.1",
7280
"depth": 2,
7381
"source": "registry",
7482
"dependencies": {},
7583
"url": "https://packages.unity.com"
7684
},
7785
"com.unity.shadergraph": {
78-
"version": "10.9.0",
86+
"version": "12.1.8",
7987
"depth": 1,
80-
"source": "registry",
88+
"source": "builtin",
8189
"dependencies": {
82-
"com.unity.render-pipelines.core": "10.9.0",
83-
"com.unity.searcher": "4.3.2"
84-
},
85-
"url": "https://packages.unity.com"
90+
"com.unity.render-pipelines.core": "12.1.8",
91+
"com.unity.searcher": "4.9.1"
92+
}
8693
},
8794
"com.unity.subsystemregistration": {
88-
"version": "1.0.6",
95+
"version": "1.1.0",
8996
"depth": 1,
9097
"source": "registry",
91-
"dependencies": {},
98+
"dependencies": {
99+
"com.unity.modules.subsystems": "1.0.0"
100+
},
92101
"url": "https://packages.unity.com"
93102
},
94103
"com.unity.test-framework": {
@@ -121,7 +130,7 @@
121130
}
122131
},
123132
"com.unity.xr.legacyinputhelpers": {
124-
"version": "2.1.9",
133+
"version": "2.1.10",
125134
"depth": 1,
126135
"source": "registry",
127136
"dependencies": {
@@ -144,7 +153,7 @@
144153
"url": "https://packages.unity.com"
145154
},
146155
"com.unity.xr.oculus": {
147-
"version": "3.0.1",
156+
"version": "3.2.2",
148157
"depth": 0,
149158
"source": "registry",
150159
"dependencies": {

GraphicsToolsUnityProject/ProjectSettings/EditorBuildSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ EditorBuildSettings:
77
m_Scenes: []
88
m_configObjects:
99
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 4b4581df4ed5834448df7c5632d43c61, type: 2}
10-
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: b026763fd30464f4288534a771e01ac1, type: 2}
10+
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 7cc0f3e84be35dc49a1ef5515d6f4ef4, type: 2}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.36f1
2-
m_EditorVersionWithRevision: 2020.3.36f1 (71f96b79b9f0)
1+
m_EditorVersion: 2021.3.16f1
2+
m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f)

GraphicsToolsUnityProject/ProjectSettings/URPProjectSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
m_LastMaterialVersion: 4
15+
m_LastMaterialVersion: 5

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MRTK Graphics Tools for Unity is a [Unity engine](https://unity.com/) package wi
1111
Graphics Tools is normally ingested as a Unity [package](https://docs.unity3d.com/Manual/Packages.html). To import Graphics Tools into your Unity project follow the below steps:
1212

1313
> [!NOTE]
14-
> The Graphics Tools package requires Unity 2020.x and above.
14+
> The Graphics Tools package requires Unity 2021.3 and above.
1515
1616
1. Open your Unity project and select `Window > Package Manager` from the file menu bar
1717

com.microsoft.mrtk.graphicstools.unity/Editor/Microsoft.MixedReality.GraphicsTools.Editor.asmdef

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"versionDefines": [
1818
{
1919
"name": "com.unity.render-pipelines.universal",
20-
"expression": "10.6.0",
20+
"expression": "12.1.0",
2121
"define": "GT_USE_URP"
2222
},
2323
{
@@ -32,7 +32,7 @@
3232
},
3333
{
3434
"name": "com.unity.inputsystem",
35-
"expression": "1.3.0",
35+
"expression": "1.4.0",
3636
"define": "GT_USE_INPUT_SYSTEM"
3737
}
3838
],

com.microsoft.mrtk.graphicstools.unity/Runtime/Experimental/Acrylic/Scripts/AcrylicBlurFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD
7979
{
8080
if (targetCamera == null || renderingData.cameraData.camera == targetCamera)
8181
{
82-
pass.Initialize(renderer.cameraColorTarget);
82+
pass.ConfigureInput(ScriptableRenderPassInput.Color);
8383
renderer.EnqueuePass(pass);
8484
rendered = true;
8585
}

com.microsoft.mrtk.graphicstools.unity/Runtime/Experimental/Acrylic/Scripts/AcrylicBlurRenderPass.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ namespace Microsoft.MixedReality.GraphicsTools
1515
class AcrylicBlurRenderPass : ScriptableRenderPass
1616
{
1717
public bool setMaterialTexture = false;
18-
private RenderTargetIdentifier cameraTarget;
1918
private string profilerLabel;
2019
private RenderTargetHandle target1;
2120
private RenderTargetHandle target2;
@@ -47,11 +46,6 @@ public AcrylicBlurRenderPass(string _profilerLabel, int _downSamplePasses, int _
4746
blurFilter = _blurFilter;
4847
}
4948

50-
public void Initialize(RenderTargetIdentifier _cameraTarget)
51-
{
52-
cameraTarget = _cameraTarget;
53-
}
54-
5549
private Vector4 info = Vector4.zero;
5650

5751
public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor)
@@ -100,22 +94,23 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData
10094
cmd.Clear();
10195

10296
var handle = providedTexture==null ? target1.Identifier() : providedTexture;
97+
var renderer = renderingData.cameraData.renderer;
10398

10499
cmd.SetGlobalVector("_AcrylicInfo", info);
105100

106101
if (downSample == 1)
107102
{
108-
cmd.Blit(cameraTarget, handle);
103+
cmd.Blit(renderer.cameraColorTarget, handle);
109104
}
110105
else if (downSample == 2)
111106
{
112107
cmd.SetGlobalVector("_AcrylicBlurOffset", Vector2.zero);
113-
LocalBlit(cmd, cameraTarget, handle, blurMaterial);
108+
LocalBlit(cmd, renderer.cameraColorTarget, handle, blurMaterial);
114109
}
115110
else
116111
{
117112
cmd.SetGlobalVector("_AcrylicBlurOffset", 0.25f * pixelSize);
118-
LocalBlit(cmd, cameraTarget, handle, blurMaterial);
113+
LocalBlit(cmd, renderer.cameraColorTarget, handle, blurMaterial);
119114
}
120115

121116
if (blur)

com.microsoft.mrtk.graphicstools.unity/Runtime/Experimental/Acrylic/Scripts/AcrylicLayerManager.cs

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,6 @@ public List<AcrylicLayer.Settings> Layers
181181
private bool ExecuteBeforeRenderAdded = false;
182182
private Coroutine updateRoutine = null;
183183

184-
// In older versions of the URP all intermediate texture behavior works like "Always."
185-
#if UNITY_2021_2_OR_NEWER
186-
private IntermediateTextureMode intermediateTextureMode = IntermediateTextureMode.Always;
187-
#endif
188-
189184
#endregion
190185

191186
#region Monobehavior methods
@@ -550,14 +545,6 @@ private void AddActiveLayers()
550545
{
551546
if (captureMethod != AcrylicMethod.CopyFramebuffer) return;
552547

553-
#if UNITY_2021_2_OR_NEWER
554-
if (rendererData.intermediateTextureMode != IntermediateTextureMode.Always)
555-
{
556-
intermediateTextureMode = rendererData.intermediateTextureMode;
557-
rendererData.intermediateTextureMode = IntermediateTextureMode.Always;
558-
}
559-
#endif
560-
561548
for (int i = 0; i < layerData.Count; i++)
562549
{
563550
if (layerData[i].activeCount > 0 && layerData[i].CaptureNextFrame)
@@ -571,14 +558,6 @@ private void RemoveAllLayers()
571558
{
572559
if (captureMethod != AcrylicMethod.CopyFramebuffer) return;
573560

574-
#if UNITY_2021_2_OR_NEWER
575-
if (intermediateTextureMode != IntermediateTextureMode.Always)
576-
{
577-
rendererData.intermediateTextureMode = intermediateTextureMode;
578-
intermediateTextureMode = IntermediateTextureMode.Always;
579-
}
580-
#endif
581-
582561
for (int i = 0; i < layerData.Count; i++)
583562
{
584563
layerData[i].RemoveLayerRendererFeatures(rendererData);
@@ -589,14 +568,6 @@ private void AddLayersAsPersistent()
589568
{
590569
if (captureMethod != AcrylicMethod.CopyFramebuffer) return;
591570

592-
#if UNITY_2021_2_OR_NEWER
593-
if (rendererData.intermediateTextureMode != IntermediateTextureMode.Always)
594-
{
595-
intermediateTextureMode = rendererData.intermediateTextureMode;
596-
rendererData.intermediateTextureMode = IntermediateTextureMode.Always;
597-
}
598-
#endif
599-
600571
for (int i = 0; i < layerData.Count; i++)
601572
{
602573
layerData[i].AddLayerRendererFeatures(rendererData, true);

0 commit comments

Comments
 (0)