Permalink
Browse files

renderer2: adjust r_specularScale to fit ET material, make r_normalScale

work
  • Loading branch information...
IR4T4 committed Jan 12, 2018
1 parent 1f1f490 commit fbfceda70c80a6b21e30d78b55897d553f7f216a
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/renderer2/tr_glsl.c
  2. +2 −2 src/renderer2/tr_init.c
View
@@ -837,7 +837,7 @@ static void GLSL_BuildShaderExtraDef()
BUFFEXT("#ifndef r_SpecularExponent\n#define r_SpecularExponent %f\n#endif\n", r_specularExponent->value);
BUFFEXT("#ifndef r_SpecularExponent2\n#define r_SpecularExponent2 %f\n#endif\n", r_specularExponent2->value);
BUFFEXT("#ifndef r_SpecularScale\n#define r_SpecularScale %f\n#endif\n", r_specularScale->value);
//BUFFEXT("#ifndef r_NormalScale\n#define r_NormalScale %f\n#endif\n", r_normalScale->value);
BUFFEXT("#ifndef r_NormalScale\n#define r_NormalScale %f\n#endif\n", r_normalScale->value);
BUFFEXT("#ifndef M_PI\n#define M_PI 3.14159265358979323846f\n#endif\n");
BUFFEXT("#ifndef MAX_SHADOWMAPS\n#define MAX_SHADOWMAPS %i\n#endif\n", MAX_SHADOWMAPS);
View
@@ -1341,8 +1341,8 @@ void R_Register(void)
r_specularExponent = ri.Cvar_Get("r_specularExponent", "16", CVAR_CHEAT | CVAR_LATCH);
r_specularExponent2 = ri.Cvar_Get("r_specularExponent2", "3", CVAR_CHEAT | CVAR_LATCH);
//this one sets the power of specular, the higher the brighter
r_specularScale = ri.Cvar_Get("r_specularScale", "1.0", CVAR_CHEAT);
r_normalScale = ri.Cvar_Get("r_normalScale", "1.1", CVAR_CHEAT);
r_specularScale = ri.Cvar_Get("r_specularScale", "0.2", CVAR_CHEAT | CVAR_LATCH);
r_normalScale = ri.Cvar_Get("r_normalScale", "1.1", CVAR_CHEAT | CVAR_LATCH);
r_normalMapping = ri.Cvar_Get("r_normalMapping", "1", CVAR_ARCHIVE | CVAR_LATCH);
r_parallaxDepthScale = ri.Cvar_Get("r_parallaxDepthScale", "0.03", CVAR_CHEAT);
// toon lightning

1 comment on commit fbfceda

@thunderpwn

This comment has been minimized.

Show comment
Hide comment
@thunderpwn

thunderpwn Jan 12, 2018

Member

Good call

Member

thunderpwn commented on fbfceda Jan 12, 2018

Good call

Please sign in to comment.