diff options
Diffstat (limited to 'not')
| -rw-r--r-- | not/Button.lua | 4 | ||||
| -rw-r--r-- | not/Header.lua | 2 | ||||
| -rw-r--r-- | not/Hero.lua | 4 | ||||
| -rw-r--r-- | not/Layer.lua | 2 | ||||
| -rw-r--r-- | not/PhysicalBody.lua | 10 | ||||
| -rw-r--r-- | not/Ray.lua | 2 | ||||
| -rw-r--r-- | not/Selector.lua | 6 | ||||
| -rw-r--r-- | not/Sprite.lua | 2 | ||||
| -rw-r--r-- | not/World.lua | 4 |
9 files changed, 18 insertions, 18 deletions
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() |