textureutil.dummy does now also accept strings.

minetest-australopithecus · Oct 8, 2015 · f89ef0b · f89ef0b
1 parent a8844fe
commit f89ef0b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/doc/modules/textureutil.html b/doc/modules/textureutil.html
@@ -108,10 +108,12 @@ <h2><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">inner_color</span>
-         The color for the inner part.
+         The color for the inner part, either a string with
+                    leading "#" or a Color.
         </li>
         <li><span class="parameter">border_color</span>
-         The color for the border.
+         The color for the border, either a string with
+                    leading "#" or a Color.
         </li>
     </ul>
 

diff --git a/mods/utils/textureutil.lua b/mods/utils/textureutil.lua
@@ -31,12 +31,21 @@ textureutil = {}
 
 --- Creates a dummy texture with the two given colors.
 --
--- @param inner_color The color for the inner part.
--- @param border_color The color for the border.
+-- @param inner_color The color for the inner part, either a string with
+--                    leading "#" or a Color.
+-- @param border_color The color for the border, either a string with
+--                    leading "#" or a Color.
 -- @return The dummy texture (string).
 function textureutil.dummy(inner_color, border_color)
-	local inner = "(dummy_inner.png^[colorize:#" .. inner_color.hex .. ":240)"
-	local border = "(dummy_border.png^[colorize:#" .. border_color.hex .. ":255)"
+	if type(inner_color) == "table" then
+		inner_color = "#" .. inner_color.hex
+	end
+	if type(outer_color) == "table" then
+		outer_color = "#" .. outer_color.hex
+	end
+
+	local inner = "(dummy_inner.png^[colorize:" .. inner_color .. ":240)"
+	local border = "(dummy_border.png^[colorize:" .. border_color .. ":255)"
 
 	return inner .. "^" .. border
 end