Draw health bar of player, and draw text in bars

Author: barrucadu

Diff for: manager/game.lua

@@ -236,29 +236,31 @@ function Game:draw()
     -- Replay the event log
     self.state = self.eventLog:play(self.time)
 
+    local player = self.state[self.playerId]
+
     -- Move the viewport
-    if self.state[self.playerId] then
-        self.viewport:move(self.state[self.playerId].x, 300)
+    if player then
+        self.viewport:move(player.x, 300)
     end
 
     -- Draw the world
     love.graphics.setColor({255,255,255,255})
     love.graphics.draw(self.bgimage)
     self.viewport:draw(self.state)
 
+    -- Draw the health bar
+    if player then
+        drawFilledBar(20, 20, 200, 20,
+                      player.health / player.maxHealth,
+                      {204,20,28}, nil, {255,255,255},
+                      player.health .. "/" .. player.maxHealth)
+    end
+
     -- Draw the time bar
     drawFilledBar(580, 20, 200, 20,
                   (self.maxTime - self.time) / constants.playTime,
-                  {107,141,255}, nil, {255,255,255})
-
-    resetDraw(
-        function ()
-            love.graphics.setColor(255, 255, 255)
-
-            local str = math.ceil((self.maxTime - self.time) / constants.framerate)
-            local strWidth = love.graphics.getFont():getWidth(str)
-            love.graphics.print(str, 680 - strWidth/2, 23)
-        end)
+                  {107,141,255}, nil, {255,255,255},
+                  math.ceil((self.maxTime - self.time) / constants.framerate))
 end
 
 return Game

Diff for: utils.lua

@@ -73,10 +73,11 @@ function uniqueId()
     return lastUnique
 end
 
-function drawFilledBar(x, y, width, height, proportion, fgcolor, bgcolor, linecolor)
+function drawFilledBar(x, y, width, height, proportion, fgcolor, bgcolor, linecolor, caption, textcolor)
     bgcolor = bgcolor or {0,0,0,255}
     fgcolor = fgcolor or {255,255,255,255}
     linecolor = linecolor or bgcolor
+    textcolor = textcolor or {255,255,255,255}
 
     resetDraw(
         function ()
@@ -88,6 +89,11 @@ function drawFilledBar(x, y, width, height, proportion, fgcolor, bgcolor, lineco
 
             love.graphics.setColor(linecolor)
             love.graphics.rectangle("line", x-1, y-1, width+1, height+1)
+
+            if caption then
+                local strWidth = love.graphics.getFont():getWidth(caption)
+                love.graphics.print(caption, x + width/2 - strWidth/2, y + height/2 - 7)
+            end
         end)
 end