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

bumper animation, marble physics fix on random levels, sound fixes, powerup fixes, gold time fixes

Browse source
This commit is contained in:
RandomityGuy 2021-07-08 14:50:27 +05:30
parent bd33ce408a
commit 2319360908
7 changed files with 146 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
marblegame.hl
View file

Binary file not shown.

29
src/DtsObject.hx
View file

@ -620,11 +620,13 @@ class DtsObject extends GameObject {
var rot = sequence.rotationMatters.length > 0 ? sequence.rotationMatters[0] : 0;
var trans = sequence.translationMatters.length > 0 ? sequence.translationMatters[0] : 0;
var scale = sequence.scaleMatters.length > 0 ? sequence.scaleMatters[0] : 0;
var affectedCount = 0;
var completion = timeState.timeSinceLoad / sequence.duration;
var quaternions:Array<Quat> = null;
var translations:Array<Vector> = null;
var scales:Array<Vector> = null;
var actualKeyframe = this.sequenceKeyframeOverride.exists(sequence) ? this.sequenceKeyframeOverride.get(sequence) : ((completion * sequence.numKeyFrames) % sequence.numKeyFrames);
if (this.lastSequenceKeyframes.get(sequence) == actualKeyframe)
@ -698,6 +700,33 @@ class DtsObject extends GameObject {
}
}
}
if (scale > 0) {
scales = [];
for (i in 0...this.dts.nodes.length) {
var affected = ((1 << i) & scale) != 0;
if (affected) {
var scale1 = this.dts.nodeAlignedScales[sequence.numKeyFrames * affectedCount + keyframeLow];
var scale2 = this.dts.nodeAlignedScales[sequence.numKeyFrames * affectedCount + keyframeHigh];
var v1 = new Vector(scale1.x, scale1.y, scale1.z);
var v2 = new Vector(scale2.x, scale2.y, scale2.z);
var scaleVec = Util.lerpThreeVectors(v1, v2, t);
this.graphNodes[i].scaleX = scaleVec.x;
this.graphNodes[i].scaleY = scaleVec.y;
this.graphNodes[i].scaleZ = scaleVec.z;
this.dirtyTransforms[i] = true;
} else {
this.graphNodes[i].scaleX = 1;
this.graphNodes[i].scaleY = 1;
this.graphNodes[i].scaleZ = 1;
}
}
}
}
if (this.skinMeshData != null && !isInstanced) {

13
src/Marble.hx
View file

@ -171,6 +171,7 @@ class Marble extends GameObject {
var superbounceSound:Channel;
var shockabsorberSound:Channel;
var helicopterSound:Channel;
var playedSounds = [];
public var mode:Mode = Play;
@ -283,10 +284,16 @@ class Marble extends GameObject {
for (contact in contacts) {
if (contact.force != 0 && !forceObjects.contains(contact.otherObject)) {
if (contact.otherObject is RoundBumper) {
if (!playedSounds.contains("data/sound/bumperding1.wav")) {
AudioManager.playSound(ResourceLoader.getAudio("data/sound/bumperding1.wav"));
playedSounds.push("data/sound/bumperding1.wav");
}
}
if (contact.otherObject is TriangleBumper) {
if (!playedSounds.contains("data/sound/bumper1.wav")) {
AudioManager.playSound(ResourceLoader.getAudio("data/sound/bumper1.wav"));
playedSounds.push("data/sound/bumper1.wav");
}
}
forceObjectCount++;
contactNormal = contactNormal.add(contact.normal);
@ -485,7 +492,7 @@ class Marble extends GameObject {
var soFar = 0.0;
for (k in 0...contacts.length) {
var dist = this._radius - contacts[k].contactDistance;
var timeToSeparate = 0.016;
var timeToSeparate = 0.1;
if (dist >= 0) {
var f1 = this.velocity.sub(contacts[k].velocity).add(dir.multiply(soFar)).dot(contacts[k].normal);
var f2 = timeToSeparate * f1;
@ -531,7 +538,10 @@ class Marble extends GameObject {
}
if (sv < this._jumpImpulse) {
this.velocity = this.velocity.add(bestContact.normal.multiply((this._jumpImpulse - sv)));
if (!playedSounds.contains("data/sound/jump.wav")) {
AudioManager.playSound(ResourceLoader.getAudio("data/sound/jump.wav"));
playedSounds.push("data/sound/jump.wav");
}
}
}
for (j in 0...contacts.length) {
@ -951,6 +961,7 @@ class Marble extends GameObject {
}
}
playedSounds = [];
advancePhysics(timeState, move, collisionWorld, pathedInteriors);
if (this.controllable) {

9
src/MarbleWorld.hx
View file

@ -943,7 +943,8 @@ class MarbleWorld extends Scheduler {
}
public function pickUpPowerUp(powerUp:PowerUp) {
if (this.marble.heldPowerup == powerUp)
if (this.marble.heldPowerup != null)
if (this.marble.heldPowerup.identifier == powerUp.identifier)
return false;
this.marble.heldPowerup = powerUp;
this.playGui.setPowerupImage(powerUp.identifier);
@ -951,6 +952,7 @@ class MarbleWorld extends Scheduler {
}
public function deselectPowerUp() {
this.marble.heldPowerup = null;
this.playGui.setPowerupImage("");
}
@ -979,7 +981,7 @@ class MarbleWorld extends Scheduler {
var u = v1.normalized();
var v = v2.normalized();
if (u.multiply(-1).equals(v)) {
if (u.dot(v) == -1) {
var q = new Quat();
var o = orthogonal(u).normalized();
q.x = o.x;
@ -998,8 +1000,7 @@ class MarbleWorld extends Scheduler {
return q;
}
var quatChange = new Quat();
quatChange.initMoveTo(oldUp, vec);
var quatChange = getRotQuat(oldUp, vec);
// Instead of calculating the new quat from nothing, calculate it from the last one to guarantee the shortest possible rotation.
// quatChange.initMoveTo(oldUp, vec);
quatChange.multiply(quatChange, currentQuat);

30
src/gui/EndGameGui.hx
View file

@ -127,10 +127,10 @@ class EndGameGui extends GuiControl {
var rightColumn = new GuiMLText(domcasual32, mlFontLoader);
rightColumn.text.textColor = 0x000000;
rightColumn.text.text = '${Util.formatTime(mission.qualifyTime == Math.POSITIVE_INFINITY ? 5999.999 : mission.qualifyTime)}<br/><font color="#FFFF00">${Util.formatTime(mission.goldTime)}</font><br/>${Util.formatTime(elapsedTime)}<br/>${Util.formatTime(bonusTime)}<br/><font face="Arial14"><br/></font><br/>';
rightColumn.text.text = '${Util.formatTime(mission.qualifyTime == Math.POSITIVE_INFINITY ? 5999.999 : mission.qualifyTime)}<br/><br/>${Util.formatTime(elapsedTime)}<br/>${Util.formatTime(bonusTime)}<br/><font face="Arial14"><br/></font><br/>';
for (i in 0...3) {
if (scoreData[i].time < mission.goldTime)
rightColumn.text.text += '<font color="#FFFF00">${Util.formatTime(scoreData[i].time)}</font><br/>';
rightColumn.text.text += '<br/>';
else
rightColumn.text.text += '${Util.formatTime(scoreData[i].time)}<br/>';
}
@ -139,6 +139,20 @@ class EndGameGui extends GuiControl {
rightColumn.extent = new Vector(208, 50);
pg.addChild(rightColumn);
var rightColumnGold = new GuiMLText(domcasual32, mlFontLoader);
rightColumnGold.text.textColor = 0xFFFF00;
rightColumnGold.text.text = '<br/>${Util.formatTime(mission.goldTime)}<br/><br/><br/><font face="Arial14"><br/></font><br/>';
for (i in 0...3) {
if (scoreData[i].time < mission.goldTime)
rightColumnGold.text.text += '${Util.formatTime(scoreData[i].time)}<br/>';
else
rightColumnGold.text.text += '<br/>';
}
rightColumnGold.text.filter = new DropShadow(1.414, 0.785, 0x00000, 1, 0, 0.4, 1, true);
rightColumnGold.position = new Vector(274, 103);
rightColumnGold.extent = new Vector(208, 50);
pg.addChild(rightColumnGold);
pg.addChild(continueButton);
pg.addChild(restartButton);
@ -168,14 +182,22 @@ class EndGameGui extends GuiControl {
leftColumn.text.text += '${i + 1}. ${scoreData[i].name}<br/>';
}
rightColumn.text.text = '${Util.formatTime(mission.qualifyTime == Math.POSITIVE_INFINITY ? 5999.999 : mission.qualifyTime)}<br/><font color="#FFFF00">${Util.formatTime(mission.goldTime)}</font><br/>${Util.formatTime(elapsedTime)}<br/>${Util.formatTime(bonusTime)}<br/><font face="Arial14"><br/></font><br/>';
rightColumn.text.text = '${Util.formatTime(mission.qualifyTime == Math.POSITIVE_INFINITY ? 5999.999 : mission.qualifyTime)}<br/><br/>${Util.formatTime(elapsedTime)}<br/>${Util.formatTime(bonusTime)}<br/><font face="Arial14"><br/></font><br/>';
for (i in 0...3) {
if (scoreData[i].time < mission.goldTime)
rightColumn.text.text += '<font color="#FFFF00">${Util.formatTime(scoreData[i].time)}</font><br/>';
rightColumn.text.text += '<br/>';
else
rightColumn.text.text += '${Util.formatTime(scoreData[i].time)}<br/>';
}
rightColumnGold.text.text = '<br/>${Util.formatTime(mission.goldTime)}<br/><br/><br/><font face="Arial14"><br/></font><br/>';
for (i in 0...3) {
if (scoreData[i].time < mission.goldTime)
rightColumnGold.text.text += '${Util.formatTime(scoreData[i].time)}<br/>';
else
rightColumnGold.text.text += '<br/>';
}
Settings.saveScore(mission.path, myScore);
scoreSubmitted = true;

6
src/gui/GuiControl.hx
View file

@ -41,6 +41,7 @@ class GuiControl {
var parent:GuiControl;
var _entered:Bool = false;
var _skipNextEvent:Bool = false;
public function new() {}
@ -48,9 +49,11 @@ class GuiControl {
for (c in children) {
c.render(scene2d);
}
this._skipNextEvent = true;
}
public function update(dt:Float, mouseState:MouseState) {
if (!_skipNextEvent) {
var hitTestRect = getHitTestRect();
if (hitTestRect.inRect(mouseState.position)) {
if (Key.isPressed(Key.MOUSE_LEFT)) {
@ -88,6 +91,9 @@ class GuiControl {
this.onMouseLeave(mouseState);
}
}
} else {
_skipNextEvent = false;
}
for (c in children) {
c.update(dt, mouseState);
}

31
src/shapes/RoundBumper.hx
View file

@ -1,12 +1,43 @@
package shapes;
import collision.CollisionInfo;
import src.DtsObject;
import src.TimeState;
import src.Util;
class RoundBumper extends DtsObject {
var lastContactTime = Math.NEGATIVE_INFINITY;
public function new() {
super();
dtsPath = "data/shapes/bumpers/pball_round.dts";
isCollideable = true;
identifier = "RoundBumper";
}
override function update(timeState:src.TimeState) {
// Override the keyframe
var currentCompletion = getCurrentCompletion(timeState);
this.sequenceKeyframeOverride.set(this.dts.sequences[0], currentCompletion * (this.dts.sequences[0].numKeyFrames - 1));
super.update(timeState);
}
function getCurrentCompletion(timeState:TimeState) {
var elapsed = timeState.timeSinceLoad - this.lastContactTime;
var completion = Util.clamp(elapsed / this.dts.sequences[0].duration, 0, 1);
return completion;
}
override function onMarbleContact(time:TimeState, ?contact:CollisionInfo) {
super.onMarbleContact(time, contact);
if (time.timeSinceLoad - this.lastContactTime <= 0)
return;
var currentCompletion = this.getCurrentCompletion(time);
if (currentCompletion == 0 || currentCompletion == 1) {
this.lastContactTime = time.timeSinceLoad;
}
// this.level.replay.recordMarbleContact(this);
}
}