[Fix] fix bugs and grammers

candycat1992 · candycat1992 · commit 27fbed52ca2e · 2016-09-22T15:54:05.000+08:00
diff --git a/Assets/Shaders/Chapter6/Chapter6-BlinnPhong.shader b/Assets/Shaders/Chapter6/Chapter6-BlinnPhong.shader
@@ -35,7 +35,7 @@
 				// Transform the vertex from object space to projection space
 				o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
 				
-				// Transform the normal fram object space to world space
+				// Transform the normal from object space to world space
 				o.worldNormal = mul(v.normal, (float3x3)_World2Object);
 				
 				// Transform the vertex from object spacet to world space
diff --git a/Assets/Shaders/Chapter6/Chapter6-DiffusePixelLevel.shader b/Assets/Shaders/Chapter6/Chapter6-DiffusePixelLevel.shader
@@ -30,7 +30,7 @@
 				// Transform the vertex from object space to projection space
 				o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
 
-				// Transform the normal fram object space to world space
+				// Transform the normal from object space to world space
 				o.worldNormal = mul(v.normal, (float3x3)_World2Object);
 
 				return o;
diff --git a/Assets/Shaders/Chapter6/Chapter6-DiffuseVertexLevel.shader b/Assets/Shaders/Chapter6/Chapter6-DiffuseVertexLevel.shader
@@ -33,7 +33,7 @@
 				// Get ambient term
 				fixed3 ambient = UNITY_LIGHTMODEL_AMBIENT.xyz;
 				
-				// Transform the normal fram object space to world space
+				// Transform the normal from object space to world space
 				fixed3 worldNormal = normalize(mul(v.normal, (float3x3)_World2Object));
 				// Get the light direction in world space
 				fixed3 worldLight = normalize(_WorldSpaceLightPos0.xyz);
diff --git a/Assets/Shaders/Chapter6/Chapter6-HalfLambert.shader b/Assets/Shaders/Chapter6/Chapter6-HalfLambert.shader
@@ -30,7 +30,7 @@
 				// Transform the vertex from object space to projection space
 				o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
 				
-				// Transform the normal fram object space to world space
+				// Transform the normal from object space to world space
 				o.worldNormal = mul(v.normal, (float3x3)_World2Object);
 				
 				return o;
diff --git a/Assets/Shaders/Chapter6/Chapter6-SpecularPixelLevel.shader b/Assets/Shaders/Chapter6/Chapter6-SpecularPixelLevel.shader
@@ -35,7 +35,7 @@
 				// Transform the vertex from object space to projection space
 				o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
 				
-				// Transform the normal fram object space to world space
+				// Transform the normal from object space to world space
 				o.worldNormal = mul(v.normal, (float3x3)_World2Object);
 				// Transform the vertex from object spacet to world space
 				o.worldPos = mul(_Object2World, v.vertex).xyz;
diff --git a/Assets/Shaders/Chapter6/Chapter6-SpecularVertexLevel.shader b/Assets/Shaders/Chapter6/Chapter6-SpecularVertexLevel.shader
@@ -37,7 +37,7 @@
 				// Get ambient term
 				fixed3 ambient = UNITY_LIGHTMODEL_AMBIENT.xyz;
 				
-				// Transform the normal fram object space to world space
+				// Transform the normal from object space to world space
 				fixed3 worldNormal = normalize(mul(v.normal, (float3x3)_World2Object));
 				// Get the light direction in world space
 				fixed3 worldLightDir = normalize(_WorldSpaceLightPos0.xyz);
diff --git a/Assets/Shaders/Chapter9/Chapter9-AlphaBlendWithShadow.shader b/Assets/Shaders/Chapter9/Chapter9-AlphaBlendWithShadow.shader
@@ -52,7 +52,7 @@
 
 			 	o.uv = TRANSFORM_TEX(v.texcoord, _MainTex);
 			 	
-			 	// Pass shadow coordinates to pixel shade
+			 	// Pass shadow coordinates to pixel shader
 			 	TRANSFER_SHADOW(o);
 			 	
 			 	return o;
diff --git a/Assets/Shaders/Chapter9/Chapter9-AlphaTestWithShadow.shader b/Assets/Shaders/Chapter9/Chapter9-AlphaTestWithShadow.shader
@@ -51,7 +51,7 @@
 
 			 	o.uv = TRANSFORM_TEX(v.texcoord, _MainTex);
 			 	
-			 	// Pass shadow coordinates to pixel shade
+			 	// Pass shadow coordinates to pixel shader
 			 	TRANSFER_SHADOW(o);
 			 	
 			 	return o;
diff --git a/Assets/Shaders/Chapter9/Chapter9-AttenuationAndShadowUseBuildInFunctions.shader b/Assets/Shaders/Chapter9/Chapter9-AttenuationAndShadowUseBuildInFunctions.shader
@@ -47,7 +47,7 @@
 			 	
 			 	o.worldPos = mul(_Object2World, v.vertex).xyz;
 			 	
-			 	// Pass shadow coordinates to pixel shade
+			 	// Pass shadow coordinates to pixel shader
 			 	TRANSFER_SHADOW(o);
 			 	
 			 	return o;
@@ -117,7 +117,7 @@
 			 	
 			 	o.worldPos = mul(_Object2World, v.vertex).xyz;
 			 	
-			 	// Pass shadow coordinates to pixel shade
+			 	// Pass shadow coordinates to pixel shader
 			 	TRANSFER_SHADOW(o);
 			 	
 			 	return o;
diff --git a/Assets/Shaders/Chapter9/Chapter9-ForwardRendering.shader b/Assets/Shaders/Chapter9/Chapter9-ForwardRendering.shader
@@ -127,10 +127,17 @@
 				#ifdef USING_DIRECTIONAL_LIGHT
 					fixed atten = 1.0;
 				#else
-					float3 lightCoord = mul(_LightMatrix0, float4(i.worldPos, 1)).xyz;
-					fixed atten = tex2D(_LightTexture0, dot(lightCoord, lightCoord).rr).UNITY_ATTEN_CHANNEL;
+					#if defined (POINT)
+				        float3 lightCoord = mul(_LightMatrix0, float4(i.worldPos, 1)).xyz;
+				        fixed atten = tex2D(_LightTexture0, dot(lightCoord, lightCoord).rr).UNITY_ATTEN_CHANNEL;
+				    #elif defined (SPOT)
+				        float4 lightCoord = mul(_LightMatrix0, float4(i.worldPos, 1));
+				        fixed atten = (lightCoord.z > 0) * tex2D(_LightTexture0, lightCoord.xy / lightCoord.w + 0.5).w * tex2D(_LightTextureB0, dot(lightCoord, lightCoord).rr).UNITY_ATTEN_CHANNEL;
+				    #else
+				        fixed atten = 1.0;
+				    #endif
 				#endif
-				
+
 				return fixed4((diffuse + specular) * atten, 1.0);
 			}
 			
