diff --git a/button.lua b/button.lua index c7729a8..ec586fc 100644 --- a/button.lua +++ b/button.lua @@ -11,7 +11,6 @@ function Button:new(x, y, r, b, c) end function Button:update(dt) - if self.b == "triggerleft" or self.b == "triggerright" then if fightstick:getGamepadAxis(self.b) == 1 then self.press = true @@ -38,4 +37,4 @@ function Button:draw() love.graphics.circle(mode, self.x + self.r, self.y + self.r, self.r) end -return Button \ No newline at end of file +return Button diff --git a/conf.lua b/conf.lua index 3e49589..e261ea0 100644 --- a/conf.lua +++ b/conf.lua @@ -1,6 +1,8 @@ -WINDOWWIDTH = 373 -WINDOWHEIGHT = 212 +WINDOWSCALE = 1 +WINDOWWIDTH = 373*WINDOWSCALE +WINDOWHEIGHT = 212*WINDOWSCALE BORDERLESS = true +BLACK = true function love.conf(t) t.window.width = WINDOWWIDTH t.window.height = WINDOWHEIGHT diff --git a/icon.png b/icon.png index 7555bbc..8215d73 100644 Binary files a/icon.png and b/icon.png differ diff --git a/main.lua b/main.lua index 93b770d..eacaabd 100644 --- a/main.lua +++ b/main.lua @@ -1,4 +1,5 @@ function love.load() + joysticks = love.joystick.getJoysticks() fightstick = joysticks[1] @@ -39,10 +40,20 @@ function love.keypressed(key) love.window.setMode(WINDOWWIDTH, WINDOWHEIGHT, {borderless=true, x=windowx, y=windowy}) end end + if key == "c" then + if BLACK then + BLACK = false + love.graphics.setBackgroundColor(0,1,0) + else + BLACK = true + love.graphics.setBackgroundColor(0,0,0) + end + end end function love.update(dt) - windowx, windowy, _ =love.window.getPosition() + windowx, windowy, _ = love.window.getPosition() + --movement keys for i, v in ipairs(movement) do v:update(dt) @@ -55,9 +66,7 @@ function love.update(dt) end function love.draw() - love.graphics.setBackgroundColor(0,0,0) - --love.graphics.setBackgroundColor(1, 179/255, 102/255) - --love.graphics.print("borderless = " .. (BORDERLESS and "true" or "false"), 0, 0) + love.graphics.scale(WINDOWSCALE, WINDOWSCALE) --movement keys for i, v in ipairs(movement) do @@ -68,4 +77,4 @@ function love.draw() for i, v in ipairs(attack) do v:draw() end -end \ No newline at end of file +end