ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

OpenGL2: Add r_glossType.

Browse source
This commit is contained in:
SmileTheory 2016-03-07 03:30:16 -08:00
parent 90d6f941f8
commit 5738d09969
4 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/renderergl2/glsl/lightall_fp.glsl
View file

@ -332,19 +332,29 @@ void main()
// diffuse rgb is base color // diffuse rgb is base color
// specular red is smoothness // specular red is smoothness
// specular green is metallicness // specular green is metallicness
float roughness = 1.0 - specular.r; float gloss = specular.r;
specular.rgb = specular.g * diffuse.rgb + vec3(0.04 - 0.04 * specular.g); specular.rgb = specular.g * diffuse.rgb + vec3(0.04 - 0.04 * specular.g);
diffuse.rgb *= 1.0 - specular.g; diffuse.rgb *= 1.0 - specular.g;
#else #else
// diffuse rgb is diffuse // diffuse rgb is diffuse
// specular rgb is specular reflectance at normal incidence // specular rgb is specular reflectance at normal incidence
// specular alpha is gloss // specular alpha is gloss
float roughness = exp2(-3.0 * specular.a); float gloss = specular.a;
// adjust diffuse by specular reflectance, to maintain energy conservation // adjust diffuse by specular reflectance, to maintain energy conservation
diffuse.rgb *= vec3(1.0) - specular.rgb; diffuse.rgb *= vec3(1.0) - specular.rgb;
#endif #endif
#if defined(GLOSS_IS_GLOSS)
float roughness = exp2(-3.0 * gloss);
#elif defined(GLOSS_IS_SMOOTHNESS)
float roughness = 1.0 - gloss;
#elif defined(GLOSS_IS_ROUGHNESS)
float roughness = gloss;
#elif defined(GLOSS_IS_SHININESS)
float roughness = pow(2.0 / (8190.0 * gloss + 2.0), 0.25);
#endif
reflectance = CalcDiffuse(diffuse.rgb, NH, EH, roughness); reflectance = CalcDiffuse(diffuse.rgb, NH, EH, roughness);
gl_FragColor.rgb = lightColor * reflectance * (attenuation * NL); gl_FragColor.rgb = lightColor * reflectance * (attenuation * NL);

17
code/renderergl2/tr_glsl.c
View file

@ -1057,6 +1057,23 @@ void GLSL_InitGPUShaders(void)
if (r_cubeMapping->integer) if (r_cubeMapping->integer)
Q_strcat(extradefines, 1024, "#define USE_CUBEMAP\n"); Q_strcat(extradefines, 1024, "#define USE_CUBEMAP\n");
switch (r_glossType->integer)
{
case 0:
default:
Q_strcat(extradefines, 1024, "#define GLOSS_IS_GLOSS\n");
break;
case 1:
Q_strcat(extradefines, 1024, "#define GLOSS_IS_SMOOTHNESS\n");
break;
case 2:
Q_strcat(extradefines, 1024, "#define GLOSS_IS_ROUGHNESS\n");
break;
case 3:
Q_strcat(extradefines, 1024, "#define GLOSS_IS_SHININESS\n");
break;
}
} }
if (i & LIGHTDEF_USE_SHADOWMAP) if (i & LIGHTDEF_USE_SHADOWMAP)

2
code/renderergl2/tr_init.c
View file

@ -147,6 +147,7 @@ cvar_t *r_baseNormalY;
cvar_t *r_baseParallax; cvar_t *r_baseParallax;
cvar_t *r_baseSpecular; cvar_t *r_baseSpecular;
cvar_t *r_baseGloss; cvar_t *r_baseGloss;
cvar_t *r_glossType;
cvar_t *r_mergeLightmaps; cvar_t *r_mergeLightmaps;
cvar_t *r_dlightMode; cvar_t *r_dlightMode;
cvar_t *r_pshadowDist; cvar_t *r_pshadowDist;
@ -1236,6 +1237,7 @@ void R_Register( void )
r_baseParallax = ri.Cvar_Get( "r_baseParallax", "0.05", CVAR_ARCHIVE | CVAR_LATCH ); r_baseParallax = ri.Cvar_Get( "r_baseParallax", "0.05", CVAR_ARCHIVE | CVAR_LATCH );
r_baseSpecular = ri.Cvar_Get( "r_baseSpecular", "0.04", CVAR_ARCHIVE | CVAR_LATCH ); r_baseSpecular = ri.Cvar_Get( "r_baseSpecular", "0.04", CVAR_ARCHIVE | CVAR_LATCH );
r_baseGloss = ri.Cvar_Get( "r_baseGloss", "0.3", CVAR_ARCHIVE | CVAR_LATCH ); r_baseGloss = ri.Cvar_Get( "r_baseGloss", "0.3", CVAR_ARCHIVE | CVAR_LATCH );
r_glossType = ri.Cvar_Get("r_glossType", "1", CVAR_ARCHIVE | CVAR_LATCH);
r_dlightMode = ri.Cvar_Get( "r_dlightMode", "0", CVAR_ARCHIVE | CVAR_LATCH ); r_dlightMode = ri.Cvar_Get( "r_dlightMode", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_pshadowDist = ri.Cvar_Get( "r_pshadowDist", "128", CVAR_ARCHIVE ); r_pshadowDist = ri.Cvar_Get( "r_pshadowDist", "128", CVAR_ARCHIVE );
r_mergeLightmaps = ri.Cvar_Get( "r_mergeLightmaps", "1", CVAR_ARCHIVE | CVAR_LATCH ); r_mergeLightmaps = ri.Cvar_Get( "r_mergeLightmaps", "1", CVAR_ARCHIVE | CVAR_LATCH );

1
code/renderergl2/tr_local.h
View file

@ -1794,6 +1794,7 @@ extern cvar_t *r_baseNormalY;
extern cvar_t *r_baseParallax; extern cvar_t *r_baseParallax;
extern cvar_t *r_baseSpecular; extern cvar_t *r_baseSpecular;
extern cvar_t *r_baseGloss; extern cvar_t *r_baseGloss;
extern cvar_t *r_glossType;
extern cvar_t *r_dlightMode; extern cvar_t *r_dlightMode;
extern cvar_t *r_pshadowDist; extern cvar_t *r_pshadowDist;
extern cvar_t *r_mergeLightmaps; extern cvar_t *r_mergeLightmaps;