feat: decorate reset game

examples/pong/game.lua

@@ -41,8 +41,7 @@ local function loop(std, game)
 end
 
 local function draw(std, game)
-    std.draw.color('black')
-    std.draw.rect('fill', 0, 0, game.width, game.height)
+    std.draw.clear('black')
     std.draw.color('white')
     std.draw.rect('fill', 4, game.player_pos, 8, game.player_size)
     std.draw.rect('fill', game.ball_pos_x, game.ball_pos_y, game.ball_size, game.ball_size)
@@ -52,7 +51,7 @@ local function draw(std, game)
 end
 
 local function exit(std, game)
-    game.highscore = std.math.clamp(game.highscore, game.score, game.highscore)
+    game.highscore = std.math.max(game.highscore, game.score)
 end
 
 local P = {

src/lib/common/decorators.lua

@@ -50,8 +50,20 @@ local function decorator_poly(limit_verts, func_draw_poly, func_draw_line)
     end
 end
 
+local function decorator_reset(callbacks, std, game)
+    return function()
+        if callbacks.exit then
+            callbacks.exit(std, game)
+        end
+        if callbacks.init then
+            callbacks.init(std, game)
+        end
+    end
+end
+
 local P = {
-    poly=decorator_poly
+    poly=decorator_poly,
+    reset=decorator_reset
 }
 
 return P;

src/lib/ginga/main.lua

@@ -91,15 +91,6 @@ local function std_draw_line(x1, y1, x2, y2)
     canvas:drawLine(x1, y1, x2, y2)
 end
 
-local function std_game_reset()
-    if application.callbacks.exit then
-        application.callbacks.exit(std, game)
-    end
-    if application.callbacks.init then
-        application.callbacks.init(std, game)
-    end
-end
-
 local function std_game_exit()
     if application.callbacks.exit then
         application.callbacks.exit(std, game)
@@ -158,7 +149,7 @@ local function setup(evt)
     std.draw.font=std_draw_font
     std.draw.line=std_draw_line
     std.draw.poly=decorators.poly(0, nil, std_draw_line)
-    std.game.reset=std_game_reset
+    std.game.reset=decorators.reset(application.callbacks, std, game)
     std.game.exit=std_game_exit
     game.width=w
     game.height=h

src/lib/html5/main.lua

@@ -25,6 +25,7 @@ local function browser_init(width, height)
     application = (load(game_lua))()
     std.math = zeebo_math
     std.math.random = math.random
+    std.game.reset=decorators.reset(application.callbacks, std, game)
     std.draw = browser_canvas
     game.width = width
     game.height = height

src/lib/love2d/main.lua

@@ -53,15 +53,6 @@ local function std_draw_font(a,b)
     -- TODO: not must be called in update 
 end
 
-local function std_game_reset()
-    if application.callbacks.exit then
-        application.callbacks.exit(std, game)
-    end
-    if application.callbacks.init then
-        application.callbacks.init(std, game)
-    end
-end
-
 local function std_game_exit()
     if application.callbacks.exit then
         application.callbacks.exit(std, game)
@@ -121,7 +112,7 @@ function love.load(args)
     std.draw.font=std_draw_font
     std.draw.line=std_draw_line
     std.draw.poly=decorators.poly(0, love.graphics.polygon)
-    std.game.reset=std_game_reset
+    std.game.reset=decorators.reset(application.callbacks, std, game)
     std.game.exit=std_game_exit
     game.width=w
     game.height=h