Fix illumination
This commit is contained in:
@@ -16,9 +16,9 @@ const char * vs =
|
||||
"void main()"
|
||||
"{"
|
||||
" index=idx;"
|
||||
" Normal = mat3(transpose(inverse(rot*mdl))) * aNormal;"
|
||||
" gl_Position = fix * rot * mdl * vec4( aPos, 1.0 );\n"
|
||||
"Normal = aNormal;"
|
||||
"FragPos = vec3( rot * vec4(aPos, 1.0));"
|
||||
" FragPos = vec3( rot * mdl * vec4(aPos, 1.0));"
|
||||
"}";
|
||||
|
||||
|
||||
@@ -35,16 +35,16 @@ const char * fs =
|
||||
|
||||
"void main()"
|
||||
"{"
|
||||
|
||||
" vec4 color = texture( palette, vec3( 0, 0, index ) ).rgba;"
|
||||
" vec3 lightColor = vec3(1,1,1);"
|
||||
" vec3 lightPos = vec3(10,10,10);"
|
||||
" vec3 lightPos = vec3(0,000,-15);"
|
||||
" vec3 lightDir = normalize(lightPos - FragPos);"
|
||||
" vec3 norm = normalize(Normal);"
|
||||
|
||||
" vec3 lightDir = normalize(lightPos - FragPos);"
|
||||
|
||||
" float diffuse = max(dot(norm, lightDir), 0.0);"
|
||||
" float ambient = 0.1;"
|
||||
|
||||
" FragColor = vec4((ambient + diffuse)*lightColor,1.0)* texture( palette, vec3( 0, 0, index ) ).rgba;"
|
||||
" float ambient = 0.5;"
|
||||
" FragColor = vec4((ambient + diffuse)*lightColor,1.0)*color;"
|
||||
"}";
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user