mirror of
https://github.com/Insality/druid.git
synced 2025-09-27 18:12:19 +02:00
Improve druid.color API with better organization and clearer function names
Co-authored-by: Insality <3294627+Insality@users.noreply.github.com>
This commit is contained in:
221
druid/color.lua
221
druid/color.lua
@@ -6,9 +6,13 @@ local COLOR_Z = hash("color.z")
|
||||
|
||||
local M = {}
|
||||
|
||||
-- =============================================================================
|
||||
-- COLOR PARSING AND CREATION FUNCTIONS
|
||||
-- =============================================================================
|
||||
|
||||
---Get color by string (hex or from palette)
|
||||
---@param color_id string|vector4 Color id from palette or hex color
|
||||
|
||||
---Get color by string (hex or from palette) or pass through vector4
|
||||
---@param color_id string|vector4 Color id from palette, hex color, or existing vector4
|
||||
---@return vector4
|
||||
function M.get_color(color_id)
|
||||
if type(color_id) ~= "string" then
|
||||
@@ -30,8 +34,82 @@ function M.get_color(color_id)
|
||||
end
|
||||
|
||||
|
||||
---Parse color from various formats (hex, palette ID, or vector4)
|
||||
---This is a clearer alias for get_color
|
||||
---@param color_value string|vector4 Color value to parse
|
||||
---@return vector4
|
||||
function M.parse(color_value)
|
||||
return M.get_color(color_value)
|
||||
end
|
||||
|
||||
|
||||
---Create a color from RGBA values
|
||||
---@param r number Red component (0-1)
|
||||
---@param g number Green component (0-1)
|
||||
---@param b number Blue component (0-1)
|
||||
---@param a number|nil Alpha component (0-1), defaults to 1
|
||||
---@return vector4
|
||||
function M.new(r, g, b, a)
|
||||
return vmath.vector4(r, g, b, a or 1)
|
||||
end
|
||||
|
||||
|
||||
---Create a color from hex string
|
||||
---@param hex string Hex color. #00BBAA or 00BBAA or #0BA or 0BA
|
||||
---@param alpha number|nil Alpha value. Default is 1
|
||||
---@return vector4
|
||||
function M.from_hex(hex, alpha)
|
||||
return M.hex2vector4(hex, alpha)
|
||||
end
|
||||
|
||||
|
||||
---Create a color from HSB values
|
||||
---@param h number Hue (0-1)
|
||||
---@param s number Saturation (0-1)
|
||||
---@param b number Brightness/Value (0-1)
|
||||
---@param a number|nil Alpha value. Default is 1
|
||||
---@return vector4
|
||||
function M.from_hsb(h, s, b, a)
|
||||
local r, g, b_val, alpha = M.hsb2rgb(h, s, b, a)
|
||||
return vmath.vector4(r, g, b_val, alpha or 1)
|
||||
end
|
||||
|
||||
|
||||
-- =============================================================================
|
||||
-- COLOR FORMAT CONVERSION FUNCTIONS
|
||||
-- =============================================================================
|
||||
|
||||
---Convert color to hex string
|
||||
---@param color vector4 Color to convert
|
||||
---@return string Hex color string (without #)
|
||||
function M.to_hex(color)
|
||||
return M.rgb2hex(color.x, color.y, color.z)
|
||||
end
|
||||
|
||||
|
||||
---Convert color to RGB values
|
||||
---@param color vector4 Color to convert
|
||||
---@return number, number, number, number r, g, b, a
|
||||
function M.to_rgb(color)
|
||||
return color.x, color.y, color.z, color.w
|
||||
end
|
||||
|
||||
|
||||
---Convert color to HSB values
|
||||
---@param color vector4 Color to convert
|
||||
---@return number, number, number, number h, s, b, a
|
||||
function M.to_hsb(color)
|
||||
return M.rgb2hsb(color.x, color.y, color.z, color.w)
|
||||
end
|
||||
|
||||
|
||||
-- =============================================================================
|
||||
-- PALETTE MANAGEMENT FUNCTIONS
|
||||
-- =============================================================================
|
||||
|
||||
|
||||
---Add palette to palette data
|
||||
---@param palette_data table<string, vector4>
|
||||
---@param palette_data table<string, vector4|string>
|
||||
function M.add_palette(palette_data)
|
||||
for color_id, color in pairs(palette_data) do
|
||||
if type(color) == "string" then
|
||||
@@ -43,11 +121,59 @@ function M.add_palette(palette_data)
|
||||
end
|
||||
|
||||
|
||||
---Set a single color in the palette
|
||||
---@param color_id string Color identifier
|
||||
---@param color vector4|string Color value (vector4 or hex string)
|
||||
function M.set_palette_color(color_id, color)
|
||||
if type(color) == "string" then
|
||||
PALETTE_DATA[color_id] = M.hex2vector4(color)
|
||||
else
|
||||
PALETTE_DATA[color_id] = color
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
---Remove a color from the palette
|
||||
---@param color_id string Color identifier to remove
|
||||
function M.remove_palette_color(color_id)
|
||||
PALETTE_DATA[color_id] = nil
|
||||
end
|
||||
|
||||
|
||||
---Check if a color exists in the palette
|
||||
---@param color_id string Color identifier to check
|
||||
---@return boolean
|
||||
function M.has_palette_color(color_id)
|
||||
return PALETTE_DATA[color_id] ~= nil
|
||||
end
|
||||
|
||||
|
||||
---Get a color from the palette
|
||||
---@param color_id string Color identifier
|
||||
---@return vector4|nil Color or nil if not found
|
||||
function M.get_palette_color(color_id)
|
||||
return PALETTE_DATA[color_id]
|
||||
end
|
||||
|
||||
|
||||
---Get the entire palette
|
||||
---@return table<string, vector4>
|
||||
function M.get_palette()
|
||||
return PALETTE_DATA
|
||||
end
|
||||
|
||||
|
||||
---Clear the entire palette
|
||||
function M.clear_palette()
|
||||
PALETTE_DATA = {}
|
||||
end
|
||||
|
||||
|
||||
-- =============================================================================
|
||||
-- GUI NODE OPERATIONS
|
||||
-- =============================================================================
|
||||
|
||||
|
||||
---Set color of gui node without changing alpha
|
||||
---@param gui_node node
|
||||
---@param color vector4|vector3|string Color in vector4, vector3 or color id from palette
|
||||
@@ -62,6 +188,34 @@ function M.set_color(gui_node, color)
|
||||
end
|
||||
|
||||
|
||||
---Apply color to gui node (clearer alias for set_color)
|
||||
---@param gui_node node GUI node to apply color to
|
||||
---@param color vector4|vector3|string Color in vector4, vector3 or color id from palette
|
||||
function M.apply_to_node(gui_node, color)
|
||||
M.set_color(gui_node, color)
|
||||
end
|
||||
|
||||
|
||||
---Set node color including alpha
|
||||
---@param gui_node node GUI node to apply color to
|
||||
---@param color vector4|string Color with alpha channel
|
||||
function M.set_node_color_with_alpha(gui_node, color)
|
||||
if type(color) == "string" then
|
||||
color = M.get_color(color)
|
||||
end
|
||||
|
||||
gui.set(gui_node, COLOR_X, color.x)
|
||||
gui.set(gui_node, COLOR_Y, color.y)
|
||||
gui.set(gui_node, COLOR_Z, color.z)
|
||||
gui.set(gui_node, "color.w", color.w)
|
||||
end
|
||||
|
||||
|
||||
-- =============================================================================
|
||||
-- COLOR MANIPULATION FUNCTIONS
|
||||
-- =============================================================================
|
||||
|
||||
|
||||
---Lerp colors via color HSB values
|
||||
---@param t number Lerp value. 0 - color1, 1 - color2
|
||||
---@param color1 vector4 Color 1
|
||||
@@ -81,6 +235,55 @@ function M.lerp(t, color1, color2)
|
||||
end
|
||||
|
||||
|
||||
---Mix two colors using linear RGB interpolation (simpler than lerp)
|
||||
---@param color1 vector4 First color
|
||||
---@param color2 vector4 Second color
|
||||
---@param ratio number Mixing ratio (0 = color1, 1 = color2)
|
||||
---@return vector4 Mixed color
|
||||
function M.mix(color1, color2, ratio)
|
||||
local inv_ratio = 1 - ratio
|
||||
return vmath.vector4(
|
||||
color1.x * inv_ratio + color2.x * ratio,
|
||||
color1.y * inv_ratio + color2.y * ratio,
|
||||
color1.z * inv_ratio + color2.z * ratio,
|
||||
color1.w * inv_ratio + color2.w * ratio
|
||||
)
|
||||
end
|
||||
|
||||
|
||||
---Lighten a color by mixing with white
|
||||
---@param color vector4 Color to lighten
|
||||
---@param amount number Amount to lighten (0-1)
|
||||
---@return vector4 Lightened color
|
||||
function M.lighten(color, amount)
|
||||
return M.mix(color, COLOR_WHITE, amount)
|
||||
end
|
||||
|
||||
|
||||
---Darken a color by mixing with black
|
||||
---@param color vector4 Color to darken
|
||||
---@param amount number Amount to darken (0-1)
|
||||
---@return vector4 Darkened color
|
||||
function M.darken(color, amount)
|
||||
local black = vmath.vector4(0, 0, 0, color.w)
|
||||
return M.mix(color, black, amount)
|
||||
end
|
||||
|
||||
|
||||
---Adjust color alpha
|
||||
---@param color vector4 Color to adjust
|
||||
---@param alpha number New alpha value (0-1)
|
||||
---@return vector4 Color with adjusted alpha
|
||||
function M.with_alpha(color, alpha)
|
||||
return vmath.vector4(color.x, color.y, color.z, alpha)
|
||||
end
|
||||
|
||||
|
||||
-- =============================================================================
|
||||
-- LOW-LEVEL CONVERSION FUNCTIONS
|
||||
-- =============================================================================
|
||||
|
||||
|
||||
|
||||
---Convert hex color to rgb values.
|
||||
---@param hex string Hex color. #00BBAA or 00BBAA or #0BA or 0BA
|
||||
@@ -168,9 +371,10 @@ end
|
||||
|
||||
|
||||
---Convert rgb color to hex color
|
||||
---@param red number Red value
|
||||
---@param green number Green value
|
||||
---@param blue number Blue value
|
||||
---@param red number Red value (0-1)
|
||||
---@param green number Green value (0-1)
|
||||
---@param blue number Blue value (0-1)
|
||||
---@return string Hex color string (without #)
|
||||
function M.rgb2hex(red, green, blue)
|
||||
local r = string.format("%x", math.floor(red * 255))
|
||||
local g = string.format("%x", math.floor(green * 255))
|
||||
@@ -179,6 +383,11 @@ function M.rgb2hex(red, green, blue)
|
||||
end
|
||||
|
||||
|
||||
-- =============================================================================
|
||||
-- INITIALIZATION
|
||||
-- =============================================================================
|
||||
|
||||
|
||||
local DEFAULT_PALETTE_PATH = sys.get_config_string("druid.palette_path")
|
||||
if DEFAULT_PALETTE_PATH then
|
||||
local loaded_palette = sys.load_resource(DEFAULT_PALETTE_PATH)
|
||||
|
Reference in New Issue
Block a user