nils/papercrate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Clamp leader rotation limits to prevent extreme angles and add a safety check for inverted limits.

Browse Source
This commit is contained in:
nils
2025-11-28 01:27:57 +01:00
parent 7c03eecd30
commit 268488d93d
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/desktop/CardPhysics.ts
+25 -4
View File
@@ -137,8 +137,19 @@ export class CardPhysics {
this.updateMassScale(); this.updateMassScale();
// Constrain leader limits to ensure follower stays within [-5, 5] // Constrain leader limits to ensure follower stays within [-5, 5]
this.minLimit = Math.max(this.minLimit, -this.ROTATION_LIMIT - offset); // But clamp the result to never exceed the global limits [-5, 5]
this.maxLimit = Math.min(this.maxLimit, this.ROTATION_LIMIT - offset); // This prevents the leader from being forced into extreme angles by far-away followers
const calculatedMin = -this.ROTATION_LIMIT - offset;
const calculatedMax = this.ROTATION_LIMIT - offset;
this.minLimit = Math.max(this.minLimit, Math.min(this.ROTATION_LIMIT, Math.max(-this.ROTATION_LIMIT, calculatedMin)));
this.maxLimit = Math.min(this.maxLimit, Math.max(-this.ROTATION_LIMIT, Math.min(this.ROTATION_LIMIT, calculatedMax)));
// Safety: If limits invert (min > max), prioritize keeping leader near 0
if (this.minLimit > this.maxLimit) {
this.minLimit = -this.ROTATION_LIMIT;
this.maxLimit = this.ROTATION_LIMIT;
}
} }
removeFollower(card: LayoutCard) { removeFollower(card: LayoutCard) {
@@ -172,9 +183,19 @@ export class CardPhysics {
// Re-apply limits // Re-apply limits
const offset = f.offsetRotation; const offset = f.offsetRotation;
this.minLimit = Math.max(this.minLimit, -this.ROTATION_LIMIT - offset); const calculatedMin = -this.ROTATION_LIMIT - offset;
this.maxLimit = Math.min(this.maxLimit, this.ROTATION_LIMIT - offset); const calculatedMax = this.ROTATION_LIMIT - offset;
this.minLimit = Math.max(this.minLimit, Math.min(this.ROTATION_LIMIT, Math.max(-this.ROTATION_LIMIT, calculatedMin)));
this.maxLimit = Math.min(this.maxLimit, Math.max(-this.ROTATION_LIMIT, Math.min(this.ROTATION_LIMIT, calculatedMax)));
} }
// Safety check
if (this.minLimit > this.maxLimit) {
this.minLimit = -this.ROTATION_LIMIT;
this.maxLimit = this.ROTATION_LIMIT;
}
this.updateMassScale(); this.updateMassScale();
} }