Defs: Add "artquality" subtoken to textures, model skins, and skyboxes, which grants the texture HICR_ARTIMMUNITY. In effect, this implies "nodownsize" and signals that texture compression would be undesirable, but okay using r_texcompr mode 2 (aggressive).

git-svn-id: https://svn.eduke32.com/eduke32@5705 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-05-02 18:29:35 +00:00
parent b529af4b55
commit 1fcf91d933

View file

@ -78,6 +78,7 @@ enum scripttoken_t
T_RED,T_GREEN,T_BLUE, T_RED,T_GREEN,T_BLUE,
T_TEXTURE,T_ALPHACUT,T_XSCALE,T_YSCALE,T_SPECPOWER,T_SPECFACTOR,T_NOCOMPRESS,T_NODOWNSIZE, T_TEXTURE,T_ALPHACUT,T_XSCALE,T_YSCALE,T_SPECPOWER,T_SPECFACTOR,T_NOCOMPRESS,T_NODOWNSIZE,
T_FORCEFILTER, T_FORCEFILTER,
T_ARTQUALITY,
T_ORIGSIZEX,T_ORIGSIZEY, T_ORIGSIZEX,T_ORIGSIZEY,
T_UNDEFMODEL,T_UNDEFMODELRANGE,T_UNDEFMODELOF,T_UNDEFTEXTURE,T_UNDEFTEXTURERANGE, T_UNDEFMODEL,T_UNDEFMODELRANGE,T_UNDEFMODELOF,T_UNDEFTEXTURE,T_UNDEFTEXTURERANGE,
T_ALPHAHACK,T_ALPHAHACKRANGE, T_ALPHAHACK,T_ALPHAHACKRANGE,
@ -1557,6 +1558,7 @@ static int32_t defsparser(scriptfile *script)
{ "nocompress", T_NOCOMPRESS }, { "nocompress", T_NOCOMPRESS },
{ "nodownsize", T_NODOWNSIZE }, { "nodownsize", T_NODOWNSIZE },
{ "forcefilter", T_FORCEFILTER }, { "forcefilter", T_FORCEFILTER },
{ "artquality", T_ARTQUALITY },
}; };
if (scriptfile_getbraces(script,&skinend)) break; if (scriptfile_getbraces(script,&skinend)) break;
@ -1583,6 +1585,8 @@ static int32_t defsparser(scriptfile *script)
flags |= HICR_NODOWNSIZE; break; flags |= HICR_NODOWNSIZE; break;
case T_FORCEFILTER: case T_FORCEFILTER:
flags |= HICR_FORCEFILTER; break; flags |= HICR_FORCEFILTER; break;
case T_ARTQUALITY:
flags |= HICR_ARTIMMUNITY; break;
#endif #endif
} }
} }
@ -1888,6 +1892,7 @@ static int32_t defsparser(scriptfile *script)
{ "nocompress", T_NOCOMPRESS }, { "nocompress", T_NOCOMPRESS },
{ "nodownsize", T_NODOWNSIZE }, { "nodownsize", T_NODOWNSIZE },
{ "forcefilter", T_FORCEFILTER }, { "forcefilter", T_FORCEFILTER },
{ "artquality", T_ARTQUALITY },
}; };
if (scriptfile_getbraces(script,&modelend)) break; if (scriptfile_getbraces(script,&modelend)) break;
@ -1919,6 +1924,8 @@ static int32_t defsparser(scriptfile *script)
flags |= HICR_NODOWNSIZE; break; flags |= HICR_NODOWNSIZE; break;
case T_FORCEFILTER: case T_FORCEFILTER:
flags |= HICR_FORCEFILTER; break; flags |= HICR_FORCEFILTER; break;
case T_ARTQUALITY:
flags |= HICR_ARTIMMUNITY; break;
#endif #endif
} }
} }
@ -2229,6 +2236,7 @@ static int32_t defsparser(scriptfile *script)
{ "nocompress", T_NOCOMPRESS }, { "nocompress", T_NOCOMPRESS },
{ "nodownsize", T_NODOWNSIZE }, { "nodownsize", T_NODOWNSIZE },
{ "forcefilter", T_FORCEFILTER }, { "forcefilter", T_FORCEFILTER },
{ "artquality", T_ARTQUALITY },
{ "orig_sizex", T_ORIGSIZEX }, { "orig_sizey", T_ORIGSIZEY } { "orig_sizex", T_ORIGSIZEX }, { "orig_sizey", T_ORIGSIZEY }
}; };
@ -2257,6 +2265,8 @@ static int32_t defsparser(scriptfile *script)
flags |= HICR_NODOWNSIZE; break; flags |= HICR_NODOWNSIZE; break;
case T_FORCEFILTER: case T_FORCEFILTER:
flags |= HICR_FORCEFILTER; break; flags |= HICR_FORCEFILTER; break;
case T_ARTQUALITY:
flags |= HICR_ARTIMMUNITY; break;
#endif #endif
case T_ORIGSIZEX: case T_ORIGSIZEX:
scriptfile_getnumber(script, &xsiz); scriptfile_getnumber(script, &xsiz);
@ -2321,6 +2331,7 @@ static int32_t defsparser(scriptfile *script)
{ "nocompress", T_NOCOMPRESS }, { "nocompress", T_NOCOMPRESS },
{ "nodownsize", T_NODOWNSIZE }, { "nodownsize", T_NODOWNSIZE },
{ "forcefilter", T_FORCEFILTER }, { "forcefilter", T_FORCEFILTER },
{ "artquality", T_ARTQUALITY },
}; };
if (EDUKE32_PREDICT_FALSE(scriptfile_getbraces(script,&detailend))) break; if (EDUKE32_PREDICT_FALSE(scriptfile_getbraces(script,&detailend))) break;
@ -2345,6 +2356,8 @@ static int32_t defsparser(scriptfile *script)
flags |= HICR_NODOWNSIZE; break; flags |= HICR_NODOWNSIZE; break;
case T_FORCEFILTER: case T_FORCEFILTER:
flags |= HICR_FORCEFILTER; break; flags |= HICR_FORCEFILTER; break;
case T_ARTQUALITY:
flags |= HICR_ARTIMMUNITY; break;
#endif #endif
default: default:
break; break;