Skip to content

Stabilize the cold-launch deal animation #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
austin-smith merged 2 commits into from
Aug 31, 2026
Merged

Stabilize the cold-launch deal animation #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c62817f
stabilize cold-launch deal animation
austin-smith Aug 31, 2026
54776a8
tag board geometry by deal event
austin-smith Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions ComputerSolitaire/Animation/DealAnimationCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ import Foundation
/// of `UndoAnimationCoordinator`'s `.dealTableauRow` flight, which flies the
/// same cards back to the same stock anchors.
enum DealAnimationCoordinator {
/// A concrete, already-resolved source for a fresh-board deal. Callers
/// choose the semantic source first, then wait for its geometry; a missing
/// stock frame can never silently turn a stock deal into an above-board
/// deal.
enum NewGameDealSource {
case stock(frame: CGRect)
case aboveBoard(boardSize: CGSize)
}

struct Plan {
let cards: [DrawAnimationCard]
let cardIDs: Set<UUID>
Expand Down Expand Up @@ -108,8 +117,7 @@ enum DealAnimationCoordinator {
static func makeNewGameDealPlan(
dealtCards: [Card],
cardFrames: [UUID: CGRect],
stockFrame: CGRect,
boardSize: CGSize
source: NewGameDealSource
) -> Plan? {
let flying = dealtCards.compactMap { card -> (card: Card, frame: CGRect)? in
guard let frame = cardFrames[card.id] else { return nil }
Expand All @@ -118,10 +126,12 @@ enum DealAnimationCoordinator {
guard !flying.isEmpty else { return nil }

let start: CGPoint
if stockFrame != .zero {
switch source {
case .stock(let stockFrame):
guard !stockFrame.isEmpty else { return nil }
start = CGPoint(x: stockFrame.midX, y: stockFrame.midY)
} else {
guard boardSize != .zero else { return nil }
case .aboveBoard(let boardSize):
guard boardSize.width > 0, boardSize.height > 0 else { return nil }
let cardHeight = flying[0].frame.height
start = CGPoint(x: boardSize.width * 0.5, y: -cardHeight)
}
Expand Down
Loading