Merge pull request unity3d-jp#2 from unity3d-jp/unitychan-shader-fix

keijiro · keijiro · commit c667f65612f6 · 2014-10-24T11:05:42.000+09:00
Removed influence of light color's alpha from blending shaders.
diff --git a/Assets/UnityChan/CandyRockStar/Shader/CharaSkin.cg b/Assets/UnityChan/CandyRockStar/Shader/CharaSkin.cg
@@ -97,5 +97,7 @@ float4 frag( v2f i ) : COLOR
 	combinedColor = lerp( shadowColor, combinedColor, attenuation );
 #endif
 
-	return float4_t( combinedColor, diffSamplerColor.a ) * _Color * _LightColor0;
+	float4_t finalColor = float4_t( combinedColor, diffSamplerColor.a ) * _Color;
+	finalColor.rgb *= _LightColor0.rgb;
+	return finalColor;
 }

Original file line number	Diff line number	Diff line change
`@@ -97,5 +97,7 @@ float4 frag( v2f i ) : COLOR`
`97`	`97`	`combinedColor = lerp( shadowColor, combinedColor, attenuation );`
`98`	`98`	`#endif`
`99`	`99`
`100`		`- return float4_t( combinedColor, diffSamplerColor.a ) * _Color * _LightColor0;`
	`100`	`+ float4_t finalColor = float4_t( combinedColor, diffSamplerColor.a ) * _Color;`
	`101`	`+ finalColor.rgb *= _LightColor0.rgb;`
	`102`	`+ return finalColor;`
`101`	`103`	`}`