diff --git a/projects/nat-archive-tool/src/nat/ArchiveController.kiss b/projects/nat-archive-tool/src/nat/ArchiveController.kiss index c50e33f8..6964137e 100644 --- a/projects/nat-archive-tool/src/nat/ArchiveController.kiss +++ b/projects/nat-archive-tool/src/nat/ArchiveController.kiss @@ -215,7 +215,6 @@ (archive.addAndProcessSystem (new KeyShortcutSystem this) ui) (archive.addSystem (new DLSystem)) (archive.addSystem (new AutoStepperSystem)) - (archive.addSystem (new ColorSystem)) (localFunction colorEqual [:nat.components.ColorI c1 :nat.components.ColorI c2] (and (= c1.r c2.r) (= c1.g c2.g) (= c1.b c2.b) (= c1.a c2.a))) @@ -231,8 +230,11 @@ (when (or !(hasComponent e ColorI) (colorsContain colors (readComponent e ColorI))) (AddColorIRGBA [e] color.r color.g color.b color.a))))))) (addColorTagSystems [ + // Active: green =>"(or active enabled)" (object r 0 g 255 b 0 a 255) + // Inactive: gray =>"(or inactive disabled)" (object r 128 g 128 b 128 a 255) + // todo: orange =>"todo" (object r 255 g 128 b 0 a 255)]) (whenLet [ps (ui.playgroundSystem)] diff --git a/projects/nat-archive-tool/src/nat/components/Color.hx b/projects/nat-archive-tool/src/nat/components/Color.hx deleted file mode 100644 index 23f8dc6c..00000000 --- a/projects/nat-archive-tool/src/nat/components/Color.hx +++ /dev/null @@ -1,8 +0,0 @@ -package nat.components; - -typedef Color = { - r:Float, - g:Float, - b:Float, - a:Float -}; diff --git a/projects/nat-archive-tool/src/nat/systems/ColorSystem.hx b/projects/nat-archive-tool/src/nat/systems/ColorSystem.hx deleted file mode 100644 index 165a684e..00000000 --- a/projects/nat-archive-tool/src/nat/systems/ColorSystem.hx +++ /dev/null @@ -1,8 +0,0 @@ -package nat.systems; - -import kiss.Prelude; -import kiss.List; -import nat.System; - -@:build(kiss.Kiss.build()) -class ColorSystem extends System {} diff --git a/projects/nat-archive-tool/src/nat/systems/ColorSystem.kiss b/projects/nat-archive-tool/src/nat/systems/ColorSystem.kiss deleted file mode 100644 index 7d9f5fc8..00000000 --- a/projects/nat-archive-tool/src/nat/systems/ColorSystem.kiss +++ /dev/null @@ -1,14 +0,0 @@ -(load "../Lib.kiss") - -// Converts outdated Color component into a ColorF component and a ColorI component - -(defNew [] - (super - ->[archive e] - (hasComponent e Color) - ->[archive e &opt ui] - (let [c (readComponent e Color)] - (addComponent archive e ColorF c) - (addComponent archive e ColorI (colorIFromF c)) - (removeComponent archive e Color)))) - diff --git a/projects/nat-flixel-desktop-playground/source/EntrySprite.kiss b/projects/nat-flixel-desktop-playground/source/EntrySprite.kiss index f4418067..1d62c821 100644 --- a/projects/nat-flixel-desktop-playground/source/EntrySprite.kiss +++ b/projects/nat-flixel-desktop-playground/source/EntrySprite.kiss @@ -32,8 +32,8 @@ (let [c (readComponent e Circle) diam (Std.int (* 2 c.radius)) squareSize (+ diam CIRCLE_THICKNESS) - color (if (hasComponent e Color) - (let [c (readComponent e Color)] + color (if (hasComponent e ColorF) + (let [c (readComponent e ColorF)] (FlxColor.fromRGBFloat c.r c.g c.b c.a)) CIRCLE_COLOR)] (makeGraphic squareSize squareSize FlxColor.TRANSPARENT true)