瀏覽代碼

Change GetIntensity, make it same to Color::Luma().[ci skip]

aster2013 11 年之前
父節點
當前提交
392efab9d7
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      bin/CoreData/Shaders/GLSL/Lighting.glsl
  2. 1 1
      bin/CoreData/Shaders/HLSL/Lighting.hlsl

+ 1 - 1
bin/CoreData/Shaders/GLSL/Lighting.glsl

@@ -113,7 +113,7 @@ float GetSpecular(vec3 normal, vec3 eyeVec, vec3 lightDir, float specularPower)
 
 
 float GetIntensity(vec3 color)
 float GetIntensity(vec3 color)
 {
 {
-    return dot(color, vec3(0.333));
+    return dot(color, vec3(0.299, 0.587, 0.114));
 }
 }
 
 
 #ifdef SHADOW
 #ifdef SHADOW

+ 1 - 1
bin/CoreData/Shaders/HLSL/Lighting.hlsl

@@ -126,7 +126,7 @@ float GetSpecular(float3 normal, float3 eyeVec, float3 lightDir, float specularP
 
 
 float GetIntensity(float3 color)
 float GetIntensity(float3 color)
 {
 {
-    return dot(color, float3(0.333, 0.333, 0.333));
+    return dot(color, float3(0.299, 0.587, 0.114));
 }
 }
 
 
 #ifdef SHADOW
 #ifdef SHADOW