thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-04-26 20:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix this lol

Browse source
This commit is contained in:
RandomityGuy 2024-06-28 23:51:17 +05:30
parent e9c948f6d0
commit 05f154d765
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/MarblePickerGui.hx
View file

@ -303,6 +303,7 @@ class MarblePickerGui extends GuiImage {
mbOpt.extent = new Vector(815, 94); mbOpt.extent = new Vector(815, 94);
mbOpt.setCurrentOption(Settings.optionsSettings.marbleIndex); mbOpt.setCurrentOption(Settings.optionsSettings.marbleIndex);
var curToken = 0; var curToken = 0;
mbOpt.onChangeFunc = (idx) -> { mbOpt.onChangeFunc = (idx) -> {
var selectedMarble = marbleData[idx]; var selectedMarble = marbleData[idx];
Settings.optionsSettings.marbleIndex = idx; Settings.optionsSettings.marbleIndex = idx;
@ -312,10 +313,14 @@ class MarblePickerGui extends GuiImage {
Settings.optionsSettings.marbleShader = selectedMarble.shader; Settings.optionsSettings.marbleShader = selectedMarble.shader;
var changeToken = curToken++; var changeToken = curToken++;
ResourceLoader.load(Settings.optionsSettings.marbleModel).entry.load(() -> { ResourceLoader.load(Settings.optionsSettings.marbleModel).entry.load(() -> {
if (changeToken + 1 != curToken)
return;
@:privateAccess MarbleGame.instance.previewWorld.removeMarble(myMarb); @:privateAccess MarbleGame.instance.previewWorld.removeMarble(myMarb);
@:privateAccess MarbleGame.instance.previewWorld.spawnMarble(marb -> { @:privateAccess MarbleGame.instance.previewWorld.spawnMarble(marb -> {
if (changeToken + 1 != curToken) if (changeToken + 1 != curToken) {
@:privateAccess MarbleGame.instance.previewWorld.removeMarble(marb);
return; return;
}
var spawnPos = @:privateAccess MarbleGame.instance.scene.camera.pos.add(new Vector(0, 1, 1)); var spawnPos = @:privateAccess MarbleGame.instance.scene.camera.pos.add(new Vector(0, 1, 1));
var velAdd = new Vector((1 - 2 * Math.random()) * 2, (1 - 2 * Math.random()) * 1.5, (1 - 2 * Math.random()) * 1); var velAdd = new Vector((1 - 2 * Math.random()) * 2, (1 - 2 * Math.random()) * 1.5, (1 - 2 * Math.random()) * 1);
velAdd = velAdd.add(new Vector(0, 3, 0)); velAdd = velAdd.add(new Vector(0, 3, 0));
@ -343,6 +348,9 @@ class MarblePickerGui extends GuiImage {
backButton.accelerators = [hxd.Key.ENTER]; backButton.accelerators = [hxd.Key.ENTER];
backButton.pressedAction = (e) -> { backButton.pressedAction = (e) -> {
this.bmp.visible = true; this.bmp.visible = true;
mbOpt.onChangeFunc = (e) -> {
return false;
}; // Fix that marbug
MarbleGame.instance.setPreviewMission(prevPreview, () -> { MarbleGame.instance.setPreviewMission(prevPreview, () -> {
MarbleGame.canvas.setContent(new OptionsListGui()); MarbleGame.canvas.setContent(new OptionsListGui());
}, false); }, false);