funman300/Ferrous-Solitaire
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 28 Wiki Activity

fix(engine): restore card to origin slot after rejected drop

Browse Source 
When a drag was rejected, ShakeAnim was inserted on each dragged card
with origin_x = transform.translation.x — the drop-location X, not the
origin pile slot's X. tick_shake_anim restores translation.x to
origin_x at the end of the 0.3s shake, which fights the sync_cards
slide that StateChangedEvent triggers and pins the card at the drop
location. The visible symptom (reported during the 2026-04-29 smoke
test) was "the card returns to the slot beside the pile".

Compute the target X using the existing card_position() helper
against the origin pile and the card's stack_index, then save that as
ShakeAnim::origin_x. The shake now ends with the card at its correct
resting slot. Apply the same fix to both the mouse path (end_drag)
and the touch path (touch_end_drag), and update the existing Task #57
test to reflect the new contract (origin_x = origin slot X, not
drop-location X).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
funman300
2026-04-29 22:29:20 +00:00
parent adece12cf1
commit 7a77c66f6d
1 changed files with 63 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solitaire_engine/src/input_plugin.rs
+63 -27
View File
@@ -694,16 +694,31 @@ fn end_drag(
count, count,
}); });
// Shake each dragged card so the player gets immediate // Shake each dragged card so the player gets immediate
// visual feedback that the drop was rejected. // visual feedback that the drop was rejected. ShakeAnim
for &card_id in &drag.cards { // restores translation.x to origin_x at the end of the
if let Some((entity, _, transform)) = card_entities // animation, so origin_x must be the target slot in the
.iter() // origin pile — using the current drag transform would
.find(|(_, ce, _)| ce.card_id == card_id) // pin the card at the drop location and fight the
{ // sync_cards slide that StateChangedEvent triggers
commands.entity(entity).insert(ShakeAnim { // (the symptom is "card lands beside the pile").
elapsed: 0.0, if let Some(origin_pile) = game.0.piles.get(&origin) {
origin_x: transform.translation.x, for &card_id in &drag.cards {
}); let Some(stack_index) =
origin_pile.cards.iter().position(|c| c.id == card_id)
else {
continue;
};
let target_pos =
card_position(&game.0, &layout.0, &origin, stack_index);
if let Some((entity, _, _)) = card_entities
.iter()
.find(|(_, ce, _)| ce.card_id == card_id)
{
commands.entity(entity).insert(ShakeAnim {
elapsed: 0.0,
origin_x: target_pos.x,
});
}
} }
} }
} }
@@ -911,14 +926,26 @@ fn touch_end_drag(
fired = true; fired = true;
} else { } else {
rejected.write(MoveRejectedEvent { from: origin.clone(), to: target, count }); rejected.write(MoveRejectedEvent { from: origin.clone(), to: target, count });
for &card_id in &drag.cards { // See `end_drag` (mouse path) for the rationale: ShakeAnim
if let Some((entity, _, transform)) = // restores translation.x to origin_x, so origin_x must be
card_entities.iter().find(|(_, ce, _)| ce.card_id == card_id) // the origin pile's slot, not the drop location.
{ if let Some(origin_pile) = game.0.piles.get(&origin) {
commands.entity(entity).insert(ShakeAnim { for &card_id in &drag.cards {
elapsed: 0.0, let Some(stack_index) =
origin_x: transform.translation.x, origin_pile.cards.iter().position(|c| c.id == card_id)
}); else {
continue;
};
let target_pos =
card_position(&game.0, &layout.0, &origin, stack_index);
if let Some((entity, _, _)) =
card_entities.iter().find(|(_, ce, _)| ce.card_id == card_id)
{
commands.entity(entity).insert(ShakeAnim {
elapsed: 0.0,
origin_x: target_pos.x,
});
}
} }
} }
} }
@@ -2025,7 +2052,11 @@ mod tests {
/// Verifies that `ShakeAnim` constructed for a rejected drag has the /// Verifies that `ShakeAnim` constructed for a rejected drag has the
/// correct initial values: `elapsed` starts at 0.0 and `origin_x` matches /// correct initial values: `elapsed` starts at 0.0 and `origin_x` matches
/// the card's current transform X position. /// the **target slot in the origin pile** (where the card will rest after
/// the rejection). Saving the drop-location X here was the root cause of
/// the "card lands beside the pile" bug — `tick_shake_anim` restores
/// `translation.x` to `origin_x` at the end of the shake, fighting the
/// `sync_cards` slide that `StateChangedEvent` triggers.
/// ///
/// The Bevy ECS part (Commands + Query) is exercised at runtime; this test /// The Bevy ECS part (Commands + Query) is exercised at runtime; this test
/// covers the data path — that we build the component with the right values /// covers the data path — that we build the component with the right values
@@ -2034,14 +2065,18 @@ mod tests {
fn shake_anim_for_rejected_drag_has_correct_initial_values() { fn shake_anim_for_rejected_drag_has_correct_initial_values() {
use crate::feedback_anim_plugin::ShakeAnim; use crate::feedback_anim_plugin::ShakeAnim;
// Simulate the transform X that a dragged card would have at the // Simulate the X coordinate of the card's slot in its origin pile —
// moment the drag is released (could be anywhere on screen). // computed by `card_position(game, layout, &origin, stack_index)` at
let current_x = 123.5_f32; // rejection time, not the drop-location transform X.
let target_slot_x = 123.5_f32;
// This mirrors the ShakeAnim construction in `end_drag`. // This mirrors the ShakeAnim construction in `end_drag` and
// `touch_end_drag` after the bugfix: origin_x is the origin pile's
// slot X, so the shake ends with the card at its correct resting
// position.
let anim = ShakeAnim { let anim = ShakeAnim {
elapsed: 0.0, elapsed: 0.0,
origin_x: current_x, origin_x: target_slot_x,
}; };
assert_eq!( assert_eq!(
@@ -2049,9 +2084,10 @@ mod tests {
"ShakeAnim must start with elapsed=0.0 so the animation plays from the beginning" "ShakeAnim must start with elapsed=0.0 so the animation plays from the beginning"
); );
assert!( assert!(
(anim.origin_x - current_x).abs() < 1e-6, (anim.origin_x - target_slot_x).abs() < 1e-6,
"ShakeAnim origin_x must match the card's transform X at drop time, \ "ShakeAnim origin_x must match the origin pile slot's X (where the \
expected {current_x}, got {}", card belongs after rejection), not the drop-location transform X. \
Expected {target_slot_x}, got {}",
anim.origin_x anim.origin_x
); );
} }