Skip to content

Commit 3f8a59e

Browse files
committed
prefabs: Fix name for display materials.
1 parent 1f2d5f7 commit 3f8a59e

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

Runtime/MaterialConverter.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ namespace VisualPinball.Unity.Urp
2929
{
3030
public class MaterialConverter : IMaterialConverter
3131
{
32-
public Material DotMatrixDisplay => UnityEngine.Resources.Load<Material>("Materials/DotMatrixDisplay");
33-
public Material SegmentDisplay => UnityEngine.Resources.Load<Material>("Materials/SegmentDisplay");
32+
public Material DotMatrixDisplay => Resources.Load<Material>("Materials/Dot Matrix Display (SRP)");
33+
public Material SegmentDisplay => Resources.Load<Material>("Materials/Segment Display (SRP)");
3434

3535
public int NormalMapProperty => NormalMap;
3636

@@ -59,11 +59,11 @@ public static Material GetDefaultMaterial(BlendMode blendMode)
5959
switch (blendMode)
6060
{
6161
case BlendMode.Opaque:
62-
return UnityEngine.Resources.Load<Material>("Materials/TableOpaque");
62+
return Resources.Load<Material>("Materials/TableOpaque");
6363
case BlendMode.Cutout:
64-
return UnityEngine.Resources.Load<Material>("Materials/TableCutout");
64+
return Resources.Load<Material>("Materials/TableCutout");
6565
case BlendMode.Translucent:
66-
return UnityEngine.Resources.Load<Material>("Materials/TableTranslucent");
66+
return Resources.Load<Material>("Materials/TableTranslucent");
6767
default:
6868
throw new ArgumentOutOfRangeException("Undefined blend mode " + blendMode);
6969
}

Runtime/PrefabProvider.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ public class PrefabProvider : IPrefabProvider
2424
{
2525
public GameObject CreateBumper()
2626
{
27-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Bumper");
27+
return Resources.Load<GameObject>("Prefabs/Bumper");
2828
}
2929

3030
public GameObject CreateGate(int type)
3131
{
3232
switch (type) {
3333
case GateType.GateLongPlate:
34-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Gate - Long Plate");
34+
return Resources.Load<GameObject>("Prefabs/Gate - Long Plate");
3535
case GateType.GatePlate:
36-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Gate - Plate");
36+
return Resources.Load<GameObject>("Prefabs/Gate - Plate");
3737
case GateType.GateWireRectangle:
38-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Gate - Wire Rectangle");
38+
return Resources.Load<GameObject>("Prefabs/Gate - Wire Rectangle");
3939
case GateType.GateWireW:
40-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Gate - Wire W");
40+
return Resources.Load<GameObject>("Prefabs/Gate - Wire W");
4141
default:
4242
throw new ArgumentException(nameof(type), $"Unknown gate type {type}.");
4343
}
@@ -47,50 +47,50 @@ public GameObject CreateKicker(int type)
4747
{
4848
switch (type) {
4949
case KickerType.KickerCup:
50-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Kicker - Cup");
50+
return Resources.Load<GameObject>("Prefabs/Kicker - Cup");
5151
case KickerType.KickerCup2:
52-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Kicker - Cup 2");
52+
return Resources.Load<GameObject>("Prefabs/Kicker - Cup 2");
5353
case KickerType.KickerGottlieb:
54-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Kicker - Gottlieb");
54+
return Resources.Load<GameObject>("Prefabs/Kicker - Gottlieb");
5555
case KickerType.KickerHole:
56-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Kicker - Hole");
56+
return Resources.Load<GameObject>("Prefabs/Kicker - Hole");
5757
case KickerType.KickerHoleSimple:
58-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Kicker - Simple Hole");
58+
return Resources.Load<GameObject>("Prefabs/Kicker - Simple Hole");
5959
case KickerType.KickerWilliams:
60-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Kicker - Williams");
60+
return Resources.Load<GameObject>("Prefabs/Kicker - Williams");
6161
case KickerType.KickerInvisible:
62-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Kicker - Invisible");
62+
return Resources.Load<GameObject>("Prefabs/Kicker - Invisible");
6363
default:
6464
throw new ArgumentException(nameof(type), $"Unknown kicker type {type}.");
6565
}
6666
}
6767

6868
public GameObject CreateLight()
6969
{
70-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Light");
70+
return Resources.Load<GameObject>("Prefabs/Light");
7171
}
7272

7373
public GameObject CreateSpinner()
7474
{
75-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Spinner");
75+
return Resources.Load<GameObject>("Prefabs/Spinner");
7676
}
7777

7878
public GameObject CreateHitTarget(int type)
7979
{
8080
switch (type)
8181
{
8282
case TargetType.HitFatTargetRectangle:
83-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Hit Target - Rectangle Fat");
83+
return Resources.Load<GameObject>("Prefabs/Hit Target - Rectangle Fat");
8484
case TargetType.HitFatTargetSlim:
85-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Hit Target - Rectangle Fat Narrow");
85+
return Resources.Load<GameObject>("Prefabs/Hit Target - Rectangle Fat Narrow");
8686
case TargetType.HitFatTargetSquare:
87-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Hit Target - Square Fat");
87+
return Resources.Load<GameObject>("Prefabs/Hit Target - Square Fat");
8888
case TargetType.HitTargetRectangle:
89-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Hit Target - Rectangle");
89+
return Resources.Load<GameObject>("Prefabs/Hit Target - Rectangle");
9090
case TargetType.HitTargetRound:
91-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Hit Target - Round");
91+
return Resources.Load<GameObject>("Prefabs/Hit Target - Round");
9292
case TargetType.HitTargetSlim:
93-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Hit Target - Narrow");
93+
return Resources.Load<GameObject>("Prefabs/Hit Target - Narrow");
9494
default:
9595
throw new ArgumentException(nameof(type), $"Unknown target type {type}.");
9696
}
@@ -101,11 +101,11 @@ public GameObject CreateDropTarget(int type)
101101
switch (type)
102102
{
103103
case TargetType.DropTargetBeveled:
104-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Drop Target - Beveled");
104+
return Resources.Load<GameObject>("Prefabs/Drop Target - Beveled");
105105
case TargetType.DropTargetFlatSimple:
106-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Drop Target - Simple Flat");
106+
return Resources.Load<GameObject>("Prefabs/Drop Target - Simple Flat");
107107
case TargetType.DropTargetSimple:
108-
return UnityEngine.Resources.Load<GameObject>("Prefabs/Drop Target - Simple");
108+
return Resources.Load<GameObject>("Prefabs/Drop Target - Simple");
109109
default:
110110
throw new ArgumentException(nameof(type), $"Unknown target type {type}.");
111111
}

0 commit comments

Comments
 (0)