Skip to content

Commit 1dd375e

Browse files
authored
[Model] Small clean in materials and Add inverse logo material (#209)
* [Models] Small clean in materials * [Model] Add inverse logo material * backup small changes in materials
1 parent 1edc361 commit 1dd375e

7 files changed

Lines changed: 49 additions & 45 deletions

File tree

Core/Resources/Materials/CameraDisplay.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Material:
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
15+
- _ENVIRONMENTREFLECTIONS_OFF
1516
- _SPECULARHIGHLIGHTS_OFF
1617
m_InvalidKeywords:
1718
- _GLOSSYREFLECTIONS_OFF
@@ -52,7 +53,7 @@ Material:
5253
m_Scale: {x: 1, y: 1}
5354
m_Offset: {x: 0, y: 0}
5455
- _MainTex:
55-
m_Texture: {fileID: 0}
56+
m_Texture: {fileID: 8400000, guid: da2c4c1d31cda30409b98a2406c32298, type: 2}
5657
m_Scale: {x: 1, y: 1}
5758
m_Offset: {x: 0, y: 0}
5859
- _MetallicGlossMap:

Core/Resources/Materials/Chessboard.mat

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ Material:
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28-
- _SURFACE_TYPE_TRANSPARENT
28+
- _SPECULAR_SETUP
2929
m_InvalidKeywords: []
3030
m_LightmapFlags: 4
3131
m_EnableInstancingVariants: 0
3232
m_DoubleSidedGI: 0
33-
m_CustomRenderQueue: 3000
33+
m_CustomRenderQueue: 2000
3434
stringTagMap:
35-
RenderType: Transparent
35+
RenderType: Opaque
3636
disabledShaderPasses:
3737
- MOTIONVECTORS
38-
- DepthOnly
3938
m_LockedProperties:
4039
m_SavedProperties:
4140
serializedVersion: 3
@@ -65,8 +64,8 @@ Material:
6564
m_Scale: {x: 4, y: 4}
6665
m_Offset: {x: 0, y: 0}
6766
- _MainTex:
68-
m_Texture: {fileID: 0}
69-
m_Scale: {x: 1, y: 1}
67+
m_Texture: {fileID: 2800000, guid: 7ab43c1c561f53e42bdc1b5c807f7067, type: 3}
68+
m_Scale: {x: 4, y: 4}
7069
m_Offset: {x: 0, y: 0}
7170
- _MetallicGlossMap:
7271
m_Texture: {fileID: 0}
@@ -110,8 +109,8 @@ Material:
110109
- _Cutoff: 0.5
111110
- _DetailAlbedoMapScale: 1
112111
- _DetailNormalMapScale: 1
113-
- _DstBlend: 10
114-
- _DstBlendAlpha: 10
112+
- _DstBlend: 0
113+
- _DstBlendAlpha: 0
115114
- _EnvironmentReflections: 1
116115
- _GlossMapScale: 1
117116
- _Glossiness: 0.5
@@ -127,13 +126,13 @@ Material:
127126
- _SpecularHighlights: 1
128127
- _SrcBlend: 1
129128
- _SrcBlendAlpha: 1
130-
- _Surface: 1
129+
- _Surface: 0
131130
- _UVSec: 0
132-
- _WorkflowMode: 1
133-
- _ZWrite: 0
131+
- _WorkflowMode: 0
132+
- _ZWrite: 1
134133
m_Colors:
135134
- _BaseColor: {r: 0.42452827, g: 0.42452827, b: 0.42452827, a: 0.09019608}
136-
- _Color: {r: 1, g: 1, b: 1, a: 1}
135+
- _Color: {r: 0.42452824, g: 0.42452824, b: 0.42452824, a: 0.09019608}
137136
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
138137
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
139138
m_BuildTextureStacks: []

Core/Resources/Materials/Jelly.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Material:
2929
m_InvalidKeywords: []
3030
m_LightmapFlags: 4
3131
m_EnableInstancingVariants: 0
32-
m_DoubleSidedGI: 0
32+
m_DoubleSidedGI: 1
3333
m_CustomRenderQueue: 3000
3434
stringTagMap:
3535
RenderType: Transparent
@@ -107,7 +107,7 @@ Material:
107107
- _BumpScale: 1
108108
- _ClearCoatMask: 0
109109
- _ClearCoatSmoothness: 0
110-
- _Cull: 2
110+
- _Cull: 0
111111
- _Cutoff: 0.5
112112
- _DetailAlbedoMapScale: 1
113113
- _DetailNormalMapScale: 1

Core/Resources/Materials/Logo_trans.mat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Material:
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
15+
- _SPECULAR_SETUP
1516
- _SURFACE_TYPE_TRANSPARENT
1617
m_InvalidKeywords: []
1718
m_LightmapFlags: 4
@@ -23,6 +24,7 @@ Material:
2324
disabledShaderPasses:
2425
- MOTIONVECTORS
2526
- DepthOnly
27+
- SHADOWCASTER
2628
m_LockedProperties:
2729
m_SavedProperties:
2830
serializedVersion: 3
@@ -52,7 +54,7 @@ Material:
5254
m_Scale: {x: 1, y: 1}
5355
m_Offset: {x: 0, y: 0}
5456
- _MainTex:
55-
m_Texture: {fileID: 0}
57+
m_Texture: {fileID: 2800000, guid: a5ce2c16afc506b4da0b12a7e8197739, type: 3}
5658
m_Scale: {x: 1, y: 1}
5759
m_Offset: {x: 0, y: 0}
5860
- _MetallicGlossMap:
@@ -116,7 +118,7 @@ Material:
116118
- _SrcBlendAlpha: 1
117119
- _Surface: 1
118120
- _UVSec: 0
119-
- _WorkflowMode: 1
121+
- _WorkflowMode: 0
120122
- _ZWrite: 0
121123
m_Colors:
122124
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}

Core/Resources/Materials/chessBoard_trans.mat

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Material:
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28+
- _SPECULAR_SETUP
2829
- _SURFACE_TYPE_TRANSPARENT
2930
m_InvalidKeywords: []
3031
m_LightmapFlags: 4
@@ -36,6 +37,7 @@ Material:
3637
disabledShaderPasses:
3738
- MOTIONVECTORS
3839
- DepthOnly
40+
- SHADOWCASTER
3941
m_LockedProperties:
4042
m_SavedProperties:
4143
serializedVersion: 3
@@ -65,8 +67,8 @@ Material:
6567
m_Scale: {x: 4, y: 4}
6668
m_Offset: {x: 0, y: 0}
6769
- _MainTex:
68-
m_Texture: {fileID: 0}
69-
m_Scale: {x: 1, y: 1}
70+
m_Texture: {fileID: 2800000, guid: f010690b367509b41b21ed6f8803e07c, type: 3}
71+
m_Scale: {x: 4, y: 4}
7072
m_Offset: {x: 0, y: 0}
7173
- _MetallicGlossMap:
7274
m_Texture: {fileID: 0}
@@ -129,11 +131,11 @@ Material:
129131
- _SrcBlendAlpha: 1
130132
- _Surface: 1
131133
- _UVSec: 0
132-
- _WorkflowMode: 1
134+
- _WorkflowMode: 0
133135
- _ZWrite: 0
134136
m_Colors:
135137
- _BaseColor: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1}
136-
- _Color: {r: 1, g: 1, b: 1, a: 1}
138+
- _Color: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1}
137139
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
138140
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
139141
m_BuildTextureStacks: []

Core/Resources/Materials/Organs.mat renamed to Core/Resources/Materials/logo_square_inversed.mat

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-6767297003682787902
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
163
--- !u!21 &2100000
174
Material:
185
serializedVersion: 8
196
m_ObjectHideFlags: 0
207
m_CorrespondingSourceObject: {fileID: 0}
218
m_PrefabInstance: {fileID: 0}
229
m_PrefabAsset: {fileID: 0}
23-
m_Name: Organs
10+
m_Name: logo_square_inversed
2411
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
2512
m_Parent: {fileID: 0}
2613
m_ModifiedSerializedProperties: 0
@@ -39,9 +26,9 @@ Material:
3926
serializedVersion: 3
4027
m_TexEnvs:
4128
- _BaseMap:
42-
m_Texture: {fileID: 2800000, guid: c15255c1b4c08914ea47773c1a0a3802, type: 3}
43-
m_Scale: {x: 1, y: 1}
44-
m_Offset: {x: 0, y: 0}
29+
m_Texture: {fileID: 2800000, guid: 132107d6c5634f34fbf7b838702ca69e, type: 3}
30+
m_Scale: {x: 1.5, y: -1.5}
31+
m_Offset: {x: -0.22, y: 0}
4532
- _BumpMap:
4633
m_Texture: {fileID: 0}
4734
m_Scale: {x: 1, y: 1}
@@ -63,9 +50,9 @@ Material:
6350
m_Scale: {x: 1, y: 1}
6451
m_Offset: {x: 0, y: 0}
6552
- _MainTex:
66-
m_Texture: {fileID: 0}
67-
m_Scale: {x: 1, y: 1}
68-
m_Offset: {x: 0, y: 0}
53+
m_Texture: {fileID: 2800000, guid: 132107d6c5634f34fbf7b838702ca69e, type: 3}
54+
m_Scale: {x: 1.5, y: -1.5}
55+
m_Offset: {x: -0.22, y: 0}
6956
- _MetallicGlossMap:
7057
m_Texture: {fileID: 0}
7158
m_Scale: {x: 1, y: 1}
@@ -112,15 +99,15 @@ Material:
11299
- _DstBlendAlpha: 0
113100
- _EnvironmentReflections: 1
114101
- _GlossMapScale: 1
115-
- _Glossiness: 0
102+
- _Glossiness: 0.5
116103
- _GlossyReflections: 1
117104
- _Metallic: 0
118105
- _Mode: 0
119106
- _OcclusionStrength: 1
120107
- _Parallax: 0.02
121108
- _QueueOffset: 0
122109
- _ReceiveShadows: 1
123-
- _Smoothness: 0
110+
- _Smoothness: 0.5
124111
- _SmoothnessTextureChannel: 0
125112
- _SpecularHighlights: 1
126113
- _SrcBlend: 1
@@ -130,9 +117,22 @@ Material:
130117
- _WorkflowMode: 1
131118
- _ZWrite: 1
132119
m_Colors:
133-
- _BaseColor: {r: 0.6399999, g: 0.6399999, b: 0.6399999, a: 1}
120+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
134121
- _Color: {r: 1, g: 1, b: 1, a: 1}
135122
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
136123
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
137124
m_BuildTextureStacks: []
138125
m_AllowLocking: 1
126+
--- !u!114 &900782708772261124
127+
MonoBehaviour:
128+
m_ObjectHideFlags: 11
129+
m_CorrespondingSourceObject: {fileID: 0}
130+
m_PrefabInstance: {fileID: 0}
131+
m_PrefabAsset: {fileID: 0}
132+
m_GameObject: {fileID: 0}
133+
m_Enabled: 1
134+
m_EditorHideFlags: 0
135+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
136+
m_Name:
137+
m_EditorClassIdentifier:
138+
version: 10

Core/Resources/Materials/Organs.mat.meta renamed to Core/Resources/Materials/logo_square_inversed.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)