From 6cef97b6e9ba6878607b1fff08e42ca19b79914f Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sat, 7 Apr 2018 18:53:31 +0200
Subject: Hopefully all uses of setColor now use values in <0,1> range

---
 config/menus/main.lua     |  2 +-
 config/menus/pause.lua    |  2 +-
 config/menus/select.lua   |  2 +-
 config/menus/settings.lua |  8 ++++----
 config/menus/win.lua      |  2 +-
 main.lua                  |  6 +++---
 not/Button.lua            |  4 ++--
 not/Header.lua            |  2 +-
 not/Hero.lua              |  4 ++--
 not/Layer.lua             |  2 +-
 not/PhysicalBody.lua      | 10 +++++-----
 not/Ray.lua               |  2 +-
 not/Selector.lua          |  6 +++---
 not/Sprite.lua            |  2 +-
 not/World.lua             |  4 ++--
 15 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/config/menus/main.lua b/config/menus/main.lua
index ae2cef2..87dca94 100644
--- a/config/menus/main.lua
+++ b/config/menus/main.lua
@@ -58,7 +58,7 @@ return {
 		:setPosition(width/2, 15)
 		:set("draw", function (self, scale) 
 				local x,y = self:getPosition()
-				love.graphics.setColor(255, 255, 255, 255)
+				love.graphics.setColor(1, 1, 1, 1)
 				love.graphics.setFont(Bold)
 				love.graphics.draw(awesometwo, x*scale, y*scale, 0, scale, scale, 35)
 			end)
diff --git a/config/menus/pause.lua b/config/menus/pause.lua
index 60aa2fc..d0b5777 100644
--- a/config/menus/pause.lua
+++ b/config/menus/pause.lua
@@ -9,7 +9,7 @@ local bx = width/2-29
 return {
 	Element(menu)
 		:set("draw", function (self, scale)
-				love.graphics.setColor(0, 0, 0, 110)
+				love.graphics.setColor(0, 0, 0, .45)
 				local width, height = love.graphics.getWidth(), love.graphics.getHeight()
 				love.graphics.rectangle("fill", 0, 0, width, height)
 			end)
diff --git a/config/menus/select.lua b/config/menus/select.lua
index 6534004..df14ad7 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -128,7 +128,7 @@ return {
 				if self.the_final_countdown ~= 9 then
 					local x,y = self:getPosition()
 					local countdown = math.max(1, math.ceil(self.the_final_countdown))
-					love.graphics.setColor(255, 255, 255, 255)
+					love.graphics.setColor(1, 1, 1, 1)
 					love.graphics.setFont(Font)
 					love.graphics.print("Autostart in:", (x-16)*scale, (y+10)*scale, 0, scale, scale)
 					love.graphics.setFont(Bold)
diff --git a/config/menus/settings.lua b/config/menus/settings.lua
index 7102bea..94b8e7a 100644
--- a/config/menus/settings.lua
+++ b/config/menus/settings.lua
@@ -16,13 +16,13 @@ local dimmer = Element(menu)
 	:set("previousControl", "") -- it actually means key that was set as this control PREVIOUSLY
 	:set("draw", function (self, scale) 
 			if self.visible then
-				love.graphics.setColor(0, 0, 0, 210)
+				love.graphics.setColor(0, 0, 0, .8)
 				love.graphics.rectangle("fill",0,0,width*getRealScale(),height*getRealScale())
-				love.graphics.setColor(120, 255, 120, 255)
+				love.graphics.setColor(.5, 1, .5, 1)
 				love.graphics.printf("Press new key for: \n> " .. self.currentControl .. " <", (width/2-110)*scale, (height/2-4)*scale, 220, "center", 0, scale, scale)
-				love.graphics.setColor(120, 120, 120, 255)
+				love.graphics.setColor(.5, .5, .5, 1)
 				love.graphics.printf("Old: " .. self.previousControl .. "", (width/2-110)*scale, (height/2+16)*scale, 220, "center", 0, scale, scale)
-				love.graphics.setColor(255, 255, 255, 255)
+				love.graphics.setColor(1, 1, 1, 1)
 			end
 		end)
 
diff --git a/config/menus/win.lua b/config/menus/win.lua
index f7163dd..ee56aeb 100644
--- a/config/menus/win.lua
+++ b/config/menus/win.lua
@@ -10,7 +10,7 @@ return {
 		:setPosition(width/2, 18)
 		:set("draw", function (self, scale) 
 				local x,y = self:getPosition()
-				love.graphics.setColor(255, 255, 255, 255)
+				love.graphics.setColor(1, 1, 1, 1)
 				love.graphics.printf("ROFL, NOW KILL YOURSELF", x*scale, y*scale, 160, "center", 0, scale, scale, 80, 3)
 			end)
 		:set("focus", function () return true end)
diff --git a/main.lua b/main.lua
index ec56e4c..705a3aa 100644
--- a/main.lua
+++ b/main.lua
@@ -27,7 +27,7 @@ debug = false
 
 -- LÖVE2D callbacks
 function love.load ()
-	love.graphics.setBackgroundColor(90, 90, 90)
+	love.graphics.setBackgroundColor(.35, .35, .35)
 	love.graphics.setDefaultFilter("nearest", "nearest")
 	-- TODO: Move fonts somewhere else out of global scope.
 	Font = love.graphics.newImageFont("assets/font-normal.png", " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.,:;-_/\\!@#$%^&*?=+~`|'\"()[]{}<>", -1)
@@ -44,10 +44,10 @@ function love.draw ()
 	if debug then
 		local scale = getScale()
 		love.graphics.setFont(Font)
-		love.graphics.setColor(255, 0, 0, 255)
+		love.graphics.setColor(1, 0, 0, 1)
 		love.graphics.print("Debug ON", 10, 10, 0, scale, scale)
 		if dbg_msg then
-			love.graphics.setColor(255, 255, 255, 255)
+			love.graphics.setColor(1, 1, 1, 1)
 			love.graphics.print(dbg_msg, 10, 10+9*scale, 0, scale, scale)
 		end
 	end
diff --git a/not/Button.lua b/not/Button.lua
index 3493a84..72823d6 100644
--- a/not/Button.lua
+++ b/not/Button.lua
@@ -42,9 +42,9 @@ function Button:draw (scale)
 	local quad = self.quads
 	local sprite = self.sprite
 	if self:isEnabled() then
-		love.graphics.setColor(255, 255, 255, 255)
+		love.graphics.setColor(1, 1, 1, 1)
 	else
-		love.graphics.setColor(140, 140, 140, 255)
+		love.graphics.setColor(.6, .6, .6, 1)
 	end
 	love.graphics.draw(sprite, quad.button.normal, x*scale, y*scale, 0, scale, scale)
 	if self.focused then
diff --git a/not/Header.lua b/not/Header.lua
index 8b2ec0d..5579774 100644
--- a/not/Header.lua
+++ b/not/Header.lua
@@ -26,7 +26,7 @@ function Header:draw (scale)
 		local angle = self:getBounce(2)
 		local dy = self:getBounce()*4
 		local x,y = self:getPosition()
-		love.graphics.setColor(255,255,255,255)
+		love.graphics.setColor(1, 1, 1, 1)
 		love.graphics.setFont(Bold)
 		love.graphics.printf(string.upper(self.text),x*scale,(y+dy)*scale,400,"center",(angle*5)*math.pi/180,scale,scale,200,12)
 end
diff --git a/not/Hero.lua b/not/Hero.lua
index a97a2b1..14e32f1 100644
--- a/not/Hero.lua
+++ b/not/Hero.lua
@@ -175,7 +175,7 @@ end
 function Hero:drawTag ()
 	local x,y = self:getPosition()
 	love.graphics.setFont(Font)
-	love.graphics.setColor(255, 255, 255)
+	love.graphics.setColor(1, 1, 1)
 	love.graphics.printf(string.format("Player %d", math.abs(self.group)), math.floor(x), math.floor(y)-26 ,100,'center',0,1,1,50,0)
 end
 
@@ -184,7 +184,7 @@ end
 function Hero:drawHUD (x,y,scale,elevation)
 	-- hud displays only if player is alive
 	if self.isAlive then
-		love.graphics.setColor(255,255,255,255)
+		love.graphics.setColor(1, 1, 1, 1)
 		love.graphics.draw(self.IMAGE_FRAME, self.QUAD_FRAME, (x)*scale, (y)*scale, 0, scale, scale)
 		love.graphics.draw(self.portrait, (x+2)*scale, (y+3)*scale, 0, scale, scale)
 		local dy = 30 * elevation
diff --git a/not/Layer.lua b/not/Layer.lua
index 14dac32..97257ed 100644
--- a/not/Layer.lua
+++ b/not/Layer.lua
@@ -38,7 +38,7 @@ function Layer:clear ()
 end
 
 function Layer:draw ()
-	love.graphics.setColor(255, 255, 255, 255)
+	love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.draw(self.canvas, nil, nil, nil, self.drawScale, self.drawScale)
 end
 
diff --git a/not/PhysicalBody.lua b/not/PhysicalBody.lua
index 5081836..df9992e 100644
--- a/not/PhysicalBody.lua
+++ b/not/PhysicalBody.lua
@@ -69,19 +69,19 @@ function PhysicalBody:draw (debug)
 			local category = fixture:getCategory()
 			-- TODO: Fixture drawing of PhysicalBodies could take activity into account in every case.
 			if category == 1 then
-				love.graphics.setColor(255, 69, 0, 150)
+				love.graphics.setColor(1, .3, 0, .6)
 			end
 			if category == 2 then
-				love.graphics.setColor(137, 255, 0, 150)
+				love.graphics.setColor(.5, 1, 0, .6)
 			end
 			if category == 3 then
-				love.graphics.setColor(137, 0, 255, 50)
+				love.graphics.setColor(.5, 0, 1, .2)
 			end
 			if category == 4 then
 				if self.body:isActive() then
-					love.graphics.setColor(255, 230, 0, 50)
+					love.graphics.setColor(1, .9, 0, .2)
 				else
-					love.graphics.setColor(255, 230, 0, 10)
+					love.graphics.setColor(1, .9, 0, .04)
 				end
 			end
 			local camera = self.world.camera
diff --git a/not/Ray.lua b/not/Ray.lua
index 4ae640a..c53199b 100644
--- a/not/Ray.lua
+++ b/not/Ray.lua
@@ -18,7 +18,7 @@ end
 -- TODO: Ray should use Camera boundaries just-in-case.
 -- TODO: Ray uses magic numbers.
 function Ray:draw ()
-	love.graphics.setColor(255, 247, 228, 247)
+	love.graphics.setColor(1, .97, .89, .97)
 	love.graphics.setLineStyle("rough")
 	love.graphics.setLineWidth(self.delay*160)
 
diff --git a/not/Selector.lua b/not/Selector.lua
index 5536b44..3a30834 100644
--- a/not/Selector.lua
+++ b/not/Selector.lua
@@ -134,9 +134,9 @@ function Selector:draw (scale)
 		boxType = "active"
 	end
 
-	love.graphics.setColor(255, 255, 255, 255)
+	love.graphics.setColor(1, 1, 1, 1)
 	if not self:isUnique() then
-		love.graphics.setColor(120, 120, 120, 255)
+		love.graphics.setColor(.5, .5, .5, 1)
 	end
 	love.graphics.draw(self.atlas, self.quads[self:getShapeString()][boxType], x*scale, y*scale, 0, scale, scale)
 	-- TODO: That is one way to draw icon for selected value. Find better one. See: `config/menus/host`.
@@ -145,7 +145,7 @@ function Selector:draw (scale)
 		love.graphics.draw(icon, (x+2)*scale, (y+3)*scale, 0, scale, scale)
 	end
 
-	love.graphics.setColor(255, 255, 255, 255)
+	love.graphics.setColor(1, 1, 1, 1)
 
 	if self.focused then
 		local dy = (h-6)/2
diff --git a/not/Sprite.lua b/not/Sprite.lua
index ec23eac..f1d1703 100644
--- a/not/Sprite.lua
+++ b/not/Sprite.lua
@@ -103,7 +103,7 @@ function Sprite:draw (debug)
 	local draw_x = math.floor(x)
 
 	if i and not self.hidden then
-		love.graphics.setColor(255,255,255,255)
+		love.graphics.setColor(1, 1, 1, 1)
 		if q then 
 			love.graphics.draw(i, q, draw_x, draw_y, angle, scaleX, scaleY, self:getOffset())
 		else 
diff --git a/not/World.lua b/not/World.lua
index a5854d4..cadb4fd 100644
--- a/not/World.lua
+++ b/not/World.lua
@@ -369,11 +369,11 @@ function World:draw ()
 		self.camera:push()
 		self.camera:transform(getScale(), 1, love.graphics.getDimensions())
 
-		love.graphics.setColor(130,130,130)
+		love.graphics.setColor(.5, .5, .5)
 		love.graphics.line(ax,center.y,bx,center.y)
 		love.graphics.line(center.x,ay,center.x,by)
 
-		love.graphics.setColor(200,200,200)
+		love.graphics.setColor(.78, .78, .78)
 		love.graphics.line(ax,0,bx,0)
 		love.graphics.line(0,ay,0,by)
 		self.camera:pop()
-- 
cgit v1.1