humza/sml-projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

functorise physics for player

Browse Source
This commit is contained in:
Humza Shahid
2025-01-12 12:36:26 +00:00
parent ec44dd9966
commit 9280a12911
3 changed files with 26 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
fcore/player.sml
View File

@@ -417,51 +417,6 @@ struct
checkWalls (player, walls, wallCollisions, acc)
end
fun getMovePatches player =
let
val {xAxis, yAxis, x, y, ...} = player
val desiredX =
case xAxis of
STAY_STILL => x
| MOVE_LEFT => x - Constants.movePlayerBy
| MOVE_RIGHT => x + Constants.movePlayerBy
in
case yAxis of
ON_GROUND => [W_X desiredX]
| FLOATING floated =>
let
val yAxis =
if floated = Constants.floatLimit then FALLING
else FLOATING (floated + 1)
in
[W_X desiredX, W_Y_AXIS yAxis]
end
| FALLING =>
let val desiredY = y + Constants.movePlayerBy
in [W_X desiredX, W_Y desiredY]
end
| DROP_BELOW_PLATFORM =>
let val desiredY = y + Constants.movePlayerBy
in [W_X desiredX, W_Y desiredY]
end
| JUMPING jumped =>
if jumped + Constants.movePlayerBy > Constants.jumpLimit then
(* if we are above the jump limit, trigger a fall *)
let val newYAxis = FLOATING 0
in [W_X desiredX, W_Y_AXIS newYAxis]
end
else
(* jump *)
let
val newJumped = jumped + Constants.movePlayerBy
val newYAxis = JUMPING newJumped
val desiredY = y - Constants.movePlayerBy
in
[W_X desiredX, W_Y desiredY, W_Y_AXIS newYAxis]
end
end
fun getJumpPatches (player, upHeld, downHeld, acc) =
let
val {yAxis, jumpPressed, ...} = player
@@ -759,7 +714,7 @@ struct
withPatches (player, patches)
end
val patches = getMovePatches player
val patches = PlayerPhysics.getPatches player
val player = withPatches (player, patches)
val patches = getEnvironmentPatches (player, game)