zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

New Polymer feature: shitty mode.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3729 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
Plagman 2013-05-06 03:12:38 +00:00
parent c2a5b60a14
commit 6dac6ac1c0
5 changed files with 173 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/build/include/build.h
View file

@ -676,6 +676,7 @@ EXTERN int16_t sintable[2048];
EXTERN uint8_t palette[768];
EXTERN int16_t numshades;
EXTERN char *palookup[MAXPALOOKUPS];
EXTERN uint8_t **basepaltableptr;
EXTERN char parallaxtype, showinvisibility;
EXTERN int32_t parallaxyoffs, parallaxyscale;
EXTERN int32_t g_visibility, parallaxvisibility;

10
polymer/eduke32/build/include/polymer.h
View file

@ -54,6 +54,7 @@ extern int32_t pr_overridespecular;
extern float pr_specularpower;
extern float pr_specularfactor;
extern int32_t pr_highpalookups;
extern int32_t pr_artmapping;
extern int32_t pr_overridehud;
extern float pr_hudxadd;
extern float pr_hudyadd;
@ -75,6 +76,7 @@ typedef enum {
PR_BIT_ANIM_INTERPOLATION,
PR_BIT_LIGHTING_PASS,
PR_BIT_NORMAL_MAP,
PR_BIT_ART_MAP,
PR_BIT_DIFFUSE_MAP,
PR_BIT_DIFFUSE_DETAIL_MAP,
PR_BIT_DIFFUSE_MODULATION,
@ -102,6 +104,10 @@ typedef struct s_prmaterial {
GLuint normalmap;
GLfloat normalbias[2];
GLfloat* tbn;
// PR_BIT_ART_MAP
GLuint artmap;
GLuint basepalmap;
GLuint lookupmap;
// PR_BIT_DIFFUSE_MAP
GLuint diffusemap;
GLfloat diffusescale[2];
@ -137,6 +143,10 @@ typedef struct s_prrograminfo {
GLint uniform_eyePosition;
GLint uniform_normalMap;
GLint uniform_normalBias;
// PR_BIT_ART_MAP
GLuint uniform_artMap;
GLuint uniform_basePalMap;
GLuint uniform_lookupMap;
// PR_BIT_DIFFUSE_MAP
GLint uniform_diffuseMap;
GLint uniform_diffuseScale;

1
polymer/eduke32/build/src/engine.c
View file

@ -2411,7 +2411,6 @@ int32_t totalclocklock;
char apptitle[256] = "Build Engine";
static uint8_t **basepaltableptr;
static uint8_t basepalreset=1;
uint8_t basepalcount;
uint8_t curbasepal;

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

@ -33,6 +33,7 @@ int32_t pr_overridespecular = 0;
float pr_specularpower = 15.0f;
float pr_specularfactor = 1.0f;
int32_t pr_highpalookups = 1;
int32_t pr_artmapping = 0;
int32_t pr_overridehud = 0;
float pr_hudxadd = 0.0f;
float pr_hudyadd = 0.0f;
@ -58,6 +59,13 @@ _prsprite *prsprites[MAXSPRITES];
_prmaterial mdspritematerial;
_prhighpalookup prhighpalookups[MAXBASEPALS][MAXPALOOKUPS];
// One U8 texture per tile
GLuint prartmaps[MAXTILES];
// 256 U8U8U8 values per basepal
GLuint prbasepalmaps[MAXBASEPALS];
// numshades full indirections (32*256) per lookup
GLuint prlookups[MAXPALOOKUPS];
static const GLfloat vertsprite[4 * 5] =
{
-0.5f, 0.0f, 0.0f,
@ -256,6 +264,28 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
" isNormalMapped = 1;\n"
"\n",
},
{
1 << PR_BIT_ART_MAP,
// vert_def
"uniform vec2 diffuseScale;\n"
"\n",
// vert_prog
" gl_TexCoord[0] = vec4(diffuseScale, 1.0, 1.0) * gl_MultiTexCoord0;\n"
"\n",
// frag_def
"uniform sampler2D artMap;\n"
"uniform sampler2D basePalMap;\n"
"uniform sampler2D lookupMap;\n"
"\n",
// frag_prog
" float colorIndex = texture2D(artMap, commonTexCoord.st).r;\n"
" colorIndex = texture2D(lookupMap, vec2(colorIndex, 8.0 / 32.0)).r;\n"
"\n"
" diffuseTexel = texture2D(basePalMap, vec2(colorIndex, 0.5)) * 2.0;\n"
" if (colorIndex == 1.0)\n"
" diffuseTexel.a = 0.0;\n"
"\n",
},
{
1 << PR_BIT_DIFFUSE_MAP,
// vert_def
@ -4432,6 +4462,10 @@ static void polymer_getscratchmaterial(_prmaterial* material)
material->normalmap = 0;
material->normalbias[0] = material->normalbias[1] = 0.0f;
material->tbn = NULL;
// PR_BIT_ART_MAP
material->artmap = 0;
material->basepalmap = 0;
material->lookupmap = 0;
// PR_BIT_DIFFUSE_MAP
material->diffusemap = 0;
material->diffusescale[0] = material->diffusescale[1] = 1.0f;
@ -4468,7 +4502,86 @@ static void polymer_getbuildmaterial(_prmaterial* material, int16_t tile
// PR_BIT_DIFFUSE_MAP
if (!waloff[tilenum])
loadtile(tilenum);
// Lazily fill in all the textures we need, move this to precaching later
if (pr_artmapping) {
if (!prartmaps[tilenum]) {
char *tilebuffer = (char *)waloff[tilenum];
char tempbuffer[tilesizx[tilenum] * tilesizy[tilenum]];
int i, j, k;
i = k = 0;
while (i < tilesizy[tilenum]) {
j = 0;
while (j < tilesizx[tilenum]) {
tempbuffer[k] = tilebuffer[(j * tilesizy[tilenum]) + i];
k++;
j++;
}
i++;
}
bglGenTextures(1, &prartmaps[tilenum]);
bglBindTexture(GL_TEXTURE_2D, prartmaps[tilenum]);
bglTexImage2D(GL_TEXTURE_2D,
0,
GL_R8,
tilesizx[tilenum],
tilesizy[tilenum],
0,
GL_RED,
GL_UNSIGNED_BYTE,
tempbuffer);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
bglBindTexture(GL_TEXTURE_2D, 0);
}
if (!prbasepalmaps[curbasepal]) {
bglGenTextures(1, &prbasepalmaps[curbasepal]);
bglBindTexture(GL_TEXTURE_2D, prbasepalmaps[curbasepal]);
bglTexImage2D(GL_TEXTURE_2D,
0,
GL_RGB,
256,
1,
0,
GL_RGB,
GL_UNSIGNED_BYTE,
basepaltableptr[curbasepal]);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glinfo.clamptoedge?GL_CLAMP_TO_EDGE:GL_CLAMP);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glinfo.clamptoedge?GL_CLAMP_TO_EDGE:GL_CLAMP);
bglBindTexture(GL_TEXTURE_2D, 0);
}
if (!prlookups[pal]) {
bglGenTextures(1, &prlookups[pal]);
bglBindTexture(GL_TEXTURE_2D, prlookups[pal]);
bglTexImage2D(GL_TEXTURE_2D,
0,
GL_R8,
256,
numshades,
0,
GL_RED,
GL_UNSIGNED_BYTE,
palookup[pal]);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glinfo.clamptoedge?GL_CLAMP_TO_EDGE:GL_CLAMP);
bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glinfo.clamptoedge?GL_CLAMP_TO_EDGE:GL_CLAMP);
bglBindTexture(GL_TEXTURE_2D, 0);
}
material->artmap = prartmaps[tilenum];
material->basepalmap = prbasepalmaps[curbasepal];
material->lookupmap = prlookups[pal];
}
// PR_BIT_HIGHPALOOKUP_MAP
if (pr_highpalookups && prhighpalookups[curbasepal][pal].map &&
hicfindsubst(tilenum, 0, 0) &&
@ -4584,12 +4697,18 @@ static int32_t polymer_bindmaterial(_prmaterial material, int16_t* lights,
if (pr_normalmapping && material.normalmap)
programbits |= prprogrambits[PR_BIT_NORMAL_MAP].bit;
// PR_BIT_ART_MAP
if (pr_artmapping && material.artmap &&
material.basepalmap && material.lookupmap) {
programbits |= prprogrambits[PR_BIT_ART_MAP].bit;
programbits |= prprogrambits[PR_BIT_DIFFUSE_MAP2].bit;
} else
// PR_BIT_DIFFUSE_MAP
if (material.diffusemap) {
programbits |= prprogrambits[PR_BIT_DIFFUSE_MAP].bit;
programbits |= prprogrambits[PR_BIT_DIFFUSE_MAP2].bit;
}
// PR_BIT_HIGHPALOOKUP_MAP
if (material.highpalookupmap)
programbits |= prprogrambits[PR_BIT_HIGHPALOOKUP_MAP].bit;
@ -4599,7 +4718,8 @@ static int32_t polymer_bindmaterial(_prmaterial material, int16_t* lights,
programbits |= prprogrambits[PR_BIT_DIFFUSE_DETAIL_MAP].bit;
// PR_BIT_DIFFUSE_MODULATION
programbits |= prprogrambits[PR_BIT_DIFFUSE_MODULATION].bit;
if (!pr_artmapping)
programbits |= prprogrambits[PR_BIT_DIFFUSE_MODULATION].bit;
// PR_BIT_SPECULAR_MAP
if (pr_specularmapping && material.specmap)
@ -4614,7 +4734,7 @@ static int32_t polymer_bindmaterial(_prmaterial material, int16_t* lights,
programbits |= prprogrambits[PR_BIT_MIRROR_MAP].bit;
// PR_BIT_FOG
if (!curlight && !material.mirrormap)
if (!pr_artmapping && !curlight && !material.mirrormap)
programbits |= prprogrambits[PR_BIT_FOG].bit;
// PR_BIT_GLOW_MAP
@ -4735,6 +4855,33 @@ static int32_t polymer_bindmaterial(_prmaterial material, int16_t* lights,
texunit++;
}
// PR_BIT_ART_MAP
if (programbits & prprogrambits[PR_BIT_ART_MAP].bit)
{
bglActiveTextureARB(texunit + GL_TEXTURE0_ARB);
bglBindTexture(GL_TEXTURE_2D, material.artmap);
bglUniform1iARB(prprograms[programbits].uniform_artMap, texunit);
texunit++;
bglActiveTextureARB(texunit + GL_TEXTURE0_ARB);
bglBindTexture(GL_TEXTURE_2D, material.basepalmap);
bglUniform1iARB(prprograms[programbits].uniform_basePalMap, texunit);
texunit++;
bglActiveTextureARB(texunit + GL_TEXTURE0_ARB);
bglBindTexture(GL_TEXTURE_2D, material.lookupmap);
bglUniform1iARB(prprograms[programbits].uniform_lookupMap, texunit);
texunit++;
bglUniform2fvARB(prprograms[programbits].uniform_diffuseScale, 1, material.diffusescale);
}
// PR_BIT_DIFFUSE_MAP
if (programbits & prprogrambits[PR_BIT_DIFFUSE_MAP].bit)
{
@ -5086,6 +5233,15 @@ static void polymer_compileprogram(int32_t programbits)
prprograms[programbits].uniform_normalBias = bglGetUniformLocationARB(program, "normalBias");
}
// PR_BIT_ART_MAP
if (programbits & prprogrambits[PR_BIT_ART_MAP].bit)
{
prprograms[programbits].uniform_artMap = bglGetUniformLocationARB(program, "artMap");
prprograms[programbits].uniform_basePalMap = bglGetUniformLocationARB(program, "basePalMap");
prprograms[programbits].uniform_lookupMap = bglGetUniformLocationARB(program, "lookupMap");
prprograms[programbits].uniform_diffuseScale = bglGetUniformLocationARB(program, "diffuseScale");
}
// PR_BIT_DIFFUSE_MAP
if (programbits & prprogrambits[PR_BIT_DIFFUSE_MAP].bit)
{

2
polymer/eduke32/build/src/polymost.c
View file

@ -715,6 +715,7 @@ void polymost_glinit()
bglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
bglPixelStorei(GL_PACK_ALIGNMENT, 1);
bglPixelStorei(GL_UNPACK_ALIGNMENT, 1);
//bglHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
//bglEnable(GL_LINE_SMOOTH);
@ -6413,6 +6414,7 @@ void polymost_initosdfuncs(void)
{ "r_pr_specularpower", "r_pr_specularpower: overriden specular material power", (void *) &pr_specularpower, CVAR_FLOAT | CVAR_NOSAVE, -10, 1000 },
{ "r_pr_specularfactor", "r_pr_specularfactor: overriden specular material factor", (void *) &pr_specularfactor, CVAR_FLOAT | CVAR_NOSAVE, -10, 1000 },
{ "r_pr_highpalookups", "r_pr_highpalookups: enable/disable highpalookups", (void *) &pr_highpalookups, CVAR_BOOL, 0, 1 },
{ "r_pr_artmapping", "r_pr_artmapping: enable/disable highpalookups", (void *) &pr_artmapping, CVAR_BOOL, 0, 1 },
{ "r_pr_overridehud", "r_pr_overridehud: overrides hud model parameters with values from the pr_hud* cvars; use it to fine-tune DEF tokens", (void *) &pr_overridehud, CVAR_BOOL | CVAR_NOSAVE, 0, 1 },
{ "r_pr_hudxadd", "r_pr_hudxadd: overriden HUD xadd; see r_pr_overridehud", (void *) &pr_hudxadd, CVAR_FLOAT | CVAR_NOSAVE, -100, 100 },
{ "r_pr_hudyadd", "r_pr_hudyadd: overriden HUD yadd; see r_pr_overridehud", (void *) &pr_hudyadd, CVAR_FLOAT | CVAR_NOSAVE, -100, 100 },