From 091e0558419eaf06e846faf6a4496974b5ab54e0 Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Tue, 25 Jul 2017 18:41:25 -0700 Subject: [PATCH] mike: Now resepcts delta time (dt) --- love/mike/lib/functions.lua | 6 +++--- love/mike/lib/keys.lua | 6 +++--- love/mike/main.lua | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/love/mike/lib/functions.lua b/love/mike/lib/functions.lua index 095368c..e1d1029 100644 --- a/love/mike/lib/functions.lua +++ b/love/mike/lib/functions.lua @@ -61,10 +61,10 @@ end -function ball_bounce(player, ball) +function ball_bounce(player, ball, dt) local paddle_hit = false - ball.x = ball.x + ball.x_speed - ball.y = ball.y + ball.y_speed + ball.x = ball.x + (ball.x_speed *dt) + ball.y = ball.y + (ball.y_speed *dt) --If ball hits screen wall if ball.x >= screen.width or ball.x < 0 then diff --git a/love/mike/lib/keys.lua b/love/mike/lib/keys.lua index 8edc20c..7292787 100644 --- a/love/mike/lib/keys.lua +++ b/love/mike/lib/keys.lua @@ -33,7 +33,7 @@ function half_speed(object_speed) end end -function check_keys(object, screen) +function check_keys(object, screen, dt) local newObject = {} newObject.x = object.x newObject.y = object.y @@ -42,11 +42,11 @@ function check_keys(object, screen) newObject.speed = object.speed if love.keyboard.isDown(MOVE_RIGHT) then - newObject.x = newObject.x + half_speed(newObject.speed) + newObject.x = newObject.x + half_speed(newObject.speed * dt) end if love.keyboard.isDown(MOVE_LEFT) then - newObject.x = newObject.x - half_speed(newObject.speed) + newObject.x = newObject.x - half_speed(newObject.speed * dt) end if screen_col_detect(newObject, screen) then diff --git a/love/mike/main.lua b/love/mike/main.lua index 3b8a070..3fda449 100644 --- a/love/mike/main.lua +++ b/love/mike/main.lua @@ -10,9 +10,9 @@ function love.load() screen.height = love.graphics.getHeight() -- Create a table to hold all the player data - player = create_object(screen.width /2, screen.height - 50, 30, 5, 10) + player = create_object(screen.width /2, screen.height - 50, 30, 5, 500) -- Create a table to hold ball data - ball = create_object(screen.width /2, screen.height /2, 1, 1, 10) + ball = create_object(screen.width /2, screen.height /2, 1, 1, 600) ball.x_speed = (ball.speed /2) ball.y_speed = (ball.speed /2) @@ -20,8 +20,8 @@ function love.load() end function love.update(dt) - player = check_keys(player, screen) - ball = ball_bounce(player, ball) + player = check_keys(player, screen, dt) + ball = ball_bounce(player, ball, dt) end function love.draw()