thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix the marble rotation bug and mp finish command

Browse source
This commit is contained in:
RandomityGuy 2024-02-29 01:41:09 +05:30
parent 1988468a8e
commit e873798d38
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Marble.hx
View file

@ -1817,9 +1817,9 @@ class Marble extends GameObject {
var renderPos = Util.lerpThreeVectors(this.oldPos, this.newPos, deltaT);
this.setPosition(renderPos.x, renderPos.y, renderPos.z);
var rot = this.prevRot;
var rot = this.getRotationQuat();
var quat = new Quat();
quat.initRotation(omega.x * physicsAccumulator, omega.y * physicsAccumulator, omega.z * physicsAccumulator);
quat.initRotation(omega.x * timeState.dt, omega.y * timeState.dt, omega.z * timeState.dt);
quat.multiply(quat, rot);
this.setRotationQuat(quat);
@ -1953,9 +1953,9 @@ class Marble extends GameObject {
var renderPos = Util.lerpThreeVectors(this.oldPos, this.newPos, deltaT);
this.setPosition(renderPos.x, renderPos.y, renderPos.z);
var rot = this.prevRot;
var rot = this.getRotationQuat();
var quat = new Quat();
quat.initRotation(omega.x * physicsAccumulator, omega.y * physicsAccumulator, omega.z * physicsAccumulator);
quat.initRotation(omega.x * timeState.dt, omega.y * timeState.dt, omega.z * timeState.dt);
quat.multiply(quat, rot);
this.setRotationQuat(quat);

18
src/modes/HuntMode.hx
View file

@ -584,7 +584,7 @@ class HuntMode extends NullMode {
override function onTimeExpire() {
if (level.finishTime != null)
return;
if (!this.level.isMultiplayer || Net.isHost) {
if (this.level.isMultiplayer) {
AudioManager.playSound(ResourceLoader.getResource('data/sound/finish.wav', ResourceLoader.getAudio, @:privateAccess level.soundResources));
level.finishTime = level.timeState.clone();
level.marble.setMode(Start);
@ -598,21 +598,7 @@ class HuntMode extends NullMode {
NetCommands.timerRanOut();
}
if (!level.isWatching) {
var myScore = {
name: "Player",
time: getFinishScore()
};
Settings.saveScore(level.mission.path, myScore, getScoreType());
var notifies = AchievementsGui.check();
var delay = 5.0;
var achDelay = 0.0;
for (i in 0...9) {
if (notifies & (1 << i) > 0)
achDelay += 3;
}
if (notifies > 0)
achDelay += 0.5;
@:privateAccess level.schedule(level.timeState.currentAttemptTime + Math.max(delay, achDelay), () -> cast level.showFinishScreen());
@:privateAccess level.schedule(level.timeState.currentAttemptTime, () -> cast level.showFinishScreen());
}
// Stop the ongoing sounds
if (@:privateAccess level.timeTravelSound != null) {