From 58c6ab9fe65e9d38f7ec697a510dc67a70679aa7 Mon Sep 17 00:00:00 2001
From: Sage Vaillancourt <sage@sagev.space>
Date: Tue, 25 Feb 2025 08:13:40 -0500
Subject: [PATCH] Toying with trajectory-based missed-ball physics

---
 src/ball.lua | 29 ++++++++++++++++++++++++++---
 src/main.lua |  4 ++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/ball.lua b/src/ball.lua
index 5bfd234..a30ff7e 100644
--- a/src/ball.lua
+++ b/src/ball.lua
@@ -2,8 +2,10 @@
 ---@field x number
 ---@field y number
 ---@field z number
+---@field trajectory Point3d
 ---@field size number
 ---@field heldBy Fielder | nil
+---@field isFlyBall boolean
 ---@field catchable boolean
 ---@field xAnimator SimpleAnimator
 ---@field yAnimator SimpleAnimator
@@ -20,6 +22,7 @@ function Ball.new(animatorLib)
         x = C.Center.x --[[@as number]],
         y = C.Center.y --[[@as number]],
         z = 0,
+        isFlyBall = false,
         catchable = true,
         size = C.SmallestBallRadius,
         heldBy = nil --[[@type Runner | nil]],
@@ -34,19 +37,39 @@ function Ball.new(animatorLib)
     }, { __index = Ball })
 end
 
-function Ball:updatePosition()
+---@param deltaSeconds number
+function Ball:updatePosition(deltaSeconds)
     if self.heldBy then
         self.x = self.heldBy.x
         self.y = self.heldBy.y
         self.z = C.GloveZ
         self.size = C.SmallestBallRadius
-    else
+    elseif self.floatAnimator:ended() then
+        -- Try to bounce?
+        if self.trajectory then
+            printTable(self.trajectory)
+            -- if utils.distanceBetweenPoints(self, self.trajectory) > 1 then
+            --     self:launch()
+            -- end
+            -- local easing = playdate.easingFunctions.outQuint
+            -- self:launch(self.x + self.trajectory.x, self.y + self.trajectory.y, easing, nil, true)
+            self.trajectory = nil
+        end
+        --else
+        local lastPos = { x = self.x, y = self.y, z = self.z }
         self.x = self.xAnimator:currentValue()
         local z = self.floatAnimator:currentValue()
         -- TODO: This `+ z` is more graphics logic than physics logic
         self.y = self.yAnimator:currentValue() + z
         self.z = z
         self.size = self.sizeAnimator:currentValue()
+        self.trajectory = { x = self.x - lastPos.x, y = self.y - lastPos.y, z = self.z - lastPos.z }
+        self.trajectory.x = self.trajectory.x / deltaSeconds
+        self.trajectory.y = self.trajectory.y / deltaSeconds
+        self.trajectory.z = self.trajectory.z / deltaSeconds
+    end
+    if self.z < 1 then
+        self.isFlyBall = false
     end
 end
 
@@ -82,7 +105,7 @@ function Ball:launch(destX, destY, easingFunc, flyTimeMs, floaty, customBallScal
     self.yAnimator = self.animatorLib.new(flyTimeMs, self.y, destY, easingFunc)
     self.xAnimator = self.animatorLib.new(flyTimeMs, self.x, destX, easingFunc)
     if floaty then
-        self.floatAnimator:reset(flyTimeMs)
+        self.floatAnimator:reset(flyTimeMs / 2)
     end
 end
 
diff --git a/src/main.lua b/src/main.lua
index 1e057f9..46d66d9 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -124,7 +124,7 @@ Game = {}
 function Game.new(settings, announcer, fielding, baserunning, npc, state)
     announcer = announcer or Announcer.new()
     fielding = fielding or Fielding.new()
-    settings.userTeam = nil -- "away"
+    settings.userTeam = "home" -- "away"
 
     local homeTeamBlipper = blipper.new(100, settings.homeTeamSpriteGroup)
     local awayTeamBlipper = blipper.new(100, settings.awayTeamSpriteGroup)
@@ -524,7 +524,7 @@ function Game:updateGameState()
     gfx.animation.blinker.updateAll()
     self.state.deltaSeconds = playdate.getElapsedTime() or 0
     playdate.resetElapsedTime()
-    self.state.ball:updatePosition()
+    self.state.ball:updatePosition(self.state.deltaSeconds)
 
     local offenseHandler, defenseHandler = self:currentInputHandlers()