This commit is contained in:
PedroEdiaz
2024-11-14 21:15:24 -06:00
parent 569a8d0f42
commit 6dbc758cc3

View File

@@ -25,7 +25,7 @@ const char * vs =
" index=idx;" " index=idx;"
" vec3 aNormal = vec3(aNormal_x,aNormal_y,aNormal_z);" " vec3 aNormal = vec3(aNormal_x,aNormal_y,aNormal_z);"
" vec3 aPos = vec3(aPos_x,aPos_y,aPos_z);" " vec3 aPos = vec3(aPos_x,aPos_y,aPos_z);"
" Normal = normalize(mat3(transpose(inverse(rot*mdl))) * aNormal);" " Normal = mat3(transpose(inverse(rot*mdl))) * aNormal;"
" gl_Position = fix * rot * mdl * vec4( aPos, 1.0 );\n" " gl_Position = fix * rot * mdl * vec4( aPos, 1.0 );\n"
" FragPos = vec3( rot * mdl * vec4(aPos, 1.0));" " FragPos = vec3( rot * mdl * vec4(aPos, 1.0));"
"}"; "}";
@@ -66,10 +66,11 @@ const char * fs =
" vec3 lightPos = viewPos\n;" " vec3 lightPos = viewPos\n;"
" vec3 lightDir = normalize(lightPos - FragPos);\n" " vec3 lightDir = normalize(lightPos - FragPos);\n"
" vec3 reflectDir = reflect(-lightDir, Normal);\n" " vec3 reflectDir = reflect(-lightDir, Normal);\n"
" vec3 hafwayDir = normalize(lightDir+viewDir);\n"
" float specular = pow(max(dot(normalize(Normal), hafwayDir),0.0), 32);\n"
" float specular = pow(max(dot(viewDir, reflectDir),0.0), 16);\n"
" float diffuse = max(dot(Normal, lightDir),0.0);\n" " float diffuse = max(dot(Normal, lightDir),0.0);\n"
" vec3 result = (0.5 + 0.5 * diffuse + specular) * color.rgb;\n" " vec3 result = (0.5 + 0.5 * diffuse + specular) * color.rgb;\n"