Skip to content

Commit 4e37ee4

Browse files
CA-TatamiCA-Tatami
authored
Merge pull request #153 from CyberAgentGameEntertainment/feature/tint-color-flipbook
Add FlipBook functionality to Tint Color for feature parity with Base Color
2 parents 010c60e + 1f72368 commit 4e37ee4

248 files changed

Lines changed: 2813 additions & 1128 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.

‎Assets/Demo/Common/Materials/mat_demo_common_skybox.mat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Material:
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: mat_demo_common_skybox
2424
m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
2527
m_ValidKeywords: []
2628
m_InvalidKeywords: []
2729
m_LightmapFlags: 4
@@ -30,6 +32,7 @@ Material:
3032
m_CustomRenderQueue: -1
3133
stringTagMap: {}
3234
disabledShaderPasses: []
35+
m_LockedProperties:
3336
m_SavedProperties:
3437
serializedVersion: 3
3538
m_TexEnvs:

‎Assets/Demo/Demo00/Materials/mat_demo_dissolve_edgeemission.mat‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_demo_dissolve_edgeemission
1111
m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _ALPHA_TRANSITION_MAP_MODE_2D
1416
- _BASE_MAP_MODE_2D
@@ -27,6 +29,7 @@ Material:
2729
m_CustomRenderQueue: 3000
2830
stringTagMap: {}
2931
disabledShaderPasses: []
32+
m_LockedProperties:
3033
m_SavedProperties:
3134
serializedVersion: 3
3235
m_TexEnvs:
@@ -106,6 +109,10 @@ Material:
106109
m_Texture: {fileID: 0}
107110
m_Scale: {x: 1, y: 1}
108111
m_Offset: {x: 0, y: 0}
112+
- _TintMap2DArray:
113+
m_Texture: {fileID: 0}
114+
m_Scale: {x: 1, y: 1}
115+
m_Offset: {x: 0, y: 0}
109116
- _TintMap3D:
110117
m_Texture: {fileID: 0}
111118
m_Scale: {x: 1, y: 1}
@@ -141,8 +148,11 @@ Material:
141148
- _BaseMapOffsetYCoord: 0
142149
- _BaseMapProgress: 0
143150
- _BaseMapProgressCoord: 0
151+
- _BaseMapRandomRowCoord: 0
152+
- _BaseMapRandomRowSelectionEnabled: 0
144153
- _BaseMapRotation: 0
145154
- _BaseMapRotationCoord: 0
155+
- _BaseMapRowCount: 1
146156
- _BaseMapSliceCount: 25
147157
- _BlendDst: 10
148158
- _BlendSrc: 5
@@ -216,6 +226,8 @@ Material:
216226
- _TintMap3DProgressCoord: 0
217227
- _TintMapOffsetXCoord: 0
218228
- _TintMapOffsetYCoord: 0
229+
- _TintMapProgress: 0
230+
- _TintMapProgressCoord: 0
219231
- _TintMapSliceCount: 4
220232
- _TintRimProgress: 0.5
221233
- _TintRimProgressCoord: 0

‎Assets/Demo/Demo00/Materials/mat_demo_distortion.mat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_demo_distortion
1111
m_Shader: {fileID: 4800000, guid: f16a2dd74da8941d6a883c14b1f26710, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _FLOW_MAP_TARGET_BASE
1416
m_InvalidKeywords: []
@@ -18,6 +20,7 @@ Material:
1820
m_CustomRenderQueue: -1
1921
stringTagMap: {}
2022
disabledShaderPasses: []
23+
m_LockedProperties:
2124
m_SavedProperties:
2225
serializedVersion: 3
2326
m_TexEnvs:

‎Assets/Demo/Demo00/Materials/mat_demo_fade_edgeemission.mat‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_demo_fade_edgeemission
1111
m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _ALPHA_TRANSITION_MAP_MODE_2D
1416
- _BASE_MAP_MODE_2D
@@ -27,6 +29,7 @@ Material:
2729
m_CustomRenderQueue: 3000
2830
stringTagMap: {}
2931
disabledShaderPasses: []
32+
m_LockedProperties:
3033
m_SavedProperties:
3134
serializedVersion: 3
3235
m_TexEnvs:
@@ -106,6 +109,10 @@ Material:
106109
m_Texture: {fileID: 0}
107110
m_Scale: {x: 1, y: 1}
108111
m_Offset: {x: 0, y: 0}
112+
- _TintMap2DArray:
113+
m_Texture: {fileID: 0}
114+
m_Scale: {x: 1, y: 1}
115+
m_Offset: {x: 0, y: 0}
109116
- _TintMap3D:
110117
m_Texture: {fileID: 0}
111118
m_Scale: {x: 1, y: 1}
@@ -141,8 +148,11 @@ Material:
141148
- _BaseMapOffsetYCoord: 0
142149
- _BaseMapProgress: 0
143150
- _BaseMapProgressCoord: 0
151+
- _BaseMapRandomRowCoord: 0
152+
- _BaseMapRandomRowSelectionEnabled: 0
144153
- _BaseMapRotation: 0
145154
- _BaseMapRotationCoord: 0
155+
- _BaseMapRowCount: 1
146156
- _BaseMapSliceCount: 25
147157
- _BlendDst: 10
148158
- _BlendSrc: 5
@@ -216,6 +226,8 @@ Material:
216226
- _TintMap3DProgressCoord: 0
217227
- _TintMapOffsetXCoord: 0
218228
- _TintMapOffsetYCoord: 0
229+
- _TintMapProgress: 0
230+
- _TintMapProgressCoord: 0
219231
- _TintMapSliceCount: 4
220232
- _TintRimProgress: 0.5
221233
- _TintRimProgressCoord: 0

‎Assets/Demo/Demo00/Materials/mat_demo_flowmap.mat‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ Material:
3737
m_EnableInstancingVariants: 0
3838
m_DoubleSidedGI: 1
3939
m_CustomRenderQueue: 3000
40-
stringTagMap:
41-
RenderType: Transparent
42-
disabledShaderPasses:
43-
- SHADOWCASTER
40+
stringTagMap: {}
41+
disabledShaderPasses: []
4442
m_LockedProperties:
4543
m_SavedProperties:
4644
serializedVersion: 3
@@ -121,6 +119,10 @@ Material:
121119
m_Texture: {fileID: 0}
122120
m_Scale: {x: 1, y: 1}
123121
m_Offset: {x: 0, y: 0}
122+
- _TintMap2DArray:
123+
m_Texture: {fileID: 0}
124+
m_Scale: {x: 1, y: 1}
125+
m_Offset: {x: 0, y: 0}
124126
- _TintMap3D:
125127
m_Texture: {fileID: 0}
126128
m_Scale: {x: 1, y: 1}
@@ -156,8 +158,11 @@ Material:
156158
- _BaseMapOffsetYCoord: 0
157159
- _BaseMapProgress: 0
158160
- _BaseMapProgressCoord: 0
161+
- _BaseMapRandomRowCoord: 0
162+
- _BaseMapRandomRowSelectionEnabled: 0
159163
- _BaseMapRotation: 0
160164
- _BaseMapRotationCoord: 0
165+
- _BaseMapRowCount: 1
161166
- _BaseMapSliceCount: 4
162167
- _BlendDst: 10
163168
- _BlendSrc: 5
@@ -231,6 +236,8 @@ Material:
231236
- _TintMap3DProgressCoord: 0
232237
- _TintMapOffsetXCoord: 0
233238
- _TintMapOffsetYCoord: 0
239+
- _TintMapProgress: 0
240+
- _TintMapProgressCoord: 0
234241
- _TintMapSliceCount: 4
235242
- _TintRimProgress: 0.5
236243
- _TintRimProgressCoord: 0

‎Assets/Demo/Demo00/Materials/mat_demo_flowmap_lit.mat‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,8 @@ Material:
4040
m_EnableInstancingVariants: 0
4141
m_DoubleSidedGI: 1
4242
m_CustomRenderQueue: 3000
43-
stringTagMap:
44-
RenderType: Transparent
45-
disabledShaderPasses:
46-
- SHADOWCASTER
43+
stringTagMap: {}
44+
disabledShaderPasses: []
4745
m_LockedProperties:
4846
m_SavedProperties:
4947
serializedVersion: 3
@@ -172,6 +170,10 @@ Material:
172170
m_Texture: {fileID: 0}
173171
m_Scale: {x: 1, y: 1}
174172
m_Offset: {x: 0, y: 0}
173+
- _TintMap2DArray:
174+
m_Texture: {fileID: 0}
175+
m_Scale: {x: 1, y: 1}
176+
m_Offset: {x: 0, y: 0}
175177
- _TintMap3D:
176178
m_Texture: {fileID: 0}
177179
m_Scale: {x: 1, y: 1}
@@ -207,8 +209,11 @@ Material:
207209
- _BaseMapOffsetYCoord: 0
208210
- _BaseMapProgress: 0
209211
- _BaseMapProgressCoord: 0
212+
- _BaseMapRandomRowCoord: 0
213+
- _BaseMapRandomRowSelectionEnabled: 0
210214
- _BaseMapRotation: 0
211215
- _BaseMapRotationCoord: 0
216+
- _BaseMapRowCount: 1
212217
- _BaseMapSliceCount: 4
213218
- _BlendDst: 10
214219
- _BlendSrc: 5
@@ -292,6 +297,8 @@ Material:
292297
- _TintMap3DProgressCoord: 0
293298
- _TintMapOffsetXCoord: 0
294299
- _TintMapOffsetYCoord: 0
300+
- _TintMapProgress: 0
301+
- _TintMapProgressCoord: 0
295302
- _TintMapSliceCount: 4
296303
- _TintRimProgress: 0.5
297304
- _TintRimProgressCoord: 0

‎Assets/Demo/Demo00/Materials/mat_demo_greadientmap.mat‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_demo_greadientmap
1111
m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _ALPHA_TRANSITION_MAP_MODE_2D
1416
- _BASE_MAP_MODE_2D
@@ -24,6 +26,7 @@ Material:
2426
m_CustomRenderQueue: 3000
2527
stringTagMap: {}
2628
disabledShaderPasses: []
29+
m_LockedProperties:
2730
m_SavedProperties:
2831
serializedVersion: 3
2932
m_TexEnvs:
@@ -103,6 +106,10 @@ Material:
103106
m_Texture: {fileID: 0}
104107
m_Scale: {x: 1, y: 1}
105108
m_Offset: {x: 0, y: 0}
109+
- _TintMap2DArray:
110+
m_Texture: {fileID: 0}
111+
m_Scale: {x: 1, y: 1}
112+
m_Offset: {x: 0, y: 0}
106113
- _TintMap3D:
107114
m_Texture: {fileID: 0}
108115
m_Scale: {x: 3, y: 3}
@@ -138,8 +145,11 @@ Material:
138145
- _BaseMapOffsetYCoord: 0
139146
- _BaseMapProgress: 0
140147
- _BaseMapProgressCoord: 0
148+
- _BaseMapRandomRowCoord: 0
149+
- _BaseMapRandomRowSelectionEnabled: 0
141150
- _BaseMapRotation: 0
142151
- _BaseMapRotationCoord: 0
152+
- _BaseMapRowCount: 1
143153
- _BaseMapSliceCount: 25
144154
- _BlendDst: 1
145155
- _BlendSrc: 5
@@ -213,6 +223,8 @@ Material:
213223
- _TintMap3DProgressCoord: 1
214224
- _TintMapOffsetXCoord: 0
215225
- _TintMapOffsetYCoord: 0
226+
- _TintMapProgress: 0
227+
- _TintMapProgressCoord: 0
216228
- _TintMapSliceCount: 4
217229
- _TintRimProgress: 0.5
218230
- _TintRimProgressCoord: 0

‎Assets/Demo/Demo00/Materials/mat_demo_greyscale.mat‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_demo_greyscale
1111
m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _ALPHA_TRANSITION_MAP_MODE_2D
1416
- _BASE_MAP_MODE_2D
@@ -26,6 +28,7 @@ Material:
2628
m_CustomRenderQueue: 3000
2729
stringTagMap: {}
2830
disabledShaderPasses: []
31+
m_LockedProperties:
2932
m_SavedProperties:
3033
serializedVersion: 3
3134
m_TexEnvs:
@@ -105,6 +108,10 @@ Material:
105108
m_Texture: {fileID: 0}
106109
m_Scale: {x: 1, y: 1}
107110
m_Offset: {x: 0, y: 0}
111+
- _TintMap2DArray:
112+
m_Texture: {fileID: 0}
113+
m_Scale: {x: 1, y: 1}
114+
m_Offset: {x: 0, y: 0}
108115
- _TintMap3D:
109116
m_Texture: {fileID: 0}
110117
m_Scale: {x: 3, y: 3}
@@ -140,8 +147,11 @@ Material:
140147
- _BaseMapOffsetYCoord: 0
141148
- _BaseMapProgress: 0
142149
- _BaseMapProgressCoord: 0
150+
- _BaseMapRandomRowCoord: 0
151+
- _BaseMapRandomRowSelectionEnabled: 0
143152
- _BaseMapRotation: 0
144153
- _BaseMapRotationCoord: 0
154+
- _BaseMapRowCount: 1
145155
- _BaseMapSliceCount: 25
146156
- _BlendDst: 10
147157
- _BlendSrc: 5
@@ -215,6 +225,8 @@ Material:
215225
- _TintMap3DProgressCoord: 1
216226
- _TintMapOffsetXCoord: 0
217227
- _TintMapOffsetYCoord: 0
228+
- _TintMapProgress: 0
229+
- _TintMapProgressCoord: 0
218230
- _TintMapSliceCount: 4
219231
- _TintRimProgress: 0.5
220232
- _TintRimProgressCoord: 0

‎Assets/Demo/Demo00/Materials/mat_demo_mirror_rotation_doublesided.mat‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ Material:
2525
m_EnableInstancingVariants: 0
2626
m_DoubleSidedGI: 1
2727
m_CustomRenderQueue: 3000
28-
stringTagMap:
29-
RenderType: Transparent
30-
disabledShaderPasses:
31-
- SHADOWCASTER
28+
stringTagMap: {}
29+
disabledShaderPasses: []
3230
m_LockedProperties:
3331
m_SavedProperties:
3432
serializedVersion: 3
@@ -109,6 +107,10 @@ Material:
109107
m_Texture: {fileID: 0}
110108
m_Scale: {x: 1, y: 1}
111109
m_Offset: {x: 0, y: 0}
110+
- _TintMap2DArray:
111+
m_Texture: {fileID: 0}
112+
m_Scale: {x: 1, y: 1}
113+
m_Offset: {x: 0, y: 0}
112114
- _TintMap3D:
113115
m_Texture: {fileID: 0}
114116
m_Scale: {x: 1, y: 1}
@@ -144,8 +146,11 @@ Material:
144146
- _BaseMapOffsetYCoord: 0
145147
- _BaseMapProgress: 0
146148
- _BaseMapProgressCoord: 0
149+
- _BaseMapRandomRowCoord: 0
150+
- _BaseMapRandomRowSelectionEnabled: 0
147151
- _BaseMapRotation: 0
148152
- _BaseMapRotationCoord: 1
153+
- _BaseMapRowCount: 1
149154
- _BaseMapSliceCount: 25
150155
- _BlendDst: 10
151156
- _BlendSrc: 5
@@ -219,6 +224,8 @@ Material:
219224
- _TintMap3DProgressCoord: 0
220225
- _TintMapOffsetXCoord: 0
221226
- _TintMapOffsetYCoord: 0
227+
- _TintMapProgress: 0
228+
- _TintMapProgressCoord: 0
222229
- _TintMapSliceCount: 4
223230
- _TintRimProgress: 0.5
224231
- _TintRimProgressCoord: 0

0 commit comments

Comments
 (0)