Skip to content

Commit 67ccd97

Browse files
epernodepernod
committed
[Endoscopy] Update materials and scene to URP
1 parent e190f19 commit 67ccd97

File tree

11 files changed

+1200
-904
lines changed

11 files changed

+1200
-904
lines changed

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

Lines changed: 1013 additions & 879 deletions
Large diffs are not rendered by default.

‎Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Adrenal_Gland_Left.mat‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,25 @@
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: Adrenal_Gland_Left
1111
m_Shader: {fileID: 4800000, guid: b965f82ca09623c41afded17f5d27c27, type: 3}
12-
m_ShaderKeywords: _NORMALMAP
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords:
16+
- _NORMALMAP
1317
m_LightmapFlags: 4
1418
m_EnableInstancingVariants: 0
1519
m_DoubleSidedGI: 0
1620
m_CustomRenderQueue: -1
1721
stringTagMap: {}
1822
disabledShaderPasses: []
23+
m_LockedProperties:
1924
m_SavedProperties:
2025
serializedVersion: 3
2126
m_TexEnvs:
@@ -55,6 +60,7 @@ Material:
5560
m_Texture: {fileID: 0}
5661
m_Scale: {x: 1, y: 1}
5762
m_Offset: {x: 0, y: 0}
63+
m_Ints: []
5864
m_Floats:
5965
- _BumpScale: 1
6066
- _Cutoff: 0.5
@@ -79,3 +85,4 @@ Material:
7985
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
8086
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
8187
m_BuildTextureStacks: []
88+
m_AllowLocking: 1

‎Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Bladder.mat‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,20 @@ Material:
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
15+
- _ALPHAPREMULTIPLY_ON
1516
- _NORMALMAP
17+
- _SURFACE_TYPE_TRANSPARENT
1618
m_InvalidKeywords: []
1719
m_LightmapFlags: 4
1820
m_EnableInstancingVariants: 0
1921
m_DoubleSidedGI: 0
20-
m_CustomRenderQueue: -1
22+
m_CustomRenderQueue: 3000
2123
stringTagMap:
22-
RenderType: Opaque
24+
RenderType: Transparent
2325
disabledShaderPasses:
2426
- MOTIONVECTORS
27+
- DepthOnly
28+
- SHADOWCASTER
2529
m_LockedProperties:
2630
m_SavedProperties:
2731
serializedVersion: 3
@@ -51,7 +55,7 @@ Material:
5155
m_Scale: {x: 1, y: 1}
5256
m_Offset: {x: 0, y: 0}
5357
- _MainTex:
54-
m_Texture: {fileID: 0}
58+
m_Texture: {fileID: 2800000, guid: 27a6db4218272754789d503152378e0a, type: 3}
5559
m_Scale: {x: 1, y: 1}
5660
m_Offset: {x: 0, y: 0}
5761
- _MetallicGlossMap:
@@ -96,8 +100,8 @@ Material:
96100
- _Cutoff: 0.5
97101
- _DetailAlbedoMapScale: 1
98102
- _DetailNormalMapScale: 1
99-
- _DstBlend: 0
100-
- _DstBlendAlpha: 0
103+
- _DstBlend: 10
104+
- _DstBlendAlpha: 10
101105
- _EnvironmentReflections: 1
102106
- _GlossMapScale: 1
103107
- _Glossiness: 0.108
@@ -113,13 +117,13 @@ Material:
113117
- _SpecularHighlights: 1
114118
- _SrcBlend: 1
115119
- _SrcBlendAlpha: 1
116-
- _Surface: 0
120+
- _Surface: 1
117121
- _UVSec: 0
118122
- _WorkflowMode: 1
119-
- _ZWrite: 1
123+
- _ZWrite: 0
120124
m_Colors:
121-
- _BaseColor: {r: 0.58799994, g: 0.58799994, b: 0.58799994, a: 1}
122-
- _Color: {r: 1, g: 1, b: 1, a: 1}
125+
- _BaseColor: {r: 0.58799994, g: 0.58799994, b: 0.58799994, a: 0.7529412}
126+
- _Color: {r: 0.58799994, g: 0.58799994, b: 0.58799994, a: 0.7529412}
123127
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
124128
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
125129
m_BuildTextureStacks: []

‎Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Kidney_Left.mat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Material:
6464
m_Scale: {x: 1, y: 1}
6565
m_Offset: {x: 0, y: 0}
6666
- _MainTex:
67-
m_Texture: {fileID: 0}
67+
m_Texture: {fileID: 2800000, guid: acff450a82ff97040b9a219919fd956a, type: 3}
6868
m_Scale: {x: 1, y: 1}
6969
m_Offset: {x: 0, y: 0}
7070
- _MetallicGlossMap:
@@ -132,7 +132,7 @@ Material:
132132
- _ZWrite: 1
133133
m_Colors:
134134
- _BaseColor: {r: 0.58799994, g: 0.58799994, b: 0.58799994, a: 1}
135-
- _Color: {r: 1, g: 1, b: 1, a: 1}
135+
- _Color: {r: 0.58799994, g: 0.58799994, b: 0.58799994, a: 1}
136136
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
137137
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
138138
m_BuildTextureStacks: []

‎Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Prostate.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: Prostate
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _NORMALMAP
16+
m_InvalidKeywords: []
17+
m_LightmapFlags: 4
18+
m_EnableInstancingVariants: 0
19+
m_DoubleSidedGI: 0
20+
m_CustomRenderQueue: -1
21+
stringTagMap:
22+
RenderType: Opaque
23+
disabledShaderPasses:
24+
- MOTIONVECTORS
25+
m_LockedProperties:
26+
m_SavedProperties:
27+
serializedVersion: 3
28+
m_TexEnvs:
29+
- _BaseMap:
30+
m_Texture: {fileID: 2800000, guid: 06afba89f3eff8b48ad95e00bb8b235b, type: 3}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _BumpMap:
34+
m_Texture: {fileID: 2800000, guid: afd963210d764a54ab662d305a6dca07, type: 3}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _DetailAlbedoMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _DetailMask:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _DetailNormalMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _EmissionMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _MainTex:
54+
m_Texture: {fileID: 2800000, guid: 06afba89f3eff8b48ad95e00bb8b235b, type: 3}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _MetallicGlossMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _OcclusionMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _ParallaxMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
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}
85+
m_Ints: []
86+
m_Floats:
87+
- _AddPrecomputedVelocity: 0
88+
- _AlphaClip: 0
89+
- _AlphaToMask: 0
90+
- _Blend: 0
91+
- _BlendModePreserveSpecular: 1
92+
- _BumpScale: 1
93+
- _ClearCoatMask: 0
94+
- _ClearCoatSmoothness: 0
95+
- _Cull: 2
96+
- _Cutoff: 0.5
97+
- _DetailAlbedoMapScale: 1
98+
- _DetailNormalMapScale: 1
99+
- _DstBlend: 0
100+
- _DstBlendAlpha: 0
101+
- _EnvironmentReflections: 1
102+
- _GlossMapScale: 1
103+
- _Glossiness: 0.108
104+
- _GlossyReflections: 1
105+
- _Metallic: 0.104
106+
- _Mode: 0
107+
- _OcclusionStrength: 1
108+
- _Parallax: 0.02
109+
- _QueueOffset: 0
110+
- _ReceiveShadows: 1
111+
- _Smoothness: 0.108
112+
- _SmoothnessTextureChannel: 0
113+
- _SpecularHighlights: 1
114+
- _SrcBlend: 1
115+
- _SrcBlendAlpha: 1
116+
- _Surface: 0
117+
- _UVSec: 0
118+
- _WorkflowMode: 1
119+
- _ZWrite: 1
120+
m_Colors:
121+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
122+
- _Color: {r: 1, g: 1, b: 1, a: 1}
123+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
124+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
125+
m_BuildTextureStacks: []
126+
m_AllowLocking: 1
127+
--- !u!114 &3837178279124721783
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: 9

‎Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Prostate.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.

Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Prostate_Uretra.mat renamed to Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Prostate_Uretra_doubleSide.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: Prostate_Uretra
10+
m_Name: Prostate_Uretra_doubleSide
1111
m_Shader: {fileID: 4800000, guid: b965f82ca09623c41afded17f5d27c27, type: 3}
1212
m_ShaderKeywords: _NORMALMAP
1313
m_LightmapFlags: 4

Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Prostate_Uretra.mat.meta renamed to Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Prostate_Uretra_doubleSide.mat.meta

File renamed without changes.

‎Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Urinary_Ureter_Left.mat‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,20 @@ Material:
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
15+
- _ALPHAPREMULTIPLY_ON
1516
- _NORMALMAP
17+
- _SURFACE_TYPE_TRANSPARENT
1618
m_InvalidKeywords: []
1719
m_LightmapFlags: 4
1820
m_EnableInstancingVariants: 0
1921
m_DoubleSidedGI: 0
20-
m_CustomRenderQueue: -1
22+
m_CustomRenderQueue: 3000
2123
stringTagMap:
22-
RenderType: Opaque
24+
RenderType: Transparent
2325
disabledShaderPasses:
2426
- MOTIONVECTORS
27+
- DepthOnly
28+
- SHADOWCASTER
2529
m_LockedProperties:
2630
m_SavedProperties:
2731
serializedVersion: 3
@@ -51,7 +55,7 @@ Material:
5155
m_Scale: {x: 1, y: 1}
5256
m_Offset: {x: 0, y: 0}
5357
- _MainTex:
54-
m_Texture: {fileID: 0}
58+
m_Texture: {fileID: 2800000, guid: 5fde5eee616fd9f4f9b0e22a5c07a361, type: 3}
5559
m_Scale: {x: 1, y: 1}
5660
m_Offset: {x: 0, y: 0}
5761
- _MetallicGlossMap:
@@ -96,8 +100,8 @@ Material:
96100
- _Cutoff: 0.5
97101
- _DetailAlbedoMapScale: 1
98102
- _DetailNormalMapScale: 1
99-
- _DstBlend: 0
100-
- _DstBlendAlpha: 0
103+
- _DstBlend: 10
104+
- _DstBlendAlpha: 10
101105
- _EnvironmentReflections: 1
102106
- _GlossMapScale: 1
103107
- _Glossiness: 0.108
@@ -113,13 +117,13 @@ Material:
113117
- _SpecularHighlights: 1
114118
- _SrcBlend: 1
115119
- _SrcBlendAlpha: 1
116-
- _Surface: 0
120+
- _Surface: 1
117121
- _UVSec: 0
118122
- _WorkflowMode: 1
119-
- _ZWrite: 1
123+
- _ZWrite: 0
120124
m_Colors:
121-
- _BaseColor: {r: 0.58799994, g: 0.58799994, b: 0.58799994, a: 1}
122-
- _Color: {r: 1, g: 1, b: 1, a: 1}
125+
- _BaseColor: {r: 1, g: 1, b: 1, a: 0.80784315}
126+
- _Color: {r: 1, g: 1, b: 1, a: 0.80784315}
123127
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
124128
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
125129
m_BuildTextureStacks: []

‎Scenes/Demos/Endoscopy/Virtual Capsule Endoscopy/Material/Capsule.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Material:
6464
m_Scale: {x: 1, y: 1}
6565
m_Offset: {x: 0, y: 0}
6666
- _MainTex:
67-
m_Texture: {fileID: 0}
67+
m_Texture: {fileID: 2800000, guid: 3755ec2bd6264fc4b9dd15fee29e99fc, type: 3}
6868
m_Scale: {x: 1, y: 1}
6969
m_Offset: {x: 0, y: 0}
7070
- _MetallicGlossMap:

0 commit comments

Comments
 (0)