Skip to content

Add FlipBook functionality to Tint Color for feature parity with Base Color #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CA-Tatami merged 17 commits into from
Jul 23, 2025
Merged

Add FlipBook functionality to Tint Color for feature parity with Base Color #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
09bc249
Rename TintColorMode.Texture3D to FlipBookBlending for consistency
Jul 18, 2025
9b2322c
Add FlipBook (2DArray) support to TintColor
Jul 18, 2025
54a68b5
TintColorMode.Texture2Dの命名をTintColorMode.SingleTextureに変更
Jul 18, 2025
eebc9e8
enumの不統一理由についてドキュメントに追記
Jul 18, 2025
be6e228
tintColorに初期値を設定
Jul 18, 2025
f152dc0
Fix TintColor FlipBook implementation and naming consistency
Jul 18, 2025
ab8f20f
最適化シェーダーでの除外対象にTInt 2dを追加
Jul 18, 2025
c489dc8
Fix critical FlipBook feature integration issues
Jul 18, 2025
9b1c43a
Update README documentation for Tint Color FlipBook feature
Jul 18, 2025
a62b737
Fix Tint Color documentation order consistency with Base Map
Jul 18, 2025
14f5aa7
Fix tintEmissionUV shader compilation error by adding emission map ke…
Jul 18, 2025
283e540
Fix Flow Map with Tint Map compatibility in DepthNormals pass
Jul 18, 2025
17a72c1
material更新
Jul 18, 2025
18cb036
material更新
Jul 18, 2025
f23b225
CLAUDE.mdにPR作成ガイドライン追加
Jul 18, 2025
af1a44d
CLAUDE.mdにドキュメント編集に関するルール変更
Jul 22, 2025
1f72368
Merge branch 'main' into feature/tint-color-flipbook
Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Assets/Demo/Common/Materials/mat_demo_common_skybox.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: mat_demo_common_skybox
m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
Expand All @@ -30,6 +32,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down
12 changes: 12 additions & 0 deletions Assets/Demo/Demo00/Materials/mat_demo_dissolve_edgeemission.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: mat_demo_dissolve_edgeemission
m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHA_TRANSITION_MAP_MODE_2D
- _BASE_MAP_MODE_2D
Expand All @@ -27,6 +29,7 @@ Material:
m_CustomRenderQueue: 3000
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -106,6 +109,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap2DArray:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap3D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -141,8 +148,11 @@ Material:
- _BaseMapOffsetYCoord: 0
- _BaseMapProgress: 0
- _BaseMapProgressCoord: 0
- _BaseMapRandomRowCoord: 0
- _BaseMapRandomRowSelectionEnabled: 0
- _BaseMapRotation: 0
- _BaseMapRotationCoord: 0
- _BaseMapRowCount: 1
- _BaseMapSliceCount: 25
- _BlendDst: 10
- _BlendSrc: 5
Expand Down Expand Up @@ -216,6 +226,8 @@ Material:
- _TintMap3DProgressCoord: 0
- _TintMapOffsetXCoord: 0
- _TintMapOffsetYCoord: 0
- _TintMapProgress: 0
- _TintMapProgressCoord: 0
- _TintMapSliceCount: 4
- _TintRimProgress: 0.5
- _TintRimProgressCoord: 0
Expand Down
3 changes: 3 additions & 0 deletions Assets/Demo/Demo00/Materials/mat_demo_distortion.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: mat_demo_distortion
m_Shader: {fileID: 4800000, guid: f16a2dd74da8941d6a883c14b1f26710, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _FLOW_MAP_TARGET_BASE
m_InvalidKeywords: []
Expand All @@ -18,6 +20,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down
12 changes: 12 additions & 0 deletions Assets/Demo/Demo00/Materials/mat_demo_fade_edgeemission.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: mat_demo_fade_edgeemission
m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHA_TRANSITION_MAP_MODE_2D
- _BASE_MAP_MODE_2D
Expand All @@ -27,6 +29,7 @@ Material:
m_CustomRenderQueue: 3000
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -106,6 +109,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap2DArray:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap3D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -141,8 +148,11 @@ Material:
- _BaseMapOffsetYCoord: 0
- _BaseMapProgress: 0
- _BaseMapProgressCoord: 0
- _BaseMapRandomRowCoord: 0
- _BaseMapRandomRowSelectionEnabled: 0
- _BaseMapRotation: 0
- _BaseMapRotationCoord: 0
- _BaseMapRowCount: 1
- _BaseMapSliceCount: 25
- _BlendDst: 10
- _BlendSrc: 5
Expand Down Expand Up @@ -216,6 +226,8 @@ Material:
- _TintMap3DProgressCoord: 0
- _TintMapOffsetXCoord: 0
- _TintMapOffsetYCoord: 0
- _TintMapProgress: 0
- _TintMapProgressCoord: 0
- _TintMapSliceCount: 4
- _TintRimProgress: 0.5
- _TintRimProgressCoord: 0
Expand Down
15 changes: 11 additions & 4 deletions Assets/Demo/Demo00/Materials/mat_demo_flowmap.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ Material:
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -121,6 +119,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap2DArray:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap3D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -156,8 +158,11 @@ Material:
- _BaseMapOffsetYCoord: 0
- _BaseMapProgress: 0
- _BaseMapProgressCoord: 0
- _BaseMapRandomRowCoord: 0
- _BaseMapRandomRowSelectionEnabled: 0
- _BaseMapRotation: 0
- _BaseMapRotationCoord: 0
- _BaseMapRowCount: 1
- _BaseMapSliceCount: 4
- _BlendDst: 10
- _BlendSrc: 5
Expand Down Expand Up @@ -231,6 +236,8 @@ Material:
- _TintMap3DProgressCoord: 0
- _TintMapOffsetXCoord: 0
- _TintMapOffsetYCoord: 0
- _TintMapProgress: 0
- _TintMapProgressCoord: 0
- _TintMapSliceCount: 4
- _TintRimProgress: 0.5
- _TintRimProgressCoord: 0
Expand Down
15 changes: 11 additions & 4 deletions Assets/Demo/Demo00/Materials/mat_demo_flowmap_lit.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ Material:
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -172,6 +170,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap2DArray:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap3D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -207,8 +209,11 @@ Material:
- _BaseMapOffsetYCoord: 0
- _BaseMapProgress: 0
- _BaseMapProgressCoord: 0
- _BaseMapRandomRowCoord: 0
- _BaseMapRandomRowSelectionEnabled: 0
- _BaseMapRotation: 0
- _BaseMapRotationCoord: 0
- _BaseMapRowCount: 1
- _BaseMapSliceCount: 4
- _BlendDst: 10
- _BlendSrc: 5
Expand Down Expand Up @@ -292,6 +297,8 @@ Material:
- _TintMap3DProgressCoord: 0
- _TintMapOffsetXCoord: 0
- _TintMapOffsetYCoord: 0
- _TintMapProgress: 0
- _TintMapProgressCoord: 0
- _TintMapSliceCount: 4
- _TintRimProgress: 0.5
- _TintRimProgressCoord: 0
Expand Down
12 changes: 12 additions & 0 deletions Assets/Demo/Demo00/Materials/mat_demo_greadientmap.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: mat_demo_greadientmap
m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHA_TRANSITION_MAP_MODE_2D
- _BASE_MAP_MODE_2D
Expand All @@ -24,6 +26,7 @@ Material:
m_CustomRenderQueue: 3000
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -103,6 +106,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap2DArray:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap3D:
m_Texture: {fileID: 0}
m_Scale: {x: 3, y: 3}
Expand Down Expand Up @@ -138,8 +145,11 @@ Material:
- _BaseMapOffsetYCoord: 0
- _BaseMapProgress: 0
- _BaseMapProgressCoord: 0
- _BaseMapRandomRowCoord: 0
- _BaseMapRandomRowSelectionEnabled: 0
- _BaseMapRotation: 0
- _BaseMapRotationCoord: 0
- _BaseMapRowCount: 1
- _BaseMapSliceCount: 25
- _BlendDst: 1
- _BlendSrc: 5
Expand Down Expand Up @@ -213,6 +223,8 @@ Material:
- _TintMap3DProgressCoord: 1
- _TintMapOffsetXCoord: 0
- _TintMapOffsetYCoord: 0
- _TintMapProgress: 0
- _TintMapProgressCoord: 0
- _TintMapSliceCount: 4
- _TintRimProgress: 0.5
- _TintRimProgressCoord: 0
Expand Down
12 changes: 12 additions & 0 deletions Assets/Demo/Demo00/Materials/mat_demo_greyscale.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: mat_demo_greyscale
m_Shader: {fileID: 4800000, guid: 1bc5c6a70411243779ce486a98012125, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHA_TRANSITION_MAP_MODE_2D
- _BASE_MAP_MODE_2D
Expand All @@ -26,6 +28,7 @@ Material:
m_CustomRenderQueue: 3000
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -105,6 +108,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap2DArray:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap3D:
m_Texture: {fileID: 0}
m_Scale: {x: 3, y: 3}
Expand Down Expand Up @@ -140,8 +147,11 @@ Material:
- _BaseMapOffsetYCoord: 0
- _BaseMapProgress: 0
- _BaseMapProgressCoord: 0
- _BaseMapRandomRowCoord: 0
- _BaseMapRandomRowSelectionEnabled: 0
- _BaseMapRotation: 0
- _BaseMapRotationCoord: 0
- _BaseMapRowCount: 1
- _BaseMapSliceCount: 25
- _BlendDst: 10
- _BlendSrc: 5
Expand Down Expand Up @@ -215,6 +225,8 @@ Material:
- _TintMap3DProgressCoord: 1
- _TintMapOffsetXCoord: 0
- _TintMapOffsetYCoord: 0
- _TintMapProgress: 0
- _TintMapProgressCoord: 0
- _TintMapSliceCount: 4
- _TintRimProgress: 0.5
- _TintRimProgressCoord: 0
Expand Down
15 changes: 11 additions & 4 deletions Assets/Demo/Demo00/Materials/mat_demo_mirror_rotation_doublesided.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ Material:
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- SHADOWCASTER
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
Expand Down Expand Up @@ -109,6 +107,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap2DArray:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TintMap3D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -144,8 +146,11 @@ Material:
- _BaseMapOffsetYCoord: 0
- _BaseMapProgress: 0
- _BaseMapProgressCoord: 0
- _BaseMapRandomRowCoord: 0
- _BaseMapRandomRowSelectionEnabled: 0
- _BaseMapRotation: 0
- _BaseMapRotationCoord: 1
- _BaseMapRowCount: 1
- _BaseMapSliceCount: 25
- _BlendDst: 10
- _BlendSrc: 5
Expand Down Expand Up @@ -219,6 +224,8 @@ Material:
- _TintMap3DProgressCoord: 0
- _TintMapOffsetXCoord: 0
- _TintMapOffsetYCoord: 0
- _TintMapProgress: 0
- _TintMapProgressCoord: 0
- _TintMapSliceCount: 4
- _TintRimProgress: 0.5
- _TintRimProgressCoord: 0
Expand Down
Loading