drifty/WebMonkeyBall
1
0
Fork 0
mirror of https://github.com/sndrec/WebMonkeyBall.git synced 2026-02-03 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix accidental switch behaviour regression

Browse Source
This commit is contained in:
Brandon Johnson
2026-01-31 15:48:06 -05:00
parent 451e4ac769
commit 1c8382cc26
1 changed files with 161 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

236
src/stage.ts
View File

@@ -1533,12 +1533,96 @@ export class StageRuntime {
} else {
this.timerFrames += frameDelta;
}
if (this.format === 'smb2') {
this.updateSwitchesSmb2PreAnim();
}
this.updateAnimGroups(this.timerFrames / 60, frameDelta, smb2LoadInFrames);
if (world) {
this.updateObjects(world, ball, camera);
}
}
updateSwitchesSmb2PreAnim() {
const stack = this.matrixStack;
for (const stageSwitch of this.switches) {
stageSwitch.prevPos.x = stageSwitch.pos.x;
stageSwitch.prevPos.y = stageSwitch.pos.y;
stageSwitch.prevPos.z = stageSwitch.pos.z;
const playbackState = stageSwitch.type & 7;
const groupMatches = this.isAnimGroupInPlaybackState(stageSwitch.animGroupId, playbackState);
if (stageSwitch.state === 2) {
stageSwitch.state = 3;
}
if (stageSwitch.state < 2) {
if (stageSwitch.state === 0) {
stageSwitch.state = 1;
stageSwitch.pressImpulse = false;
stageSwitch.triggered = false;
}
stageSwitch.localVel.y += -stageSwitch.localPos.y * 0.1;
stageSwitch.localVel.y *= 0.95;
stageSwitch.localPos.y += stageSwitch.localVel.y;
if (stageSwitch.localPos.y < -0.1) {
stageSwitch.localPos.y = -0.1;
if (stageSwitch.localVel.y < 0) {
stageSwitch.localVel.y *= -0.8;
}
} else if (stageSwitch.localPos.y > 0.1) {
stageSwitch.localPos.y = 0.1;
if (stageSwitch.localVel.y > 0) {
stageSwitch.localVel.y *= -0.8;
}
}
if (groupMatches) {
stageSwitch.state = 2;
if (!stageSwitch.triggered) {
this.applySwitchPlayback(stageSwitch, false);
stageSwitch.triggered = true;
}
}
if (stageSwitch.pressImpulse && stageSwitch.localPos.y < -0.025) {
stageSwitch.state = 2;
if (!stageSwitch.triggered) {
this.switchPressCount = (this.switchPressCount ?? 0) + 1;
this.applySwitchPlayback(stageSwitch, false);
stageSwitch.triggered = true;
}
}
} else if (!groupMatches) {
stageSwitch.state = 0;
}
if (stageSwitch.state >= 2) {
stageSwitch.localVel.y += (-0.1 - stageSwitch.localPos.y) * 0.1;
stageSwitch.localVel.y *= 0.9;
stageSwitch.localPos.y += stageSwitch.localVel.y;
if (stageSwitch.localPos.y < -0.1) {
stageSwitch.localPos.y = -0.1;
if (stageSwitch.localVel.y < 0) {
stageSwitch.localVel.y *= -0.8;
}
} else if (stageSwitch.localPos.y > 0) {
stageSwitch.localPos.y = 0;
if (stageSwitch.localVel.y > 0) {
stageSwitch.localVel.y *= -0.8;
}
}
}
stack.fromIdentity();
stack.rotateZ(stageSwitch.rot.z);
stack.rotateY(stageSwitch.rot.y);
stack.rotateX(stageSwitch.rot.x);
const localPos = {
x: stageSwitch.localPos.x,
y: stageSwitch.localPos.y,
z: stageSwitch.localPos.z,
};
stack.tfPoint(localPos, localPos);
stageSwitch.pos.x = stageSwitch.basePos.x + localPos.x;
stageSwitch.pos.y = stageSwitch.basePos.y + localPos.y;
stageSwitch.pos.z = stageSwitch.basePos.z + localPos.z;
}
}
updateAnimGroups(timeSeconds, frameDelta = 1, smb2LoadInFrames = null) {
const stage = this.stage;
if (this.format === 'smb2') {
@@ -1872,82 +1956,84 @@ export class StageRuntime {
stageSwitch.cooldown -= 1;
}
}
for (const stageSwitch of this.switches) {
stageSwitch.prevPos.x = stageSwitch.pos.x;
stageSwitch.prevPos.y = stageSwitch.pos.y;
stageSwitch.prevPos.z = stageSwitch.pos.z;
const playbackState = stageSwitch.type & 7;
const groupMatches = this.isAnimGroupInPlaybackState(stageSwitch.animGroupId, playbackState);
if (stageSwitch.state === 2) {
stageSwitch.state = 3;
if (this.format !== 'smb2') {
for (const stageSwitch of this.switches) {
stageSwitch.prevPos.x = stageSwitch.pos.x;
stageSwitch.prevPos.y = stageSwitch.pos.y;
stageSwitch.prevPos.z = stageSwitch.pos.z;
const playbackState = stageSwitch.type & 7;
const groupMatches = this.isAnimGroupInPlaybackState(stageSwitch.animGroupId, playbackState);
if (stageSwitch.state === 2) {
stageSwitch.state = 3;
}
if (stageSwitch.state < 2) {
if (stageSwitch.state === 0) {
stageSwitch.state = 1;
stageSwitch.pressImpulse = false;
stageSwitch.triggered = false;
}
stageSwitch.localVel.y += -stageSwitch.localPos.y * 0.1;
stageSwitch.localVel.y *= 0.95;
stageSwitch.localPos.y += stageSwitch.localVel.y;
if (stageSwitch.localPos.y < -0.1) {
stageSwitch.localPos.y = -0.1;
if (stageSwitch.localVel.y < 0) {
stageSwitch.localVel.y *= -0.8;
}
} else if (stageSwitch.localPos.y > 0.1) {
stageSwitch.localPos.y = 0.1;
if (stageSwitch.localVel.y > 0) {
stageSwitch.localVel.y *= -0.8;
}
}
if (groupMatches) {
stageSwitch.state = 2;
if (!stageSwitch.triggered) {
this.applySwitchPlayback(stageSwitch, false);
stageSwitch.triggered = true;
}
}
if (stageSwitch.pressImpulse && stageSwitch.localPos.y < -0.025) {
stageSwitch.state = 2;
if (!stageSwitch.triggered) {
this.switchPressCount = (this.switchPressCount ?? 0) + 1;
this.applySwitchPlayback(stageSwitch, false);
stageSwitch.triggered = true;
}
}
} else if (!groupMatches) {
stageSwitch.state = 0;
}
if (stageSwitch.state >= 2) {
stageSwitch.localVel.y += (-0.1 - stageSwitch.localPos.y) * 0.1;
stageSwitch.localVel.y *= 0.9;
stageSwitch.localPos.y += stageSwitch.localVel.y;
if (stageSwitch.localPos.y < -0.1) {
stageSwitch.localPos.y = -0.1;
if (stageSwitch.localVel.y < 0) {
stageSwitch.localVel.y *= -0.8;
}
} else if (stageSwitch.localPos.y > 0) {
stageSwitch.localPos.y = 0;
if (stageSwitch.localVel.y > 0) {
stageSwitch.localVel.y *= -0.8;
}
}
}
stack.fromIdentity();
stack.rotateZ(stageSwitch.rot.z);
stack.rotateY(stageSwitch.rot.y);
stack.rotateX(stageSwitch.rot.x);
const localPos = {
x: stageSwitch.localPos.x,
y: stageSwitch.localPos.y,
z: stageSwitch.localPos.z,
};
stack.tfPoint(localPos, localPos);
stageSwitch.pos.x = stageSwitch.basePos.x + localPos.x;
stageSwitch.pos.y = stageSwitch.basePos.y + localPos.y;
stageSwitch.pos.z = stageSwitch.basePos.z + localPos.z;
}
if (stageSwitch.state < 2) {
if (stageSwitch.state === 0) {
stageSwitch.state = 1;
stageSwitch.pressImpulse = false;
stageSwitch.triggered = false;
}
stageSwitch.localVel.y += -stageSwitch.localPos.y * 0.1;
stageSwitch.localVel.y *= 0.95;
stageSwitch.localPos.y += stageSwitch.localVel.y;
if (stageSwitch.localPos.y < -0.1) {
stageSwitch.localPos.y = -0.1;
if (stageSwitch.localVel.y < 0) {
stageSwitch.localVel.y *= -0.8;
}
} else if (stageSwitch.localPos.y > 0.1) {
stageSwitch.localPos.y = 0.1;
if (stageSwitch.localVel.y > 0) {
stageSwitch.localVel.y *= -0.8;
}
}
if (groupMatches) {
stageSwitch.state = 2;
if (this.format === 'smb2' && !stageSwitch.triggered) {
this.applySwitchPlayback(stageSwitch, false);
stageSwitch.triggered = true;
}
}
if (stageSwitch.pressImpulse && stageSwitch.localPos.y < -0.025) {
stageSwitch.state = 2;
if (this.format === 'smb2' && !stageSwitch.triggered) {
this.switchPressCount = (this.switchPressCount ?? 0) + 1;
this.applySwitchPlayback(stageSwitch, false);
stageSwitch.triggered = true;
}
}
} else if (!groupMatches) {
stageSwitch.state = 0;
}
if (stageSwitch.state >= 2) {
stageSwitch.localVel.y += (-0.1 - stageSwitch.localPos.y) * 0.1;
stageSwitch.localVel.y *= 0.9;
stageSwitch.localPos.y += stageSwitch.localVel.y;
if (stageSwitch.localPos.y < -0.1) {
stageSwitch.localPos.y = -0.1;
if (stageSwitch.localVel.y < 0) {
stageSwitch.localVel.y *= -0.8;
}
} else if (stageSwitch.localPos.y > 0) {
stageSwitch.localPos.y = 0;
if (stageSwitch.localVel.y > 0) {
stageSwitch.localVel.y *= -0.8;
}
}
}
stack.fromIdentity();
stack.rotateZ(stageSwitch.rot.z);
stack.rotateY(stageSwitch.rot.y);
stack.rotateX(stageSwitch.rot.x);
const localPos = {
x: stageSwitch.localPos.x,
y: stageSwitch.localPos.y,
z: stageSwitch.localPos.z,
};
stack.tfPoint(localPos, localPos);
stageSwitch.pos.x = stageSwitch.basePos.x + localPos.x;
stageSwitch.pos.y = stageSwitch.basePos.y + localPos.y;
stageSwitch.pos.z = stageSwitch.basePos.z + localPos.z;
}
this.syncObjectTransforms();
}