Skip to content

Commit a7c9414

Browse files
committed
Updated to Unity 2019.3.6f1 & bug fix for loading shader after build
1 parent a5bb004 commit a7c9414

14 files changed

+481
-423
lines changed

UnitySample/Assembly-CSharp-Editor.csproj

Lines changed: 228 additions & 213 deletions
Large diffs are not rendered by default.

UnitySample/Assembly-CSharp.csproj

Lines changed: 220 additions & 199 deletions
Large diffs are not rendered by default.

UnitySample/Assets/UnityCam/Scripts/OffscreenProcessor.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ public Shader ProcessingShader
4242
}
4343
}
4444

45-
public OffscreenProcessor()
45+
public OffscreenProcessor(string shader= "Diffuse")
4646
{
47-
_ProcessingMaterial = new Material (Shader.Find("Diffuse"));
47+
Shader s = Shader.Find(shader);
48+
_ProcessingMaterial = new Material (s);
4849
TargetFormat = RenderTextureFormat.Default;
4950
}
5051
void _Setup(Texture InputTexture,int downSample)

UnitySample/Assets/UnityCam/Scripts/UnityCam.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ void Start() {
3636
//Init UnityWebCamera plugin
3737
_instance = CreateTextureWrapper ();
3838

39-
_BlitterProcessor = new OffscreenProcessor ();
40-
_BlitterProcessor.ShaderName = "UnityCam/Image/Blitter";
39+
_BlitterProcessor = new OffscreenProcessor ("UnityCam/Image/Blitter");
40+
4141

4242
_wrapper = new TextureWrapper ();
4343

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2+
=== Tue Mar 24 12:26:04 2020
3+
4+
Packages were changed.
5+
Update Mode: updateDependencies
6+
7+
The following packages were added:
8+
com.unity.2d.sprite@1.0.0
9+
com.unity.2d.tilemap@1.0.0
10+
com.unity.multiplayer-hlapi@1.0.4
11+
com.unity.xr.legacyinputhelpers@1.3.11
12+
The following packages were updated:
13+
com.unity.ide.rider from version 1.1.0 to 1.1.4
14+
com.unity.ide.vscode from version 1.1.2 to 1.1.4
15+
com.unity.test-framework from version 1.0.13 to 1.1.11
16+
com.unity.timeline from version 1.1.0 to 1.2.6
17+
The following packages were removed:
18+
com.unity.package-manager-ui@2.2.0

UnitySample/Packages/manifest.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"dependencies": {
3+
"com.unity.2d.sprite": "1.0.0",
4+
"com.unity.2d.tilemap": "1.0.0",
35
"com.unity.collab-proxy": "1.2.16",
46
"com.unity.ext.nunit": "1.0.0",
5-
"com.unity.ide.rider": "1.1.0",
6-
"com.unity.ide.vscode": "1.1.2",
7-
"com.unity.package-manager-ui": "2.2.0",
8-
"com.unity.test-framework": "1.0.13",
7+
"com.unity.ide.rider": "1.1.4",
8+
"com.unity.ide.vscode": "1.1.4",
9+
"com.unity.multiplayer-hlapi": "1.0.4",
10+
"com.unity.test-framework": "1.1.11",
911
"com.unity.textmeshpro": "2.0.1",
10-
"com.unity.timeline": "1.1.0",
12+
"com.unity.timeline": "1.2.6",
1113
"com.unity.ugui": "1.0.0",
14+
"com.unity.xr.legacyinputhelpers": "1.3.11",
1215
"com.unity.modules.ai": "1.0.0",
1316
"com.unity.modules.androidjni": "1.0.0",
1417
"com.unity.modules.animation": "1.0.0",
68 Bytes
Binary file not shown.
100 Bytes
Binary file not shown.
1.07 KB
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)