Skip to content

Commit ffbc4ca

Browse files
Pauliusd01Pauliusd01
authored
FIX: Restore sample materials broken by URP upgrade, fix pink probuilder materials in rolling ball scene (#2451)
1 parent 025fd1a commit ffbc4ca

6 files changed

Lines changed: 2586 additions & 17898 deletions

File tree

‎ExternalSampleProjects/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ The `InputDeviceTester` needs:
1010
- Input System package (latest version)
1111
- Unity UI package (2.0.0 version at least)
1212
- Jetbrains Rider Editor / Visual Studio package for IDE tooling.
13+
- Requires the Universal Render Pipeline (URP) package to be installed for shader compilation.
1314

1415
The `TouchSamples` need:
1516

1617
- All the same as ´InputDeviceTester`
1718
- Cinemachine (2.10.3 maximum; 3.x has errors with the project but are easy to fix)
1819
- Probuilder (5.2.3 version maximum at the moment; 6.x has problems building for iOS and Android)
20+
- Requires the Universal Render Pipeline (URP) package to be installed for shader compilation.

‎ExternalSampleProjects/TouchSamples/Assets/Demo/Materials/Default.mat‎

Lines changed: 115 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,139 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-7783705734462688911
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: -1
316
--- !u!21 &2100000
417
Material:
5-
serializedVersion: 6
18+
serializedVersion: 8
619
m_ObjectHideFlags: 0
720
m_CorrespondingSourceObject: {fileID: 0}
821
m_PrefabInstance: {fileID: 0}
922
m_PrefabAsset: {fileID: 0}
1023
m_Name: Default
11-
m_Shader: {fileID: 4800000, guid: b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7, type: 3}
12-
m_ShaderKeywords:
24+
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords:
28+
- _SURFACE_TYPE_TRANSPARENT
29+
m_InvalidKeywords:
30+
- _FLIPBOOKBLENDING_OFF
31+
- _RECEIVE_SHADOWS_OFF
1332
m_LightmapFlags: 4
1433
m_EnableInstancingVariants: 0
1534
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: -1
17-
stringTagMap: {}
18-
disabledShaderPasses: []
35+
m_CustomRenderQueue: 3000
36+
stringTagMap:
37+
RenderType: Transparent
38+
disabledShaderPasses:
39+
- ALWAYS
40+
- SHADOWCASTER
41+
- DepthOnly
42+
m_LockedProperties:
1943
m_SavedProperties:
2044
serializedVersion: 3
2145
m_TexEnvs:
46+
- _BaseMap:
47+
m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _BumpMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _DetailAlbedoMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _DetailMask:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
- _DetailNormalMap:
63+
m_Texture: {fileID: 0}
64+
m_Scale: {x: 1, y: 1}
65+
m_Offset: {x: 0, y: 0}
66+
- _EmissionMap:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
2270
- _MainTex:
71+
m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
72+
m_Scale: {x: 1, y: 1}
73+
m_Offset: {x: 0, y: 0}
74+
- _MetallicGlossMap:
75+
m_Texture: {fileID: 0}
76+
m_Scale: {x: 1, y: 1}
77+
m_Offset: {x: 0, y: 0}
78+
- _OcclusionMap:
79+
m_Texture: {fileID: 0}
80+
m_Scale: {x: 1, y: 1}
81+
m_Offset: {x: 0, y: 0}
82+
- _ParallaxMap:
2383
m_Texture: {fileID: 0}
2484
m_Scale: {x: 1, y: 1}
2585
m_Offset: {x: 0, y: 0}
86+
m_Ints: []
2687
m_Floats:
88+
- _AlphaClip: 0
89+
- _AlphaToMask: 0
90+
- _BaseColorMode: 0
91+
- _Blend: 0
92+
- _BlendOp: 0
93+
- _BumpScale: 1
94+
- _CameraFadingEnabled: 0
95+
- _CameraFarFadeDistance: 2
96+
- _CameraNearFadeDistance: 1
97+
- _ColorMode: 0
98+
- _Cull: 2
99+
- _Cutoff: 0.5
100+
- _DetailNormalMapScale: 1
101+
- _DistortionBlend: 0.5
102+
- _DistortionEnabled: 0
103+
- _DistortionStrength: 1
104+
- _DistortionStrengthScaled: 0
105+
- _DstBlend: 10
106+
- _DstBlendAlpha: 10
107+
- _EmissionEnabled: 0
108+
- _EnvironmentReflections: 1
109+
- _FlipbookBlending: 0
110+
- _FlipbookMode: 0
111+
- _GlossMapScale: 1
27112
- _Glossiness: 0.5
113+
- _InvFade: 1
114+
- _LightingEnabled: 0
28115
- _Metallic: 0
116+
- _Mode: 2
117+
- _OcclusionStrength: 1
118+
- _Parallax: 0.02
119+
- _QueueOffset: 0
120+
- _SmoothnessTextureChannel: 0
121+
- _SoftParticlesEnabled: 0
122+
- _SoftParticlesFarFadeDistance: 1
123+
- _SoftParticlesNearFadeDistance: 0
124+
- _SpecularHighlights: 1
125+
- _SrcBlend: 5
126+
- _SrcBlendAlpha: 1
127+
- _Surface: 1
128+
- _UVSec: 0
129+
- _ZWrite: 0
29130
m_Colors:
131+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
132+
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
133+
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
30134
- _Color: {r: 1, g: 1, b: 1, a: 1}
135+
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
136+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
137+
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
138+
m_BuildTextureStacks: []
139+
m_AllowLocking: 1

‎ExternalSampleProjects/TouchSamples/Assets/Demo/Materials/Rolling/Checkpoint.mat‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: Checkpoint
11+
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _SURFACE_TYPE_TRANSPARENT
16+
m_InvalidKeywords:
17+
- _FLIPBOOKBLENDING_OFF
18+
- _RECEIVE_SHADOWS_OFF
19+
m_LightmapFlags: 4
20+
m_EnableInstancingVariants: 0
21+
m_DoubleSidedGI: 0
22+
m_CustomRenderQueue: 3000
23+
stringTagMap:
24+
RenderType: Transparent
25+
disabledShaderPasses:
26+
- ALWAYS
27+
- SHADOWCASTER
28+
- DepthOnly
29+
m_LockedProperties:
30+
m_SavedProperties:
31+
serializedVersion: 3
32+
m_TexEnvs:
33+
- _BaseMap:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _BumpMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _DetailAlbedoMap:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _DetailMask:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _DetailNormalMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _EmissionMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _MainTex:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _MetallicGlossMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _OcclusionMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- _ParallaxMap:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
m_Ints: []
74+
m_Floats:
75+
- _AlphaClip: 0
76+
- _AlphaToMask: 0
77+
- _BaseColorMode: 0
78+
- _Blend: 0
79+
- _BlendOp: 0
80+
- _BumpScale: 1
81+
- _CameraFadingEnabled: 0
82+
- _CameraFarFadeDistance: 2
83+
- _CameraNearFadeDistance: 1
84+
- _ColorMode: 0
85+
- _Cull: 2
86+
- _Cutoff: 0.5
87+
- _DetailNormalMapScale: 1
88+
- _DistortionBlend: 0.5
89+
- _DistortionEnabled: 0
90+
- _DistortionStrength: 1
91+
- _DistortionStrengthScaled: 0
92+
- _DstBlend: 10
93+
- _DstBlendAlpha: 10
94+
- _EmissionEnabled: 0
95+
- _EnvironmentReflections: 1
96+
- _FlipbookBlending: 0
97+
- _FlipbookMode: 0
98+
- _GlossMapScale: 1
99+
- _Glossiness: 0.5
100+
- _InvFade: 1
101+
- _LightingEnabled: 0
102+
- _Metallic: 0
103+
- _Mode: 2
104+
- _OcclusionStrength: 1
105+
- _Parallax: 0.02
106+
- _QueueOffset: 0
107+
- _SmoothnessTextureChannel: 0
108+
- _SoftParticlesEnabled: 0
109+
- _SoftParticlesFarFadeDistance: 1
110+
- _SoftParticlesNearFadeDistance: 0
111+
- _SpecularHighlights: 1
112+
- _SrcBlend: 5
113+
- _SrcBlendAlpha: 1
114+
- _Surface: 1
115+
- _UVSec: 0
116+
- _ZWrite: 0
117+
m_Colors:
118+
- _BaseColor: {r: 0, g: 0.85, b: 1, a: 0.35}
119+
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
120+
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
121+
- _Color: {r: 0, g: 0.85, b: 1, a: 0.35}
122+
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
123+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
124+
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
125+
m_BuildTextureStacks: []
126+
m_AllowLocking: 1
127+
--- !u!114 &7002013058650428529
128+
MonoBehaviour:
129+
m_ObjectHideFlags: 11
130+
m_CorrespondingSourceObject: {fileID: 0}
131+
m_PrefabInstance: {fileID: 0}
132+
m_PrefabAsset: {fileID: 0}
133+
m_GameObject: {fileID: 0}
134+
m_Enabled: 1
135+
m_EditorHideFlags: 0
136+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
137+
m_Name:
138+
m_EditorClassIdentifier:
139+
version: -1

‎ExternalSampleProjects/TouchSamples/Assets/Demo/Materials/Rolling/Checkpoint.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)