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 minor bugs

Browse source
This commit is contained in:
RandomityGuy 2023-07-07 22:30:18 +05:30
parent b11cf3ac58
commit b28da95535
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/EndGameGui.hx
View file

@ -70,7 +70,7 @@ class EndGameGui extends GuiImage {
endGameWnd = new GuiImage(ResourceLoader.getResource("data/ui/xbox/endGameWindow.png", ResourceLoader.getImage, this.imageResources).toTile()); endGameWnd = new GuiImage(ResourceLoader.getResource("data/ui/xbox/endGameWindow.png", ResourceLoader.getImage, this.imageResources).toTile());
endGameWnd.horizSizing = Left; endGameWnd.horizSizing = Left;
endGameWnd.vertSizing = Top; endGameWnd.vertSizing = Top;
endGameWnd.position = new Vector(80 - offsetX, 170 - offsetY); endGameWnd.position = new Vector(80 - offsetX, 150 - offsetY);
endGameWnd.extent = new Vector(336, 150); endGameWnd.extent = new Vector(336, 150);
innerCtrl.addChild(endGameWnd); innerCtrl.addChild(endGameWnd);

5
src/gui/PlayGui.hx
View file

@ -147,7 +147,7 @@ class PlayGui {
initFPSMeter(); initFPSMeter();
if (Util.isTouchDevice()) { if (Util.isTouchDevice()) {
MarbleGame.instance.touchInput.showControls(this.playGuiCtrl, game == 'ultra'); MarbleGame.instance.touchInput.showControls(this.playGuiCtrlOuter, game == 'ultra');
} }
playGuiCtrlOuter.render(scene2d); playGuiCtrlOuter.render(scene2d);
@ -799,6 +799,9 @@ class PlayGui {
for (ch in pgoChildren) { for (ch in pgoChildren) {
playGuiCtrlOuter.addChild(ch); playGuiCtrlOuter.addChild(ch);
} }
if (Util.isTouchDevice()) {
MarbleGame.instance.touchInput.showControls(this.playGuiCtrlOuter, true);
}
playGuiCtrlOuter.render(MarbleGame.canvas.scene2d); playGuiCtrlOuter.render(MarbleGame.canvas.scene2d);
pgoChildren = []; pgoChildren = [];
} }

8
src/triggers/Trigger.hx
View file

@ -44,13 +44,15 @@ class Trigger extends GameObject {
var p7 = origin.add(d2).add(d3); var p7 = origin.add(d2).add(d3);
var p8 = origin.add(d1).add(d2).add(d3); var p8 = origin.add(d1).add(d2).add(d3);
var scale = MisParser.parseVector3(element.scale);
var mat = new Matrix(); var mat = new Matrix();
mat.identity();
mat.scale(scale.x, scale.y, scale.z);
var quat = MisParser.parseRotation(element.rotation); var quat = MisParser.parseRotation(element.rotation);
quat.x = -quat.x; quat.x = -quat.x;
quat.w = -quat.w; quat.w = -quat.w;
quat.toMatrix(mat); mat.multiply(mat, quat.toMatrix());
var scale = MisParser.parseVector3(element.scale);
mat.scale(scale.x, scale.y, scale.z);
var pos = MisParser.parseVector3(element.position); var pos = MisParser.parseVector3(element.position);
pos.x = -pos.x; pos.x = -pos.x;
// mat.setPosition(pos); // mat.setPosition(pos);