From d2f7af607acb9ae5374bad4990691616d9ebf5e4 Mon Sep 17 00:00:00 2001 From: mango Date: Fri, 5 Sep 2025 11:55:39 -0700 Subject: [PATCH] split color functions --- button.lua | 6 +++--- main.lua | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/button.lua b/button.lua index 4f4f6b5..064003b 100644 --- a/button.lua +++ b/button.lua @@ -28,11 +28,11 @@ end function Button:draw() if self.press then - self.c = {151/255, 109/255, 209/255} + love.graphics.setColor(self.c) else - self.c = {100/255, 100/255, 100/255} + love.graphics.setColor(100/255, 100/255, 100/255) end - love.graphics.setColor(self.c) + love.graphics.circle("fill", self.x + self.r, self.y + self.r, self.r+1) love.graphics.setColor(1,1,1) love.graphics.circle("line", self.x + self.r, self.y+self.r, self.r+1) diff --git a/main.lua b/main.lua index 2190324..b71dbe6 100644 --- a/main.lua +++ b/main.lua @@ -5,21 +5,21 @@ function love.load() local Button = require "button" --movement keys movement = { - Button(25, 40, 29, "dpleft"), - Button(90, 40, 29, "dpdown"), - Button(147, 71, 29, "dpright"), - Button(168, 180, 36, "dpup"), + Button(25, 40, 29, "dpleft", {255/255, 179/255, 102/255}), + Button(90, 40, 29, "dpdown", {255/255, 179/255, 102/255}), + Button(147, 71, 29, "dpright", {255/255, 179/255, 102/255}), + Button(168, 180, 36, "dpup", {255/255, 179/255, 102/255}), } --attack keys, add {x,x,x} value to change color of button attack = { - Button(207, 43, 29, "x"), - Button(265, 17, 29, "y"), - Button(330, 22, 29, "rightshoulder"), - Button(395, 38, 29, "leftshoulder"), - Button(202, 110, 29, "a"), - Button(263, 86, 29, "b"), - Button(330, 88, 29, "triggerright"), - Button(394, 105, 29, "triggerleft"), + Button(207, 43, 29, "x", {150/255, 109/255, 209/255}), + Button(265, 17, 29, "y", {150/255, 109/255, 209/255}), + Button(330, 22, 29, "rightshoulder", {150/255, 109/255, 209/255}), + Button(395, 38, 29, "leftshoulder", {150/255, 109/255, 209/255}), + Button(202, 110, 29, "a", {150/255, 109/255, 209/255}), + Button(263, 86, 29, "b", {150/255, 109/255, 209/255}), + Button(330, 88, 29, "triggerright", {150/255, 109/255, 209/255}), + Button(394, 105, 29, "triggerleft", {150/255, 109/255, 209/255}), } end