Skip to content

Commit

Permalink
Merge pull request #31 from cubedparadox/development
Browse files Browse the repository at this point in the history
Moved pragmas from FlatLitToonCore.cginc to Flat Lit Toon.shader.
  • Loading branch information
TCL987 authored Jan 12, 2018
2 parents c61d38d + 3a46d71 commit c504c12
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
10 changes: 10 additions & 0 deletions Assets/Cubed's Unity Shaders/Shaders/Flat Lit Toon.shader
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ Shader "CubedParadox/Flat Lit Toon"
#pragma geometry geom
#pragma fragment frag

#pragma only_renderers d3d11 glcore gles
#pragma target 4.0

#pragma multi_compile_fwdbase
#pragma multi_compile_fog

Expand Down Expand Up @@ -119,6 +122,9 @@ Shader "CubedParadox/Flat Lit Toon"
#pragma geometry geom
#pragma fragment frag

#pragma only_renderers d3d11 glcore gles
#pragma target 4.0

#pragma multi_compile_fwdadd_fullshadows
#pragma multi_compile_fog

Expand Down Expand Up @@ -171,6 +177,10 @@ Shader "CubedParadox/Flat Lit Toon"
#include "FlatLitToonShadows.cginc"

#pragma multi_compile_shadowcaster
#pragma fragmentoption ARB_precision_hint_fastest

#pragma only_renderers d3d11 glcore gles
#pragma target 4.0

#pragma vertex vertShadowCaster
#pragma fragment fragShadowCaster
Expand Down
5 changes: 0 additions & 5 deletions Assets/Cubed's Unity Shaders/Shaders/FlatLitToonCore.cginc
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
#include "AutoLight.cginc"
#include "Lighting.cginc"

#pragma multi_compile_fog
#pragma only_renderers d3d9 d3d11 glcore gles
#pragma target 4.0
//#pragma addshadow

uniform sampler2D _MainTex; uniform float4 _MainTex_ST;
uniform sampler2D _ColorMask; uniform float4 _ColorMask_ST;
uniform sampler2D _EmissionMap; uniform float4 _EmissionMap_ST;
Expand Down
3 changes: 0 additions & 3 deletions Assets/Cubed's Unity Shaders/Shaders/FlatLitToonShadows.cginc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
#include "UnityCG.cginc"
#include "UnityShaderVariables.cginc"

#pragma multi_compile_shadowcaster
#pragma fragmentoption ARB_precision_hint_fastest

// Do dithering for alpha blended shadows on SM3+/desktop;
// on lesser systems do simple alpha-tested shadows
#if defined(_ALPHABLEND_ON) || defined(_ALPHAPREMULTIPLY_ON)
Expand Down

0 comments on commit c504c12

Please sign in to comment.