Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #397 from umasteeringgroup/Feature-13
Feature 13
- Loading branch information
Showing
174 changed files
with
17,631 additions
and
22,152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
.../Editor/Scripts/UMADataEditor.cs.bak.meta → ...roject/Assets/UMA/CompositingShaders.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
198 changes: 198 additions & 0 deletions
198
UMAProject/Assets/UMA/CompositingShaders/AlbedoNormalColormask_Compositer_mat.mat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!21 &2100000 | ||
| Material: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: AlbedoNormalColormask_Compositer_mat | ||
| m_Shader: {fileID: -6465566751694194690, guid: 00a785c0ebde240458a088cf1a70ac00, | ||
| type: 3} | ||
| m_ShaderKeywords: | ||
| m_LightmapFlags: 4 | ||
| m_EnableInstancingVariants: 0 | ||
| m_DoubleSidedGI: 0 | ||
| m_CustomRenderQueue: -1 | ||
| stringTagMap: {} | ||
| disabledShaderPasses: [] | ||
| m_SavedProperties: | ||
| serializedVersion: 3 | ||
| m_TexEnvs: | ||
| - _Albedo: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _Albedo1: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _Albedo2: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _Albedo3: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _AlphaMask1: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _AlphaMask2: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _AlphaMask3: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _BumpMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _ColorMask: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _ColorMask1: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _ColorMask2: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _ColorMask3: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _DetailAlbedoMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _DetailMask: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _DetailNormalMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _EmissionMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _MainTex: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _MetallicGlossMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _NormalMask: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _NormalMask1: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _NormalMask2: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _NormalMask3: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _OcclusionMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _ParallaxMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| m_Floats: | ||
| - _BumpScale: 1 | ||
| - _ColorModulation: 1 | ||
| - _Cutoff: 0.5 | ||
| - _DetailNormalMapScale: 1 | ||
| - _DstBlend: 0 | ||
| - _GlossMapScale: 1 | ||
| - _Glossiness: 0.5 | ||
| - _GlossyReflections: 1 | ||
| - _Metallic: 0 | ||
| - _MetallicModulation: 1 | ||
| - _Mode: 0 | ||
| - _NormalStrength0: 1 | ||
| - _NormalStrength1: 1 | ||
| - _NormalStrength2: 1 | ||
| - _NormalStrength3: 1 | ||
| - _OcclusionStrength: 1 | ||
| - _OverlayCount: 0 | ||
| - _Parallax: 0.02 | ||
| - _SmoothnessModulation: 1 | ||
| - _SmoothnessTextureChannel: 0 | ||
| - _SpecularHighlights: 1 | ||
| - _SrcBlend: 1 | ||
| - _Tile0_0: 1 | ||
| - _Tile0_1: 1 | ||
| - _Tile0_2: 1 | ||
| - _Tile1_0: 1 | ||
| - _Tile1_1: 1 | ||
| - _Tile1_2: 1 | ||
| - _Tile2_0: 1 | ||
| - _Tile2_1: 1 | ||
| - _Tile2_2: 1 | ||
| - _Tile3_0: 1 | ||
| - _Tile3_1: 1 | ||
| - _Tile3_2: 1 | ||
| - _UVSec: 0 | ||
| - _ZWrite: 1 | ||
| m_Colors: | ||
| - _Add0_0: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add0_1: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add0_2: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add1_0: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add1_1: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add1_2: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add2_0: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add2_1: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add2_2: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add3_0: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add3_1: {r: 0, g: 0, b: 0, a: 0} | ||
| - _Add3_2: {r: 0, g: 0, b: 0, a: 0} | ||
| - _AlphaColor0: {r: 1, g: 1, b: 1, a: 1} | ||
| - _AlphaColor1: {r: 1, g: 1, b: 1, a: 1} | ||
| - _AlphaColor2: {r: 1, g: 1, b: 1, a: 1} | ||
| - _AlphaColor3: {r: 1, g: 1, b: 1, a: 1} | ||
| - _BlueColor0: {r: 1, g: 1, b: 1, a: 1} | ||
| - _BlueColor1: {r: 1, g: 1, b: 1, a: 1} | ||
| - _BlueColor2: {r: 1, g: 1, b: 1, a: 1} | ||
| - _BlueColor3: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Color: {r: 1, g: 1, b: 1, a: 1} | ||
| - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} | ||
| - _GreenColor0: {r: 1, g: 1, b: 1, a: 1} | ||
| - _GreenColor1: {r: 1, g: 1, b: 1, a: 1} | ||
| - _GreenColor2: {r: 1, g: 1, b: 1, a: 1} | ||
| - _GreenColor3: {r: 1, g: 1, b: 1, a: 1} | ||
| - _RedColor0: {r: 1, g: 1, b: 1, a: 1} | ||
| - _RedColor1: {r: 1, g: 1, b: 1, a: 1} | ||
| - _RedColor2: {r: 1, g: 1, b: 1, a: 1} | ||
| - _RedColor3: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint0_0: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint0_1: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint0_2: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint1_0: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint1_1: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint1_2: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint2_0: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint2_1: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint2_2: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint3_0: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint3_1: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Tint3_2: {r: 1, g: 1, b: 1, a: 1} |
8 changes: 8 additions & 0 deletions
8
UMAProject/Assets/UMA/CompositingShaders/AlbedoNormalColormask_Compositer_mat.mat.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
UMAProject/Assets/UMA/CompositingShaders/AlbedoNormalColormask_Compositer_sp.umaShaderPack
Large diffs are not rendered by default.
Oops, something went wrong.
10 changes: 10 additions & 0 deletions
10
...ject/Assets/UMA/CompositingShaders/AlbedoNormalColormask_Compositer_sp.umaShaderPack.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
52 changes: 52 additions & 0 deletions
52
UMAProject/Assets/UMA/CompositingShaders/AlbedoNormalColormask_Compositer_umat.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!114 &11400000 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 0} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: ac718b8ce852d1445b8fbe5c323134ac, type: 3} | ||
| m_Name: AlbedoNormalColormask_Compositer_umat | ||
| m_EditorClassIdentifier: | ||
| translateSRP: 0 | ||
| material: {fileID: 2100000, guid: 9abfc81748bd8ee44bc9f6b91859a06d, type: 2} | ||
| secondPass: {fileID: 0} | ||
| materialType: 8 | ||
| channels: | ||
| - channelType: 3 | ||
| textureFormat: 0 | ||
| materialPropertyName: _Albedo | ||
| sourceTextureName: | ||
| Compression: 0 | ||
| DownSample: 0 | ||
| ConvertRenderTexture: 0 | ||
| NonShaderTexture: 0 | ||
| - channelType: 3 | ||
| textureFormat: 0 | ||
| materialPropertyName: _NormalMask | ||
| sourceTextureName: | ||
| Compression: 0 | ||
| DownSample: 0 | ||
| ConvertRenderTexture: 0 | ||
| NonShaderTexture: 0 | ||
| - channelType: 3 | ||
| textureFormat: 0 | ||
| materialPropertyName: _ColorMask | ||
| sourceTextureName: | ||
| Compression: 0 | ||
| DownSample: 0 | ||
| ConvertRenderTexture: 0 | ||
| NonShaderTexture: 0 | ||
| MipMapBias: 0 | ||
| AnisoLevel: 4 | ||
| MatFilterMode: 2 | ||
| Compression: 0 | ||
| shaderParms: [] | ||
| MaskWithCurrentColor: 0 | ||
| maskMultiplier: {r: 1, g: 1, b: 1, a: 1} | ||
| MaterialName: | ||
| ShaderName: |
8 changes: 8 additions & 0 deletions
8
UMAProject/Assets/UMA/CompositingShaders/AlbedoNormalColormask_Compositer_umat.asset.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.