Offsetmapping: new "Bias" parameter that sets a custom "null point" instead of always...

[xonotic/darkplaces.git] / model_shared.c

diff --git a/model_shared.c b/model_shared.c
index a7a5769089369ea1ddf11420b132abac76113a14..8a27c672446216e335e302f6e29343e346f257c0 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -1623,6 +1623,7 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader)
 
 extern cvar_t mod_noshader_default_offsetmapping;
 extern cvar_t mod_q3shader_default_offsetmapping;
+extern cvar_t mod_q3shader_default_offsetmapping_bias;
 extern cvar_t mod_q3shader_default_polygonoffset;
 extern cvar_t mod_q3shader_default_polygonfactor;
 void Mod_LoadQ3Shaders(void)
@@ -1714,6 +1715,7 @@ void Mod_LoadQ3Shaders(void)
                        shader.r_water_wateralpha = 1;
                        shader.offsetmapping = (mod_q3shader_default_offsetmapping.value) ? OFFSETMAPPING_DEFAULT : OFFSETMAPPING_OFF;
                        shader.offsetscale = 1;
+                       shader.offsetbias = bound(0, mod_q3shader_default_offsetmapping_bias.integer, 255);
                        shader.specularscalemod = 1;
                        shader.specularpowermod = 1;
                        shader.biaspolygonoffset = mod_q3shader_default_polygonoffset.value;
@@ -2105,47 +2107,47 @@ void Mod_LoadQ3Shaders(void)
                                // this sets dpshaderkill to true if dpshaderkillifcvar was used, and to false if dpnoshaderkillifcvar was used
                                else if (((dpshaderkill = !strcasecmp(parameter[0], "dpshaderkillifcvar")) || !strcasecmp(parameter[0], "dpnoshaderkillifcvar")) && numparameters >= 2)
                                {
-                                       const char *operator = NULL;
+                                       const char *op = NULL;
                                        if (numparameters >= 3)
-                                               operator = parameter[2];
-                                       if(!operator)
+                                               op = parameter[2];
+                                       if(!op)
                                        {
                                                if (Cvar_VariableValue(parameter[1]) != 0.0f)
                                                        shader.dpshaderkill = dpshaderkill;
                                        }
-                                       else if (numparameters >= 4 && !strcmp(operator, "=="))
+                                       else if (numparameters >= 4 && !strcmp(op, "=="))
                                        {
                                                if (Cvar_VariableValue(parameter[1]) == atof(parameter[3]))
                                                        shader.dpshaderkill = dpshaderkill;
                                        }
-                                       else if (numparameters >= 4 && !strcmp(operator, "!="))
+                                       else if (numparameters >= 4 && !strcmp(op, "!="))
                                        {
                                                if (Cvar_VariableValue(parameter[1]) != atof(parameter[3]))
                                                        shader.dpshaderkill = dpshaderkill;
                                        }
-                                       else if (numparameters >= 4 && !strcmp(operator, ">"))
+                                       else if (numparameters >= 4 && !strcmp(op, ">"))
                                        {
                                                if (Cvar_VariableValue(parameter[1]) > atof(parameter[3]))
                                                        shader.dpshaderkill = dpshaderkill;
                                        }
-                                       else if (numparameters >= 4 && !strcmp(operator, "<"))
+                                       else if (numparameters >= 4 && !strcmp(op, "<"))
                                        {
                                                if (Cvar_VariableValue(parameter[1]) < atof(parameter[3]))
                                                        shader.dpshaderkill = dpshaderkill;
                                        }
-                                       else if (numparameters >= 4 && !strcmp(operator, ">="))
+                                       else if (numparameters >= 4 && !strcmp(op, ">="))
                                        {
                                                if (Cvar_VariableValue(parameter[1]) >= atof(parameter[3]))
                                                        shader.dpshaderkill = dpshaderkill;
                                        }
-                                       else if (numparameters >= 4 && !strcmp(operator, "<="))
+                                       else if (numparameters >= 4 && !strcmp(op, "<="))
                                        {
                                                if (Cvar_VariableValue(parameter[1]) <= atof(parameter[3]))
                                                        shader.dpshaderkill = dpshaderkill;
                                        }
                                        else
                                        {
-                                               Con_DPrintf("%s parsing warning: unknown dpshaderkillifcvar operator \"%s\", or not enough arguments\n", search->filenames[fileindex], operator);
+                                               Con_DPrintf("%s parsing warning: unknown dpshaderkillifcvar op \"%s\", or not enough arguments\n", search->filenames[fileindex], op);
                                        }
                                }
                                else if (!strcasecmp(parameter[0], "sky") && numparameters >= 2)
@@ -2228,17 +2230,20 @@ void Mod_LoadQ3Shaders(void)
                                {
                                        shader.rtlightambient = atof(parameter[1]);
                                }
-                               else if (!strcasecmp(parameter[0], "dpoffsetmapping") && numparameters >= 3)
+                               else if (!strcasecmp(parameter[0], "dpoffsetmapping") && numparameters >= 2)
                                {
                                        if (!strcasecmp(parameter[1], "disable") || !strcasecmp(parameter[1], "none") || !strcasecmp(parameter[1], "off"))
                                                shader.offsetmapping = OFFSETMAPPING_OFF;
-                                       else if (!strcasecmp(parameter[1], "default"))
+                                       else if (!strcasecmp(parameter[1], "default") || !strcasecmp(parameter[1], "normal"))
                                                shader.offsetmapping = OFFSETMAPPING_DEFAULT;
                                        else if (!strcasecmp(parameter[1], "linear"))
                                                shader.offsetmapping = OFFSETMAPPING_LINEAR;
                                        else if (!strcasecmp(parameter[1], "relief"))
                                                shader.offsetmapping = OFFSETMAPPING_RELIEF;
-                                       shader.offsetscale = atof(parameter[2]);
+                                       if (numparameters >= 3)
+                                               shader.offsetscale = atof(parameter[2]);
+                                       if (numparameters >= 4)
+                                               shader.offsetbias = bound(0, atoi(parameter[3]), 255);
                                }
                                else if (!strcasecmp(parameter[0], "deformvertexes") && numparameters >= 2)
                                {
@@ -2362,8 +2367,10 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool
        // unless later loaded from the shader
        texture->offsetmapping = (mod_noshader_default_offsetmapping.value) ? OFFSETMAPPING_DEFAULT : OFFSETMAPPING_OFF;
        texture->offsetscale = 1;
+       texture->offsetbias = 0;
        texture->specularscalemod = 1;
        texture->specularpowermod = 1; 
+       texture->rtlightambient = 0;
        // WHEN ADDING DEFAULTS HERE, REMEMBER TO SYNC TO SHADER LOADING ABOVE
        // HERE, AND Q1BSP LOADING
        // JUST GREP FOR "specularscalemod = 1".
@@ -2511,6 +2518,7 @@ nothing                GL_ZERO GL_ONE
                Vector2Copy(shader->r_water_waterscroll, texture->r_water_waterscroll);
                texture->offsetmapping = shader->offsetmapping;
                texture->offsetscale = shader->offsetscale;
+               texture->offsetbias = shader->offsetbias;
                texture->specularscalemod = shader->specularscalemod;
                texture->specularpowermod = shader->specularpowermod;
                texture->rtlightambient = shader->rtlightambient;