Ticket #2421: 2421.1.patch

binaries/data/mods/public/gui/common/colorFades.js

@@ -22 +22 @@
  * duration: maximal duration of the complete fade (if 0 it runs until it is stopped)
  * fun_colorTransform: function which transform the colors; 
  *                     arguments: [var data] 
+ * colorMask[optional]: path to a image which is used as a color mask
  * restartAble [optional: if false, the fade can not be restarted; default: true
  * fun_smoothRestart [optional]: a function, which returns a smooth tick counter, if the fade should be started; 
  *                               arguments: [var data]; must return false, if smooth restart was not possible and true, if it was ok
  */
-function startColorFade(name, tickInterval, duration, fun_colorTransform, restartAble, fun_smoothRestart)
+function startColorFade(name, tickInterval, duration, fun_colorTransform, colorMask, restartAble, fun_smoothRestart)
 {
     // get the overlay
     var overlay = Engine.GetGUIObjectByName(name);
@@ -47 +48 @@
                         "tickCounter": 0,
                         "justStopAtExternCall": duration == 0,
                         "stopFade": false,
-                        "rgb": getInitColorFadeRGB()
+                        "rgb": getInitColorFadeRGB(),
+                        "colorMask": colorMask
                     };
         // store it!
         g_colorFade[name] = data;
@@ -57 +59 @@
     }
     else if (restartAble)
     {
-        restartColorFade(name, tickInterval, duration, fun_colorTransform, restartAble, fun_smoothRestart);
+        restartColorFade(name);
         return;
     }
 }
@@ -84 +86 @@
     var rgb = data.rgb;
     overlay.sprite="colour: " + rgb.r + " " + rgb.g + " " + rgb.b + " " + rgb.o;
 
+    // check, if color mask mode is used and add the filename in this case
+    if (data.colorMask)
+        overlay.sprite += ":" + data.colorMask;
+        
     // recusive call, if duration is positive
     if (!data.stopFade && (data.justStopAtExternCall || data.duration - (data.tickInterval * data.tickCounter) > 0))
     {
@@ -159 +165 @@
     else
     {
         stopColorFade(name, false);
-        startColorFade(name, data.changeInterval, data.duration, data.fun_colorTransform, data.restartAble, data.fun_smoothRestart);
+        startColorFade(name, data.changeInterval, data.duration, data.fun_colorTransform, data.colorMask, data.restartAble, data.fun_smoothRestart);
     }
     return true;
 }

binaries/data/mods/public/gui/gui.dtd

@@ -201 +201 @@
 <!ATTLIST effect
   add_color             CDATA #IMPLIED
   multiply_color        CDATA #IMPLIED
+  textureMaskMode       %bool; #IMPLIED
   grayscale             CDATA #IMPLIED
 >

binaries/data/mods/public/shaders/effects/gui_add.xml

@@ -2 +2 @@
 <effect>
 
     <technique>
+        <require context="!TEXTURE_MASK_MODE"/>
         <require shaders="fixed"/>
         <pass shader="fixed:gui_add"/>
     </technique>

binaries/data/mods/public/shaders/glsl/gui_add.fs

@@ -7 +7 @@
 
 void main()
 {
-  gl_FragColor = texture2D(tex, v_tex) + color;
+    vec4 t = texture2D(tex, v_tex);
+
+    #if TEXTURE_MASK_MODE
+        gl_FragColor.rgb = color.rgb;
+        gl_FragColor = color*min(t.a,1.0);;
+    #else
+        gl_FragColor = t + color;
+    #endif
 }

source/gui/CGUI.cpp

@@ -1617 +1617 @@
         {
             effects.m_Greyscale = true;
         }
+        else if (attr_name == "textureMaskMode")
+        {
+            effects.m_TextureMaskMode = true;
+        }
         else
         {
             debug_warn(L"Invalid data - DTD shouldn't allow this");

source/gui/CGUISprite.h

@@ -64 +64 @@
 
 struct SGUIImageEffects
 {
-    SGUIImageEffects() : m_Greyscale(false) {}
+    SGUIImageEffects() : m_Greyscale(false), m_TextureMaskMode(false) {}
     CColor m_AddColor;
     bool m_Greyscale;
+    bool m_TextureMaskMode;
 };
 
 /**

source/gui/GUIRenderer.cpp

@@ -79 +79 @@
         //     "stretched:grayscale:filename.ext" - stretched grayscale image
         //     "cropped:(0.5, 0.25)"    - stretch this ratio (x,y) of the top left of the image
         //     "colour:r g b a"         - solid colour
+        //     "colour:r g b a:filenameMask.ext"  - solid colour with textureMask
         //
         // and if so, try to create it as a new sprite.
         if (SpriteName.substr(0, 10) == "stretched:")
@@ -137 +138 @@
         }
         else if (SpriteName.substr(0, 7) == "colour:")
         {
+            SGUIImage* Image = new SGUIImage;
+
+            // check, if there is a sprite for defining of opacity values
+            size_t splitIndex = SpriteName.substr(7).find_first_of(":");
             CStrW value = wstring_from_utf8(SpriteName.substr(7));
+            CStrW textureMask;
             CColor color;
 
+            // trim the color value and the name of the textureMask
+            if(splitIndex != std::basic_string<char>::npos)
+            {
+                textureMask = value.substr(splitIndex + 1);
+                value = value.substr(0, splitIndex);
+            }
+
             // Check colour is valid
             if (!GUI<CColor>::ParseString(value, color))
             {
@@ -147 +160 @@
                 return;
             }
 
-            SGUIImage* Image = new SGUIImage;
+            // set background color or add color effect if textureMask is set
+            if(splitIndex != std::basic_string<char>::npos)
+            {
+                // TODO: Should check (nicely) that this is a valid file?
+                Image->m_TextureName = VfsPath("art/textures/ui") / textureMask;
+                Image->m_Effects = new SGUIImageEffects;
+                Image->m_Effects->m_AddColor = color;
+                Image->m_Effects->m_TextureMaskMode = true;
+            }
+            else
+                Image->m_BackColor = color;
 
-            Image->m_BackColor = color;
-
             CClientArea ca(CRect(0, 0, 0, 0), CRect(0, 0, 100, 100));
             Image->m_Size = ca;
             Image->m_TextureSize = ca;
@@ -231 +252 @@
         {
             if ((*cit)->m_Effects->m_AddColor != CColor())
             {
-                Call.m_Shader = g_Renderer.GetShaderManager().LoadEffect(str_gui_add);
+                CShaderDefines defines;
+                // enable texture mask mode
+                if ((*cit)->m_Effects->m_TextureMaskMode)
+                    defines.Add(str_TEXTURE_MASK_MODE, str_1);
+                
+                Call.m_Shader = g_Renderer.GetShaderManager().LoadEffect(str_gui_add, g_Renderer.GetSystemShaderDefines(), defines);
                 Call.m_ShaderColorParameter = (*cit)->m_Effects->m_AddColor;
                 // Always enable blending if something's being subtracted from
                 // the alpha channel

source/ps/CStrInternStatic.h

@@ -64 +64 @@
 X(USE_SHADOW_PCF)
 X(USE_SHADOW_SAMPLER)
 X(USE_WAVES)
+X(TEXTURE_MASK_MODE)
 X2(_emptystring, "")
 X(a_skinJoints)
 X(a_skinWeights)