Refactor color functions into their own library.

abase-color.lua

@@ -0,0 +1,86 @@
+local BASE_COLOR = Color {
+    r = 0,
+    g = 0,
+    b = 0,
+    a = 0,
+}
+local IGNORE_COLOR = Color {
+    gray = 100,
+    alpha = 254,
+}
+local IGNORE_SUBCOLOR = Color {
+    gray = 150,
+    alpha = 254,
+}
+local MERGE_COLOR = Color {
+    r = 200,
+    g = 200,
+    b = 0,
+    a = 254,
+}
+local MERGE_SUBCOLOR = Color {
+    r = 200,
+    g = 200,
+    b = 128,
+    a = 254,
+}
+
+local function safeSetColor(layer, color)
+    pixelValue = layer.color.rgbaPixel
+--[[     print("safeSetColor: " .. pixelValue)
+    print(BASE_COLOR.rgbaPixel)
+    print(IGNORE_COLOR.rgbaPixel)
+    print(IGNORE_SUBCOLOR.rgbaPixel)
+    print(MERGE_COLOR.rgbaPixel)
+    print(MERGE_SUBCOLOR.rgbaPixel) ]]
+    if (pixelValue ~= BASE_COLOR.rgbaPixel and
+        pixelValue ~= IGNORE_COLOR.rgbaPixel and
+        pixelValue ~= IGNORE_SUBCOLOR.rgbaPixel and
+        pixelValue ~= MERGE_COLOR.rgbaPixel and
+        pixelValue ~= MERGE_SUBCOLOR.rgbaPixel) then
+--[[             print("DEBUG: not setting color")
+ ]]            return
+    end
+    layer.color = color
+end
+
+-- set the color of a layer and its sublayers based on the extension properties
+local function SetColor(layer, subColor)
+    if (layer.properties(extKey).ignored) then
+        safeSetColor(layer, IGNORE_COLOR)
+        subColor = IGNORE_SUBCOLOR
+    elseif subColor == IGNORE_SUBCOLOR then
+        safeSetColor(layer, subColor)
+    elseif (layer.properties(extKey).exportedAsSprite) then
+        safeSetColor(layer, MERGE_COLOR)
+        subColor = MERGE_SUBCOLOR
+    elseif subColor == MERGE_SUBCOLOR then
+        safeSetColor(layer, subColor)
+    else
+        safeSetColor(layer, BASE_COLOR)
+    end
+
+    if (layer.isGroup) then
+        for i, sublayer in ipairs(layer.layers) do
+            SetColor(sublayer, subColor)
+        end
+    end
+end
+
+-- Find the root of the layer stack, then set colors appropriately
+-- for all children
+local function SetColorFromRoot(layer)
+    -- The standard Lua `if table["field"] == nil` throws an error in Aseprite.
+    -- So we just check for the parent Layer being equal to the sprite.
+    if layer.parent == layer.sprite then
+        SetColor(layer)
+    else
+        SetColorFromRoot(layer.parent)
+    end
+end
+
+local export = {
+    SetColor = SetColor,
+    SetColorFromRoot = SetColorFromRoot,
+}
+return export

abase-commands.lua

@@ -1,5 +1,6 @@
 -- New commands to be executed via Aseprite menus / keyboard shortcuts
 local layerUtils = require "abase-layer"
+local colorUtils = require "abase-color"
 
 local function ExportSpritesheetAdvanced()
     if not app.sprite then
@@ -26,7 +27,7 @@ local function ToggleIgnore()
     else
         layer.properties(extKey).ignored = true
     end
-    layerUtils.SetColorFromRoot(layer)
+    colorUtils.SetColorFromRoot(layer)
 end
 
 local function ToggleExportAsSprite()
@@ -36,7 +37,7 @@ local function ToggleExportAsSprite()
     else
         layer.properties(extKey).exportedAsSprite = true
     end
-    layerUtils.SetColorFromRoot(layer)
+    colorUtils.SetColorFromRoot(layer)
 end
 
 local export = {

abase-layer.lua

@@ -1,32 +1,5 @@
 -- Functions for modifying a sprite
 
-local BASE_COLOR = Color {
-    r = 0,
-    g = 0,
-    b = 0,
-    a = 0,
-}
-local IGNORE_COLOR = Color {
-    gray = 100,
-    alpha = 254,
-}
-local IGNORE_SUBCOLOR = Color {
-    gray = 150,
-    alpha = 254,
-}
-local MERGE_COLOR = Color {
-    r = 200,
-    g = 200,
-    b = 0,
-    a = 254,
-}
-local MERGE_SUBCOLOR = Color {
-    r = 200,
-    g = 200,
-    b = 128,
-    a = 254,
-}
-
 -- Deletes any layers with the 'ignored' property.
 local function DeleteLayers(spr, layers)
     for _, layer in ipairs(layers) do
@@ -72,65 +45,9 @@ local function RevealLayers(layers)
     end
 end
 
-local function safeSetColor(layer, color)
-    pixelValue = layer.color.rgbaPixel
---[[     print("safeSetColor: " .. pixelValue)
-    print(BASE_COLOR.rgbaPixel)
-    print(IGNORE_COLOR.rgbaPixel)
-    print(IGNORE_SUBCOLOR.rgbaPixel)
-    print(MERGE_COLOR.rgbaPixel)
-    print(MERGE_SUBCOLOR.rgbaPixel) ]]
-    if (pixelValue ~= BASE_COLOR.rgbaPixel and
-        pixelValue ~= IGNORE_COLOR.rgbaPixel and
-        pixelValue ~= IGNORE_SUBCOLOR.rgbaPixel and
-        pixelValue ~= MERGE_COLOR.rgbaPixel and
-        pixelValue ~= MERGE_SUBCOLOR.rgbaPixel) then
---[[             print("DEBUG: not setting color")
- ]]            return
-    end
-    layer.color = color
-end
-
--- set the color of a layer and its sublayers based on the extension properties
-local function SetColor(layer, subColor)
-    if (layer.properties(extKey).ignored) then
-        safeSetColor(layer, IGNORE_COLOR)
-        subColor = IGNORE_SUBCOLOR
-    elseif subColor == IGNORE_SUBCOLOR then
-        safeSetColor(layer, subColor)
-    elseif (layer.properties(extKey).exportedAsSprite) then
-        safeSetColor(layer, MERGE_COLOR)
-        subColor = MERGE_SUBCOLOR
-    elseif subColor == MERGE_SUBCOLOR then
-        safeSetColor(layer, subColor)
-    else
-        safeSetColor(layer, BASE_COLOR)
-    end
-
-    if (layer.isGroup) then
-        for i, sublayer in ipairs(layer.layers) do
-            SetColor(sublayer, subColor)
-        end
-    end
-end
-
--- Find the root of the layer stack, then set colors appropriately
--- for all children
-local function SetColorFromRoot(layer)
-    -- The standard Lua `if table["field"] == nil` throws an error in Aseprite.
-    -- So we just check for the parent Layer being equal to the sprite.
-    if layer.parent == layer.sprite then
-        SetColor(layer)
-    else
-        SetColorFromRoot(layer.parent)
-    end
-end
-
 local export = {
     DeleteLayers = DeleteLayers,
     FlattenLayers = FlattenLayers,
     RevealLayers = RevealLayers,
-    SetColor = SetColor,
-    SetColorFromRoot = SetColorFromRoot,
 }
 return export

abase-listeners.lua

@@ -1,13 +1,12 @@
-local layerUtils = require "abase-layer"
+local colorUtils = require "abase-color"
 
 -- recolors all layers in the current sprite
 local function RecolorLayers()
   for i, layer in ipairs(app.sprite.layers) do
-    layerUtils.SetColor(layer)
+    colorUtils.SetColor(layer)
   end
 end
 
-
 local export = {
   RecolorLayers = RecolorLayers,
 }