Skip to content

Refactor: Shader and Material Consolidation [MTT-2900] #648

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
merged 8 commits into from
May 12, 2022
Merged

Refactor: Shader and Material Consolidation [MTT-2900] #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
daa3a6e
First go at re-organizing / cleaning house of all of our VFX material…
jilfranco-unity May 10, 2022
0a07360
Another pass on the shader consolidation, more renames, as well as op…
jilfranco-unity May 11, 2022
15e64b1
Merge branch 'develop' into chore/shader-consolidation
jilfranco-unity May 11, 2022
f81872a
Reserialization of these mats
jilfranco-unity May 11, 2022
bfe0fc8
Merge branch 'develop' into chore/shader-consolidation
jilfranco-unity May 11, 2022
4e734b0
Renamed this to match my shadergraph naming convention
jilfranco-unity May 11, 2022
0e79cb2
Recommiting M_Lava to hopefully fix yamato test issue
jilfranco-unity May 11, 2022
5cd96a3
Fixed up a bunch of broken references--I think I should've saved the …
jilfranco-unity May 12, 2022
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
16 changes: 14 additions & 2 deletions Assets/BossRoom/Material/Characters/Character_Shadow.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Character_Shadow
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
m_ValidKeywords:
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
Expand Down Expand Up @@ -52,6 +52,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 6eb539aefcd5a7846af91c0a77161b92, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: 6eb539aefcd5a7846af91c0a77161b92, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -86,10 +90,12 @@ Material:
- _Blend: 0
- _BlendOp: 0
- _BumpScale: 1
- _CastShadows: 0
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _Depth_Blend: 0
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 10
Expand All @@ -100,6 +106,7 @@ Material:
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SampleGI: 0
Expand All @@ -108,12 +115,17 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 5
- _Surface: 1
- _UseAlpha: 1
- _UseSoftParticles: 0
- _WorkflowMode: 1
- _ZTest: 4
- _ZWrite: 0
- _ZWriteControl: 0
m_Colors:
- _BaseColor: {r: 0, g: 0, b: 0, a: 0.54509807}
- _Color: {r: 0, g: 0, b: 0, a: 0.54509807}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &2085413229483183920
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Boy.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.771
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Girl.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.778
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
112 changes: 0 additions & 112 deletions Assets/BossRoom/Material/Characters/Toon/Hair_Imp_Bomb.mat
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Hair_Mage_Boy.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.778
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Hair_Tank_Boy.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.778
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Hair_Tank_Girl.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.588
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Head_Archer_Boy.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.667
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Head_Archer_Girl.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.667
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Head_Mage_Boy.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.667
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Head_Tank_Boy.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.667
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Head_Tank_Girl.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.674
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Helmet_Imp.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.428
- _RimThreshold: 0.123
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Torso_Boss.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.208
- _RimThreshold: 0.595
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Torso_Mage_Girl.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.366
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Weapons_Mage.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.264
- _RimThreshold: 0.058
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Weapons_Tank.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.343
- _RimThreshold: 0.145
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/BossRoom/Material/Characters/Toon/Weapons_VandalImp.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.384
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
2 changes: 1 addition & 1 deletion .../BossRoom/Material/Dungeon/boss_arena.mat → ...BossRoom/Material/Dungeon/M_BossFloor.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: boss_arena
m_Name: M_BossFloor
m_Shader: {fileID: -6465566751694194690, guid: 58d945a80f1f06c4db5c1fa66a0afc55, type: 3}
m_ValidKeywords: []
m_InvalidKeywords:
Expand Down
0 ...Room/Material/Dungeon/boss_arena.mat.meta → ...oom/Material/Dungeon/M_BossFloor.mat.meta
View file
Open in desktop
File renamed without changes.
Loading