Unbreak polymer-broken.

git-svn-id: https://svn.eduke32.com/eduke32@1775 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2011-01-19 03:22:25 +00:00
parent 653a58574c
commit c54304217c
3 changed files with 3 additions and 9 deletions

View file

@ -157,7 +157,7 @@ typedef struct s_prrograminfo {
} _prprograminfo; } _prprograminfo;
#define PR_INFO_LOG_BUFFER_SIZE 8192 #define PR_INFO_LOG_BUFFER_SIZE 8192
#define PR_HIGHPALOOKUP_BIT_DEPTH 5 #define PR_HIGHPALOOKUP_BIT_DEPTH 7
#define PR_HIGHPALOOKUP_DIM (1 << PR_HIGHPALOOKUP_BIT_DEPTH) #define PR_HIGHPALOOKUP_DIM (1 << PR_HIGHPALOOKUP_BIT_DEPTH)
#define PR_HIGHPALOOKUP_DATA_SIZE (4 * PR_HIGHPALOOKUP_DIM * \ #define PR_HIGHPALOOKUP_DATA_SIZE (4 * PR_HIGHPALOOKUP_DIM * \
PR_HIGHPALOOKUP_DIM * \ PR_HIGHPALOOKUP_DIM * \

View file

@ -1169,7 +1169,6 @@ static int32_t defsparser(scriptfile *script)
} }
#if defined(POLYMOST) && defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
if (palnum == 0 || palnum >= NORMALPAL)
switch (md_defineskin(lastmodelid, skinfn, palnum, max(0,modelskin), surfnum, param, specpower, specfactor)) switch (md_defineskin(lastmodelid, skinfn, palnum, max(0,modelskin), surfnum, param, specpower, specfactor))
{ {
case 0: case 0:
@ -1671,7 +1670,6 @@ static int32_t defsparser(scriptfile *script)
xscale = 1.0f / xscale; xscale = 1.0f / xscale;
yscale = 1.0f / yscale; yscale = 1.0f / yscale;
if (pal == 0)
hicsetsubsttex(tile,pal,fn,alphacut,xscale,yscale, specpower, specfactor,flags); hicsetsubsttex(tile,pal,fn,alphacut,xscale,yscale, specpower, specfactor,flags);
} }
break; break;

View file

@ -320,12 +320,8 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
"\n", "\n",
// frag_prog // frag_prog
" if (isLightingPass == 0)\n" " if (isLightingPass == 0)\n"
/* " result.rgb = texture3D(highPalookupMap, result.rgb * 0.9921875 + 0.00390625).rgb;\n" " result.rgb = texture3D(highPalookupMap, result.rgb).rgb;\n"
" diffuseTexel.rgb = texture3D(highPalookupMap, diffuseTexel.rgb * 0.9921875 + 0.00390625).rgb;\n"*/ " diffuseTexel.rgb = texture3D(highPalookupMap, diffuseTexel.rgb).rgb;\n"
/* " result.rgb = texture3D(highPalookupMap, result.rgb * 0.984375 + 0.0078125).rgb;\n"
" diffuseTexel.rgb = texture3D(highPalookupMap, diffuseTexel.rgb * 0.984375 + 0.0078125).rgb;\n"*/
" result.rgb = texture3D(highPalookupMap, result.rgb * 0.96875 + 0.015625).rgb;\n"
" diffuseTexel.rgb = texture3D(highPalookupMap, diffuseTexel.rgb * 0.96875 + 0.015625).rgb;\n"
"\n", "\n",
}, },
{ {