Skip to content

Commit 1edc361

Browse files
epernodepernod
authored
Various cleaning for v25.06. Updat esome material to URP and update all tests logs due to changes in SOFA symetry (#198)
* Remove ShowRoom * update module ref * forgot some materials * water material * update tests reference due to the change of symetry
1 parent 0fa668a commit 1edc361

58 files changed

Lines changed: 1689 additions & 11329 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Core/Resources/Materials/Water/Liquid.mat renamed to Core/Resources/Materials/Liquid.mat

Lines changed: 75 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,37 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Liquid
11-
m_Shader: {fileID: 208, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords: _ALPHABLEND_ON _COLOROVERLAY_ON
11+
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _COLOROVERLAY_ON
16+
- _SURFACE_TYPE_TRANSPARENT
17+
m_InvalidKeywords:
18+
- _FLIPBOOKBLENDING_OFF
1319
m_LightmapFlags: 0
1420
m_EnableInstancingVariants: 0
1521
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: -1
17-
stringTagMap: {}
18-
disabledShaderPasses: []
22+
m_CustomRenderQueue: 3000
23+
stringTagMap:
24+
RenderType: Transparent
25+
disabledShaderPasses:
26+
- DepthOnly
27+
- SHADOWCASTER
28+
m_LockedProperties:
1929
m_SavedProperties:
2030
serializedVersion: 3
2131
m_TexEnvs:
32+
- _BaseMap:
33+
m_Texture: {fileID: 2800000, guid: 35676953ba208c44ea42d3e103277d66, type: 3}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
2236
- _BumpMap:
2337
m_Texture: {fileID: 0}
2438
m_Scale: {x: 1, y: 1}
@@ -40,8 +54,8 @@ Material:
4054
m_Scale: {x: 1, y: 1}
4155
m_Offset: {x: 0, y: 0}
4256
- _MainTex:
43-
m_Texture: {fileID: 2800000, guid: 35676953ba208c44ea42d3e103277d66, type: 3}
44-
m_Scale: {x: 0.8, y: 0.8}
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
4559
m_Offset: {x: 0, y: 0}
4660
- _MetallicGlossMap:
4761
m_Texture: {fileID: 0}
@@ -55,22 +69,50 @@ Material:
5569
m_Texture: {fileID: 0}
5670
m_Scale: {x: 1, y: 1}
5771
m_Offset: {x: 0, y: 0}
72+
- _SpecGlossMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- unity_Lightmaps:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- unity_LightmapsInd:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_ShadowMasks:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
m_Ints: []
5889
m_Floats:
90+
- _AddPrecomputedVelocity: 0
91+
- _AlphaClip: 0
92+
- _AlphaToMask: 0
93+
- _Blend: 0
94+
- _BlendModePreserveSpecular: 1
5995
- _BlendOp: 0
6096
- _BumpScale: 1
6197
- _CameraFadingEnabled: 0
6298
- _CameraFarFadeDistance: 2
6399
- _CameraNearFadeDistance: 1
100+
- _ClearCoatMask: 0
101+
- _ClearCoatSmoothness: 0
64102
- _ColorMode: 3
65103
- _Cull: 2
66104
- _Cutoff: 0.5
105+
- _DetailAlbedoMapScale: 1
67106
- _DetailNormalMapScale: 1
68107
- _DistortionBlend: 0.5
69108
- _DistortionEnabled: 0
70109
- _DistortionStrength: 1
71110
- _DistortionStrengthScaled: 0
72111
- _DstBlend: 10
112+
- _DstBlendAlpha: 10
73113
- _EmissionEnabled: 0
114+
- _EnvironmentReflections: 1
115+
- _FlipbookBlending: 0
74116
- _FlipbookMode: 0
75117
- _GlossMapScale: 1
76118
- _Glossiness: 0.5
@@ -81,19 +123,43 @@ Material:
81123
- _Mode: 2
82124
- _OcclusionStrength: 1
83125
- _Parallax: 0.02
126+
- _QueueOffset: 0
127+
- _ReceiveShadows: 1
128+
- _Smoothness: 0.5
84129
- _SmoothnessTextureChannel: 0
85130
- _SoftParticlesEnabled: 0
86131
- _SoftParticlesFarFadeDistance: 1
87132
- _SoftParticlesNearFadeDistance: 0
88133
- _SpecularHighlights: 1
89134
- _SrcBlend: 5
135+
- _SrcBlendAlpha: 1
136+
- _Surface: 1
90137
- _UVSec: 0
138+
- _WorkflowMode: 1
91139
- _ZWrite: 0
92140
m_Colors:
141+
- _BaseColor: {r: 0, g: 0.15451717, b: 1, a: 1}
142+
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
93143
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
94-
- _Color: {r: 0.09972411, g: 0.4413715, b: 0.7830189, a: 0.6}
144+
- _Color: {r: 0, g: 0.15451714, b: 1, a: 1}
95145
- _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0}
96146
- _EmisColor: {r: 0, g: 0.10923533, b: 0.8301887, a: 1}
97147
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
98148
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
149+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
99150
- _TintColor: {r: 0.10840159, g: 0.18169284, b: 0.7924528, a: 1}
151+
m_BuildTextureStacks: []
152+
m_AllowLocking: 1
153+
--- !u!114 &8721354310531309783
154+
MonoBehaviour:
155+
m_ObjectHideFlags: 11
156+
m_CorrespondingSourceObject: {fileID: 0}
157+
m_PrefabInstance: {fileID: 0}
158+
m_PrefabAsset: {fileID: 0}
159+
m_GameObject: {fileID: 0}
160+
m_Enabled: 1
161+
m_EditorHideFlags: 0
162+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
163+
m_Name:
164+
m_EditorClassIdentifier:
165+
version: 10

Core/Resources/Materials/Water/Liquid.mat.meta renamed to Core/Resources/Materials/Liquid.mat.meta

File renamed without changes.

‎Core/Resources/Materials/Tools/Metal_sphere.mat‎

Lines changed: 71 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,48 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-4890126215533050649
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: 10
316
--- !u!21 &2100000
417
Material:
5-
serializedVersion: 6
18+
serializedVersion: 8
619
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
923
m_Name: Metal_sphere
10-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords: _EMISSION
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords:
28+
- _EMISSION
29+
m_InvalidKeywords: []
1230
m_LightmapFlags: 1
1331
m_EnableInstancingVariants: 0
1432
m_DoubleSidedGI: 0
1533
m_CustomRenderQueue: -1
16-
stringTagMap: {}
17-
disabledShaderPasses: []
34+
stringTagMap:
35+
RenderType: Opaque
36+
disabledShaderPasses:
37+
- MOTIONVECTORS
38+
m_LockedProperties:
1839
m_SavedProperties:
1940
serializedVersion: 3
2041
m_TexEnvs:
42+
- _BaseMap:
43+
m_Texture: {fileID: 2800000, guid: c0daaf08a7899704aae2a5f42a7f9f2e, type: 3}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
2146
- _BumpMap:
2247
m_Texture: {fileID: 2800000, guid: d318af7ab68278a42a901d210af629bb, type: 3}
2348
m_Scale: {x: 1, y: 1}
@@ -39,7 +64,7 @@ Material:
3964
m_Scale: {x: 1, y: 1}
4065
m_Offset: {x: 0, y: 0}
4166
- _MainTex:
42-
m_Texture: {fileID: 2800000, guid: c0daaf08a7899704aae2a5f42a7f9f2e, type: 3}
67+
m_Texture: {fileID: 0}
4368
m_Scale: {x: 1, y: 1}
4469
m_Offset: {x: 0, y: 0}
4570
- _MetallicGlossMap:
@@ -54,23 +79,61 @@ Material:
5479
m_Texture: {fileID: 2800000, guid: 6c0b1e8f0c868474eadb2c5d0996100b, type: 3}
5580
m_Scale: {x: 1, y: 1}
5681
m_Offset: {x: 0, y: 0}
82+
- _SpecGlossMap:
83+
m_Texture: {fileID: 0}
84+
m_Scale: {x: 1, y: 1}
85+
m_Offset: {x: 0, y: 0}
86+
- unity_Lightmaps:
87+
m_Texture: {fileID: 0}
88+
m_Scale: {x: 1, y: 1}
89+
m_Offset: {x: 0, y: 0}
90+
- unity_LightmapsInd:
91+
m_Texture: {fileID: 0}
92+
m_Scale: {x: 1, y: 1}
93+
m_Offset: {x: 0, y: 0}
94+
- unity_ShadowMasks:
95+
m_Texture: {fileID: 0}
96+
m_Scale: {x: 1, y: 1}
97+
m_Offset: {x: 0, y: 0}
98+
m_Ints: []
5799
m_Floats:
100+
- _AddPrecomputedVelocity: 0
101+
- _AlphaClip: 0
102+
- _AlphaToMask: 0
103+
- _Blend: 0
104+
- _BlendModePreserveSpecular: 1
58105
- _BumpScale: 0.49
106+
- _ClearCoatMask: 0
107+
- _ClearCoatSmoothness: 0
108+
- _Cull: 2
59109
- _Cutoff: 0.5
110+
- _DetailAlbedoMapScale: 1
60111
- _DetailNormalMapScale: 1
61112
- _DstBlend: 0
113+
- _DstBlendAlpha: 0
114+
- _EnvironmentReflections: 1
62115
- _GlossMapScale: 0.679
63116
- _Glossiness: 0.5
64117
- _GlossyReflections: 1
65118
- _Metallic: 0
66119
- _Mode: 0
67120
- _OcclusionStrength: 1
68121
- _Parallax: 0.0172
122+
- _QueueOffset: 0
123+
- _ReceiveShadows: 1
124+
- _Smoothness: 0.5
69125
- _SmoothnessTextureChannel: 0
70126
- _SpecularHighlights: 1
71127
- _SrcBlend: 1
128+
- _SrcBlendAlpha: 1
129+
- _Surface: 0
72130
- _UVSec: 0
131+
- _WorkflowMode: 1
73132
- _ZWrite: 1
74133
m_Colors:
134+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
75135
- _Color: {r: 1, g: 1, b: 1, a: 1}
76136
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
137+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
138+
m_BuildTextureStacks: []
139+
m_AllowLocking: 1

0 commit comments

Comments
 (0)