zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Unbreak mirrors.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1382 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-05-16 01:28:42 +00:00
parent 854c72263c
commit b1f358de6f
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/build/src/polymer.c
View file

@ -255,7 +255,6 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
"\n", "\n",
// frag_prog // frag_prog
" diffuseTexel = texture2D(diffuseMap, commonTexCoord.st);\n" " diffuseTexel = texture2D(diffuseMap, commonTexCoord.st);\n"
" specTexel.rgb = diffuseTexel.rgb * diffuseTexel.a;\n"
" if (isLightingPass == 0)\n" " if (isLightingPass == 0)\n"
" result *= diffuseTexel;\n" " result *= diffuseTexel;\n"
"\n", "\n",
@ -308,6 +307,8 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
"\n", "\n",
// frag_prog // frag_prog
" specTexel = texture2D(specMap, commonTexCoord.st);\n" " specTexel = texture2D(specMap, commonTexCoord.st);\n"
"\n"
" isSpecularMapped = 1;\n"
"\n", "\n",
}, },
{ {
@ -491,6 +492,9 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
" gl_LightSource[0].diffuse.rgb * lightAttenuation * spotAttenuation;\n" " gl_LightSource[0].diffuse.rgb * lightAttenuation * spotAttenuation;\n"
" result += vec4(lightDiffuse * diffuseTexel.a * diffuseTexel.rgb * NdotL, 0.0);\n" " result += vec4(lightDiffuse * diffuseTexel.a * diffuseTexel.rgb * NdotL, 0.0);\n"
"\n" "\n"
" if (isSpecularMapped == 1)\n"
" specTexel.rgb = diffuseTexel.rgb * diffuseTexel.a;\n"
"\n"
" lightSpecular = pow( max(dot(R, E), 0.0), specularMaterial.x * specTexel.a) * specularMaterial.y;\n" " lightSpecular = pow( max(dot(R, E), 0.0), specularMaterial.x * specTexel.a) * specularMaterial.y;\n"
" result += vec4(lightDiffuse * specTexel.rgb * lightSpecular, 0.0);\n" " result += vec4(lightDiffuse * specTexel.rgb * lightSpecular, 0.0);\n"
"\n", "\n",
@ -520,6 +524,7 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
" vec4 normalTexel;\n" " vec4 normalTexel;\n"
" int isLightingPass = 0;\n" " int isLightingPass = 0;\n"
" int isNormalMapped = 0;\n" " int isNormalMapped = 0;\n"
" int isSpecularMapped = 0;\n"
" vec3 eyeVec;\n" " vec3 eyeVec;\n"
" int isSpotLight = 0;\n" " int isSpotLight = 0;\n"
" vec3 spotVector;\n" " vec3 spotVector;\n"