Skip to content
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

Jump to bottom

fix: slope collision detection is inconsistent #73

Merged
merged 1 commit into from
Oct 7, 2024
Merged

fix: slope collision detection is inconsistent #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 35 additions & 32 deletions packages/leap/lib/src/entities/behaviors/collision_detection_behavior.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,29 @@ class CollisionDetectionBehavior extends PhysicalBehavior
_tmpHits.sort((a, b) => a.left.compareTo(b.left));
final firstRightHit = _tmpHits.first;
if (firstRightHit.isSlopeFromLeft) {
if (velocity.y >= 0) {
// Ignore slope underneath while moving upwards.
collisionInfo.addDownCollision(firstRightHit);
} else {
collisionInfo.addRightCollision(firstRightHit);
}
collisionInfo.addDownCollision(firstRightHit);
} else if (firstRightHit.isPitchFromRight) {
if (velocity.y <= 0) {
// Ignore pitch above while moving down.
collisionInfo.addUpCollision(firstRightHit);
} else {
collisionInfo.addRightCollision(firstRightHit);
}
collisionInfo.addUpCollision(firstRightHit);
} else if (firstRightHit.left >= right) {
_tmpHits
.where((c) => c.left == firstRightHit.left)
.forEach(collisionInfo.addRightCollision);
_tmpHits.where((c) => c.left == firstRightHit.left).forEach((c) {
if (c.isSlopeFromLeft) {
collisionInfo.addDownCollision(c);
} else if (prevCollisionInfo.onSlope &&
prevCollisionInfo.downCollision!.top == c.top) {
collisionInfo.addDownCollision(c);
} else if (c.isPitchFromRight) {
collisionInfo.addUpCollision(c);
} else if (prevCollisionInfo.onPitch &&
prevCollisionInfo.upCollision!.bottom == c.bottom) {
collisionInfo.addUpCollision(c);
} else {
collisionInfo.addRightCollision(c);
}
});
}
}
}

if (velocity.x < 0) {
// Moving left.
_calculateSolidHits((c) {
Expand All @@ -120,25 +123,25 @@ class CollisionDetectionBehavior extends PhysicalBehavior
_tmpHits.sort((a, b) => b.right.compareTo(a.right));
final firstLeftHit = _tmpHits.first;
if (firstLeftHit.isSlopeFromRight) {
// Ignore slope underneath while moving upwards, should not collide
// on left.
if (velocity.y >= 0) {
collisionInfo.addDownCollision(firstLeftHit);
} else {
collisionInfo.addLeftCollision(firstLeftHit);
}
collisionInfo.addDownCollision(firstLeftHit);
} else if (firstLeftHit.isPitchFromLeft) {
// Ignore pitch above while moving downward, should not collide
// on left.
if (velocity.y <= 0) {
collisionInfo.addUpCollision(firstLeftHit);
} else {
collisionInfo.addLeftCollision(firstLeftHit);
}
collisionInfo.addUpCollision(firstLeftHit);
} else if (firstLeftHit.right <= left) {
_tmpHits
.where((c) => c.right == firstLeftHit.right)
.forEach(collisionInfo.addLeftCollision);
_tmpHits.where((c) => c.right == firstLeftHit.right).forEach((c) {
if (c.isSlopeFromRight) {
collisionInfo.addDownCollision(c);
} else if (prevCollisionInfo.onSlope &&
prevCollisionInfo.downCollision!.top == c.top) {
collisionInfo.addDownCollision(c);
} else if (c.isPitchFromLeft) {
collisionInfo.addUpCollision(c);
} else if (prevCollisionInfo.onPitch &&
prevCollisionInfo.upCollision!.bottom == c.bottom) {
collisionInfo.addUpCollision(c);
} else {
collisionInfo.addLeftCollision(c);
}
});
}
}
}
Expand Down
7 changes: 7 additions & 0 deletions packages/leap/lib/src/entities/collision_info.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ class CollisionInfo {
return !up && !down && !left && !right;
}

bool get onPitch {
if (upCollision != null && upCollision is LeapMapGroundTile) {
return (upCollision! as LeapMapGroundTile).isPitch;
}
return false;
}

bool get onSlope {
if (downCollision != null && downCollision is LeapMapGroundTile) {
return (downCollision! as LeapMapGroundTile).isSlope;
Expand Down
Loading