Skip to content

Commit

Permalink
Started working on toon shader. Added Test scene for easy visuals tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuskilian committed May 8, 2020
1 parent 493529b commit 4a5ddbb
Show file tree
Hide file tree
Showing 47 changed files with 25,041 additions and 431 deletions.
9 changes: 9 additions & 0 deletions Assets/Materials/BoardUnits/001Bulbasaur/BodyB.mat
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture0:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _texcoord:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Fade: 0
- Vector1_3B477825: 0.02
Expand Down Expand Up @@ -107,6 +115,7 @@ Material:
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
- __dirty: 1
m_Colors:
- Color_5756F1B: {r: 15.435294, g: 10.917647, b: 0, a: 1}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
Expand Down
3 changes: 2 additions & 1 deletion Assets/Materials/BoardUnits/003Venusaur/BodyB.mat
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: ceda35298f8fd29408590ae6bce626ae, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
Expand All @@ -80,6 +80,7 @@ Material:
- _DissolveThickness: 0.05
- _DstBlend: 0
- _EnvironmentReflections: 1
- _EvoAlphaFade: 1
- _EvoFade: 0
- _EvoSize: 200
- _GlossMapScale: 1
Expand Down
3 changes: 2 additions & 1 deletion Assets/Materials/BoardUnits/005Charmeleon/BodyA.mat
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: 7516d43ac1f2ed248a973231751672da, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
Expand Down Expand Up @@ -81,6 +81,7 @@ Material:
- _DissolveThickness: 0.05
- _DstBlend: 0
- _EnvironmentReflections: 1
- _EvoAlphaFade: 1
- _EvoFade: 0
- _EvoSize: 200
- _Fade: 0.5
Expand Down
3 changes: 2 additions & 1 deletion Assets/Materials/BoardUnits/005Charmeleon/Eye.mat
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: 966dc93fdb9e59149991ccbcc9c84808, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
Expand Down Expand Up @@ -81,6 +81,7 @@ Material:
- _DissolveThickness: 0.05
- _DstBlend: 0
- _EnvironmentReflections: 1
- _EvoAlphaFade: 1
- _EvoFade: 0
- _EvoSize: 200
- _Fade: 0.5
Expand Down
2 changes: 1 addition & 1 deletion Assets/Materials/Prototype.mat
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColor: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
12 changes: 6 additions & 6 deletions Assets/Scenes/Ingame.unity
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ RenderSettings:
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientSkyColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionMode: 1
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
Expand All @@ -44,7 +44,7 @@ RenderSettings:
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 11
m_GIWorkflowMode: 1
m_GIWorkflowMode: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
Expand Down Expand Up @@ -150,14 +150,14 @@ Light:
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
Expand Down
Binary file removed Assets/Scenes/Ingame/LightingData.asset
Binary file not shown.
8 changes: 0 additions & 8 deletions Assets/Scenes/Ingame/LightingData.asset.meta

This file was deleted.

Binary file removed Assets/Scenes/Ingame/ReflectionProbe-0.exr
Binary file not shown.
140 changes: 0 additions & 140 deletions Assets/Scenes/Ingame/ReflectionProbe-0.exr.meta

This file was deleted.

Loading

0 comments on commit 4a5ddbb

Please sign in to comment.