Ticket #2506: merge-gentangents-preferglsl.patch

binaries/data/config/default.cfg

@@ -96 +96 @@
 renderpath = default
 
 ;;;;; EXPERIMENTAL ;;;;;
-; Prefer GLSL shaders over ARB shaders (not recommended). REQUIRES gentangents=true.
+; Prefer GLSL shaders over ARB shaders
 preferglsl = false
 
-; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true.
-gentangents = false
-
 ; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
 gpuskinning = false
 

binaries/data/mods/public/gui/options/options.js

@@ -125 +125 @@
                         }(option[2][action]);
                         // Merge the new callback with any existing callbacks.
                         onPress = mergeFunctions(callback, onPress);
-                        // TODO: Remove this once GLSL works without GenTangents (#2506)
-                        if (option[2][action] == "preferglsl")
-                        {
-                            callback = function()
-                                Engine.ConfigDB_CreateValue("user", "gentangents", String(this.checked));
-                            onPress = mergeFunctions(callback, onPress);
-                        }
                         break;
                     case "renderer":
                         // Load initial value if not yet loaded.
@@ -145 +138 @@
                         }(option[2][action]);
                         // Merge the new callback with any existing callbacks.
                         onPress = mergeFunctions(callback, onPress);
-                        // TODO: Remove this once GLSL works without GenTangents (#2506)
-                        if (option[2][action] == "PreferGLSL")
-                        {
-                            callback = function()
-                                eval("Engine.Renderer_SetGenTangentsEnabled(" + this.checked + ")");
-                            onPress = mergeFunctions(callback, onPress);
-                        }
                         break;
                     case "function":
                         // This allows for doing low-level actions, like hiding/showing UI elements.

source/renderer/Renderer.cpp

@@ -438 +438 @@
     m_Options.m_PreferGLSL = false;
     m_Options.m_ForceAlphaTest = false;
     m_Options.m_GPUSkinning = false;
-    m_Options.m_GenTangents = false;
     m_Options.m_SmoothLOS = false;
     m_Options.m_Postproc = false;
     m_Options.m_ShowSky = false;
@@ -448 +447 @@
     CFG_GET_VAL("preferglsl", m_Options.m_PreferGLSL);
     CFG_GET_VAL("forcealphatest", m_Options.m_ForceAlphaTest);
     CFG_GET_VAL("gpuskinning", m_Options.m_GPUSkinning);
-    CFG_GET_VAL("gentangents", m_Options.m_GenTangents);
     CFG_GET_VAL("smoothlos", m_Options.m_SmoothLOS);
     CFG_GET_VAL("postproc", m_Options.m_Postproc);
 
@@ -581 +579 @@
 
     bool cpuLighting = (GetRenderPath() == RP_FIXED);
     m->Model.VertexRendererShader = ModelVertexRendererPtr(new ShaderModelVertexRenderer(cpuLighting));
-    m->Model.VertexInstancingShader = ModelVertexRendererPtr(new InstancingModelRenderer(false, m_Options.m_GenTangents));
+    m->Model.VertexInstancingShader = ModelVertexRendererPtr(new InstancingModelRenderer(false, m_Options.m_PreferGLSL));
 
     if (GetRenderPath() == RP_SHADER && m_Options.m_GPUSkinning) // TODO: should check caps and GLSL etc too
     {
-        m->Model.VertexGPUSkinningShader = ModelVertexRendererPtr(new InstancingModelRenderer(true, m_Options.m_GenTangents));
+        m->Model.VertexGPUSkinningShader = ModelVertexRendererPtr(new InstancingModelRenderer(true, m_Options.m_PreferGLSL));
         m->Model.NormalSkinned = ModelRendererPtr(new ShaderModelRenderer(m->Model.VertexGPUSkinningShader));
         m->Model.TranspSkinned = ModelRendererPtr(new ShaderModelRenderer(m->Model.VertexGPUSkinningShader));
     }
@@ -708 +706 @@
         case OPT_PARTICLES:
             m_Options.m_Particles = value;
             break;
-        case OPT_GENTANGENTS:
-            m_Options.m_GenTangents = value;
-            break;
         case OPT_PREFERGLSL:
             m_Options.m_PreferGLSL = value;
             MakeShadersDirty();
@@ -762 +757 @@
             return m_Options.m_ShadowPCF;
         case OPT_PARTICLES:
             return m_Options.m_Particles;
-        case OPT_GENTANGENTS:
-            return m_Options.m_GenTangents;
         case OPT_PREFERGLSL:
             return m_Options.m_PreferGLSL;
         case OPT_SILHOUETTES:

source/renderer/Renderer.h

@@ -83 +83 @@
         OPT_SHADOWSONWATER,
         OPT_SHADOWPCF,
         OPT_PARTICLES,
-        OPT_GENTANGENTS,
         OPT_PREFERGLSL,
         OPT_SILHOUETTES,
         OPT_SHOWSKY,
@@ -155 +154 @@
         bool m_ForceAlphaTest;
         bool m_GPUSkinning;
         bool m_Silhouettes;
-        bool m_GenTangents;
         bool m_SmoothLOS;
         bool m_ShowSky;
         bool m_Postproc;

source/renderer/scripting/JSInterface_Renderer.cpp

@@ -32 +32 @@
 }
 
 IMPLEMENT_BOOLEAN_SCRIPT_SETTING(PARTICLES, Particles);
-IMPLEMENT_BOOLEAN_SCRIPT_SETTING(GENTANGENTS, GenTangents);
 IMPLEMENT_BOOLEAN_SCRIPT_SETTING(PREFERGLSL, PreferGLSL);
 IMPLEMENT_BOOLEAN_SCRIPT_SETTING(WATERUGLY, WaterUgly);
 IMPLEMENT_BOOLEAN_SCRIPT_SETTING(WATERFANCYEFFECTS, WaterFancyEffects);
@@ -72 +71 @@
     REGISTER_BOOLEAN_SCRIPT_SETTING(Shadows);
     REGISTER_BOOLEAN_SCRIPT_SETTING(ShadowPCF);
     REGISTER_BOOLEAN_SCRIPT_SETTING(Particles);
-    REGISTER_BOOLEAN_SCRIPT_SETTING(GenTangents);
     REGISTER_BOOLEAN_SCRIPT_SETTING(PreferGLSL);
     REGISTER_BOOLEAN_SCRIPT_SETTING(WaterUgly);
     REGISTER_BOOLEAN_SCRIPT_SETTING(WaterFancyEffects);

source/renderer/scripting/JSInterface_Renderer.h

@@ -33 +33 @@
     DECLARE_BOOLEAN_SCRIPT_SETTING(Shadows);
     DECLARE_BOOLEAN_SCRIPT_SETTING(ShadowPCF);
     DECLARE_BOOLEAN_SCRIPT_SETTING(Particles);
-    DECLARE_BOOLEAN_SCRIPT_SETTING(GenTangents);
     DECLARE_BOOLEAN_SCRIPT_SETTING(PreferGLSL);
     DECLARE_BOOLEAN_SCRIPT_SETTING(WaterUgly);
     DECLARE_BOOLEAN_SCRIPT_SETTING(WaterFancyEffects);