Skip to content

Commit 0fa668a

Browse files
epernodepernod
authored
[Endoscopy] Convert materials from built-in to URP and update them for Unity6. Update linked scenes (#197)
* [Endoscopy] Update all material and scenes for Unity6 URP * [Endoscopy] some cleaning and update double side material
1 parent 2e04af2 commit 0fa668a

52 files changed

Lines changed: 12467 additions & 15415 deletions

Some content is hidden

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

‎Scenes/Demos/Endoscopy/BeamAdapter/BeamDemo_01_Texture.unity‎

Lines changed: 657 additions & 672 deletions
Large diffs are not rendered by default.

‎Scenes/Demos/Endoscopy/BeamAdapter/BeamDemo_02_KV1.unity‎

Lines changed: 1319 additions & 1157 deletions
Large diffs are not rendered by default.

‎Scenes/Demos/Endoscopy/BeamAdapter/BeamDemo_03_Ureteroscopy.unity‎

Lines changed: 972 additions & 858 deletions
Large diffs are not rendered by default.

‎Scenes/Demos/Endoscopy/BeamAdapter/BeamDemo_04_3instruments.unity‎

Lines changed: 2204 additions & 2058 deletions
Large diffs are not rendered by default.

‎Scenes/Demos/Endoscopy/BeamAdapter/Material/BeamMaterial.mat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ Material:
5050
m_Scale: {x: 2, y: 4}
5151
m_Offset: {x: 0, y: 0}
5252
- _MainTex:
53-
m_Texture: {fileID: 0}
54-
m_Scale: {x: 1, y: 1}
53+
m_Texture: {fileID: 2800000, guid: 652f19155cea7b74d95af22d2a1eaabc, type: 3}
54+
m_Scale: {x: 2, y: 4}
5555
m_Offset: {x: 0, y: 0}
5656
- _MetallicGlossMap:
5757
m_Texture: {fileID: 0}

‎Scenes/Demos/Endoscopy/BeamAdapter/Material/Beam_doubleSide.mat‎

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-6150198116498557749
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:
518
serializedVersion: 8
@@ -8,24 +21,30 @@ Material:
821
m_PrefabInstance: {fileID: 0}
922
m_PrefabAsset: {fileID: 0}
1023
m_Name: Beam_doubleSide
11-
m_Shader: {fileID: 4800000, guid: b965f82ca09623c41afded17f5d27c27, type: 3}
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
1225
m_Parent: {fileID: 0}
1326
m_ModifiedSerializedProperties: 0
14-
m_ValidKeywords: []
15-
m_InvalidKeywords:
27+
m_ValidKeywords:
1628
- _NORMALMAP
29+
m_InvalidKeywords: []
1730
m_LightmapFlags: 4
1831
m_EnableInstancingVariants: 0
19-
m_DoubleSidedGI: 0
32+
m_DoubleSidedGI: 1
2033
m_CustomRenderQueue: -1
21-
stringTagMap: {}
22-
disabledShaderPasses: []
34+
stringTagMap:
35+
RenderType: Opaque
36+
disabledShaderPasses:
37+
- MOTIONVECTORS
2338
m_LockedProperties:
2439
m_SavedProperties:
2540
serializedVersion: 3
2641
m_TexEnvs:
42+
- _BaseMap:
43+
m_Texture: {fileID: 2800000, guid: 652f19155cea7b74d95af22d2a1eaabc, type: 3}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
2746
- _BumpMap:
28-
m_Texture: {fileID: 0}
47+
m_Texture: {fileID: 2800000, guid: 43093b9651ecee2489a57f77b51f3234, type: 3}
2948
m_Scale: {x: 5, y: 5}
3049
m_Offset: {x: 0, y: 0}
3150
- _DetailAlbedoMap:
@@ -45,8 +64,8 @@ Material:
4564
m_Scale: {x: 1, y: 1}
4665
m_Offset: {x: 0, y: 0}
4766
- _MainTex:
48-
m_Texture: {fileID: 0}
49-
m_Scale: {x: 5, y: 5}
67+
m_Texture: {fileID: 2800000, guid: 652f19155cea7b74d95af22d2a1eaabc, type: 3}
68+
m_Scale: {x: 1, y: 1}
5069
m_Offset: {x: 0, y: 0}
5170
- _MetallicGlossMap:
5271
m_Texture: {fileID: 0}
@@ -60,12 +79,39 @@ Material:
6079
m_Texture: {fileID: 0}
6180
m_Scale: {x: 1, y: 1}
6281
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}
6398
m_Ints: []
6499
m_Floats:
100+
- _AddPrecomputedVelocity: 0
101+
- _AlphaClip: 0
102+
- _AlphaToMask: 0
103+
- _Blend: 0
104+
- _BlendModePreserveSpecular: 1
65105
- _BumpScale: 1
106+
- _ClearCoatMask: 0
107+
- _ClearCoatSmoothness: 0
108+
- _Cull: 0
66109
- _Cutoff: 0.5
110+
- _DetailAlbedoMapScale: 1
67111
- _DetailNormalMapScale: 1
68112
- _DstBlend: 0
113+
- _DstBlendAlpha: 0
114+
- _EnvironmentReflections: 1
69115
- _GlossMapScale: 1
70116
- _Glossiness: 0.616
71117
- _GlossyReflections: 1
@@ -74,14 +120,22 @@ Material:
74120
- _NormalIntensity: 1.46
75121
- _OcclusionStrength: 1
76122
- _Parallax: 0.02
123+
- _QueueOffset: 0
124+
- _ReceiveShadows: 1
125+
- _Smoothness: 0.5
77126
- _SmoothnessTextureChannel: 0
78127
- _SpecularHighlights: 1
79128
- _SpecularIntensity: 0.35
80129
- _SrcBlend: 1
130+
- _SrcBlendAlpha: 1
131+
- _Surface: 0
81132
- _UVSec: 0
133+
- _WorkflowMode: 1
82134
- _ZWrite: 1
83135
m_Colors:
136+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
84137
- _Color: {r: 1, g: 1, b: 1, a: 1}
85138
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
86139
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
87140
m_BuildTextureStacks: []
141+
m_AllowLocking: 1

‎Scenes/Demos/Endoscopy/BeamAdapter/Material/Vessels_doubleSide.mat‎

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,28 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Vessels_doubleSide
11-
m_Shader: {fileID: 4800000, guid: b965f82ca09623c41afded17f5d27c27, type: 3}
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
14-
m_ValidKeywords: []
15-
m_InvalidKeywords:
14+
m_ValidKeywords:
1615
- _NORMALMAP
16+
m_InvalidKeywords: []
1717
m_LightmapFlags: 4
1818
m_EnableInstancingVariants: 0
19-
m_DoubleSidedGI: 0
19+
m_DoubleSidedGI: 1
2020
m_CustomRenderQueue: -1
21-
stringTagMap: {}
22-
disabledShaderPasses: []
21+
stringTagMap:
22+
RenderType: Opaque
23+
disabledShaderPasses:
24+
- MOTIONVECTORS
2325
m_LockedProperties:
2426
m_SavedProperties:
2527
serializedVersion: 3
2628
m_TexEnvs:
29+
- _BaseMap:
30+
m_Texture: {fileID: 2800000, guid: bdb829b0ffdbd3547a0a42e9378326c5, type: 3}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
2733
- _BumpMap:
2834
m_Texture: {fileID: 2800000, guid: 7faa4efe82cf66449ba53ac4d2d95a6c, type: 3}
2935
m_Scale: {x: 5, y: 5}
@@ -46,7 +52,7 @@ Material:
4652
m_Offset: {x: 0, y: 0}
4753
- _MainTex:
4854
m_Texture: {fileID: 2800000, guid: bdb829b0ffdbd3547a0a42e9378326c5, type: 3}
49-
m_Scale: {x: 5, y: 5}
55+
m_Scale: {x: 1, y: 1}
5056
m_Offset: {x: 0, y: 0}
5157
- _MetallicGlossMap:
5258
m_Texture: {fileID: 0}
@@ -60,28 +66,76 @@ Material:
6066
m_Texture: {fileID: 0}
6167
m_Scale: {x: 1, y: 1}
6268
m_Offset: {x: 0, y: 0}
69+
- _SpecGlossMap:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
- unity_Lightmaps:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
77+
- unity_LightmapsInd:
78+
m_Texture: {fileID: 0}
79+
m_Scale: {x: 1, y: 1}
80+
m_Offset: {x: 0, y: 0}
81+
- unity_ShadowMasks:
82+
m_Texture: {fileID: 0}
83+
m_Scale: {x: 1, y: 1}
84+
m_Offset: {x: 0, y: 0}
6385
m_Ints: []
6486
m_Floats:
87+
- _AddPrecomputedVelocity: 0
88+
- _AlphaClip: 0
89+
- _AlphaToMask: 0
90+
- _Blend: 0
91+
- _BlendModePreserveSpecular: 1
6592
- _BumpScale: 1
93+
- _ClearCoatMask: 0
94+
- _ClearCoatSmoothness: 0
95+
- _Cull: 0
6696
- _Cutoff: 0.5
97+
- _DetailAlbedoMapScale: 1
6798
- _DetailNormalMapScale: 1
6899
- _DstBlend: 0
100+
- _DstBlendAlpha: 0
101+
- _EnvironmentReflections: 1
69102
- _GlossMapScale: 1
70103
- _Glossiness: 0.79
71104
- _GlossyReflections: 1
72-
- _Metallic: 0.104
105+
- _Metallic: 0.28
73106
- _Mode: 0
74107
- _NormalIntensity: 1.46
75108
- _OcclusionStrength: 1
76109
- _Parallax: 0.02
110+
- _QueueOffset: 0
111+
- _ReceiveShadows: 1
112+
- _Smoothness: 0.72
77113
- _SmoothnessTextureChannel: 0
78114
- _SpecularHighlights: 1
79115
- _SpecularIntensity: 0.1
80116
- _SrcBlend: 1
117+
- _SrcBlendAlpha: 1
118+
- _Surface: 0
81119
- _UVSec: 0
120+
- _WorkflowMode: 1
82121
- _ZWrite: 1
83122
m_Colors:
84-
- _Color: {r: 1, g: 1, b: 1, a: 0.46666667}
123+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
124+
- _Color: {r: 1, g: 1, b: 1, a: 1}
85125
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
86126
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
87127
m_BuildTextureStacks: []
128+
m_AllowLocking: 1
129+
--- !u!114 &5749169568223959743
130+
MonoBehaviour:
131+
m_ObjectHideFlags: 11
132+
m_CorrespondingSourceObject: {fileID: 0}
133+
m_PrefabInstance: {fileID: 0}
134+
m_PrefabAsset: {fileID: 0}
135+
m_GameObject: {fileID: 0}
136+
m_Enabled: 1
137+
m_EditorHideFlags: 0
138+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
139+
m_Name:
140+
m_EditorClassIdentifier:
141+
version: 10

‎Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Kidney_full/Materials/KV1_Body.mat‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Material:
2323
disabledShaderPasses:
2424
- MOTIONVECTORS
2525
- DepthOnly
26+
- SHADOWCASTER
2627
m_LockedProperties:
2728
m_SavedProperties:
2829
serializedVersion: 3
@@ -52,8 +53,8 @@ Material:
5253
m_Scale: {x: 10, y: 10}
5354
m_Offset: {x: 0, y: 0}
5455
- _MainTex:
55-
m_Texture: {fileID: 0}
56-
m_Scale: {x: 1, y: 1}
56+
m_Texture: {fileID: 2800000, guid: f010690b367509b41b21ed6f8803e07c, type: 3}
57+
m_Scale: {x: 10, y: 10}
5758
m_Offset: {x: 0, y: 0}
5859
- _MetallicGlossMap:
5960
m_Texture: {fileID: 0}
@@ -120,7 +121,7 @@ Material:
120121
- _ZWrite: 0
121122
m_Colors:
122123
- _BaseColor: {r: 0.6399999, g: 0.530513, b: 0.41648597, a: 0.50980395}
123-
- _Color: {r: 1, g: 1, b: 1, a: 1}
124+
- _Color: {r: 0.6399999, g: 0.530513, b: 0.41648594, a: 0.50980395}
124125
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
125126
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
126127
m_BuildTextureStacks: []

‎Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Kidney_full/Materials/KV1_LKidney.mat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ Material:
6363
m_Scale: {x: 10, y: 10}
6464
m_Offset: {x: 0, y: 0}
6565
- _MainTex:
66-
m_Texture: {fileID: 0}
67-
m_Scale: {x: 1, y: 1}
66+
m_Texture: {fileID: 2800000, guid: 39733d7000fd8394c8cbc68438afabbe, type: 3}
67+
m_Scale: {x: 10, y: 10}
6868
m_Offset: {x: 0, y: 0}
6969
- _MetallicGlossMap:
7070
m_Texture: {fileID: 0}

‎Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Kidney_full/Materials/KV1_RKidney.mat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ Material:
5050
m_Scale: {x: 10, y: 10}
5151
m_Offset: {x: 0, y: 0}
5252
- _MainTex:
53-
m_Texture: {fileID: 0}
54-
m_Scale: {x: 1, y: 1}
53+
m_Texture: {fileID: 2800000, guid: 39733d7000fd8394c8cbc68438afabbe, type: 3}
54+
m_Scale: {x: 10, y: 10}
5555
m_Offset: {x: 0, y: 0}
5656
- _MetallicGlossMap:
5757
m_Texture: {fileID: 0}

0 commit comments

Comments
 (0)