diff --git a/polymer/eduke32/build/include/polymer.h b/polymer/eduke32/build/include/polymer.h index e4a5de13a..a099e0e51 100644 --- a/polymer/eduke32/build/include/polymer.h +++ b/polymer/eduke32/build/include/polymer.h @@ -70,8 +70,8 @@ typedef enum { PR_BIT_DIFFUSE_MAP, PR_BIT_DIFFUSE_DETAIL_MAP, PR_BIT_DIFFUSE_MODULATION, - PR_BIT_HIGHPALOOKUP_MAP, PR_BIT_DIFFUSE_MAP2, + PR_BIT_HIGHPALOOKUP_MAP, PR_BIT_SPECULAR_MAP, PR_BIT_SPECULAR_MATERIAL, PR_BIT_MIRROR_MAP, diff --git a/polymer/eduke32/build/src/polymer.c b/polymer/eduke32/build/src/polymer.c index 7d20f5413..fb7613167 100644 --- a/polymer/eduke32/build/src/polymer.c +++ b/polymer/eduke32/build/src/polymer.c @@ -293,20 +293,7 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = { "", // frag_prog " if (isLightingPass == 0)\n" - " diffuseTexel *= vec4(gl_Color);\n" - "\n", - }, - { - 1 << PR_BIT_HIGHPALOOKUP_MAP, - // vert_def - "", - // vert_prog - "", - // frag_def - "uniform sampler3D highPalookupMap;\n" - "\n", - // frag_prog - " diffuseTexel.rgb = texture3D(highPalookupMap, diffuseTexel.rgb).rgb;\n" + " result *= vec4(gl_Color);\n" "\n", }, { @@ -322,6 +309,21 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = { " result *= diffuseTexel;\n" "\n", }, + { + 1 << PR_BIT_HIGHPALOOKUP_MAP, + // vert_def + "", + // vert_prog + "", + // frag_def + "uniform sampler3D highPalookupMap;\n" + "\n", + // frag_prog + " if (isLightingPass == 0)\n" + " result.rgb = texture3D(highPalookupMap, result.rgb).rgb;\n" + " diffuseTexel.rgb = texture3D(highPalookupMap, diffuseTexel.rgb).rgb;\n" + "\n", + }, { 1 << PR_BIT_SPECULAR_MAP, // vert_def