CCEffectLighting - Disable lighting if the primary color or the normal map are transparent

Thayer J Andrews · Thayer J Andrews · commit a33f8d2ab499 · 2014-10-09T17:48:36.000-07:00
diff --git a/cocos2d/CCEffectLighting.m b/cocos2d/CCEffectLighting.m
@@ -106,7 +106,7 @@ +(NSMutableArray *)buildFragmentFunctionsWithLights:(NSArray*)lights andSpecular
                                      vec4 normalMap = texture2D(cc_NormalMapTexture, cc_FragTexCoord2);
                                      vec3 tangentSpaceNormal = normalize(normalMap.xyz * 2.0 - 1.0);
                                      
-                                     if (normalMap.a == 0.0)
+                                     if ((inputValue.a * normalMap.a) == 0.0)
                                      {
                                          return vec4(0,0,0,0);
                                      }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ +(NSMutableArray )buildFragmentFunctionsWithLights:(NSArray)lights andSpecular`
`106`	`106`	`vec4 normalMap = texture2D(cc_NormalMapTexture, cc_FragTexCoord2);`
`107`	`107`	`vec3 tangentSpaceNormal = normalize(normalMap.xyz * 2.0 - 1.0);`
`108`	`108`
`109`		`- if (normalMap.a == 0.0)`
	`109`	`+ if ((inputValue.a * normalMap.a) == 0.0)`
`110`	`110`	`{`
`111`	`111`	`return vec4(0,0,0,0);`
`112`	`112`	`}`