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

android fixes finish

Browse source
This commit is contained in:
RandomityGuy 2022-12-21 01:54:14 +05:30
parent b25213c29b
commit ba8838dadf
2 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/MarbleWorld.hx
View file

@ -1089,7 +1089,7 @@ class MarbleWorld extends Scheduler {
asyncLoadResources(); asyncLoadResources();
if (this.playGui != null && _ready) if (this.playGui != null && _ready)
this.playGui.render(e); this.playGui.render(e);
if (this.marble != null && this.marble.cubemapRenderer != null) { if (this.marble != null && this.marble.cubemapRenderer != null && _ready) {
this.marble.cubemapRenderer.position.load(this.marble.getAbsPos().getPosition()); this.marble.cubemapRenderer.position.load(this.marble.getAbsPos().getPosition());
this.marble.cubemapRenderer.render(e, 0.002); this.marble.cubemapRenderer.render(e, 0.002);
} }

17
src/gui/PlayGui.hx
View file

@ -108,7 +108,7 @@ class PlayGui {
} }
} }
public function init(scene2d:h2d.Scene, game:String, onFinish:Void->Void) { public function init(scene2d:h2d.Scene, game:String) {
this.scene2d = scene2d; this.scene2d = scene2d;
this._init = true; this._init = true;
@ -149,9 +149,7 @@ class PlayGui {
powerupBox = new GuiImage(ResourceLoader.getResource('data/ui/game/powerup.png', ResourceLoader.getImage, this.imageResources).toTile()); powerupBox = new GuiImage(ResourceLoader.getResource('data/ui/game/powerup.png', ResourceLoader.getImage, this.imageResources).toTile());
initTimer(); initTimer();
initGemCounter(() -> { initGemCounter();
onFinish();
});
initCenterText(); initCenterText();
initPowerupBox(); initPowerupBox();
if (game == 'ultra') if (game == 'ultra')
@ -270,7 +268,7 @@ class PlayGui {
} }
} }
public function initGemCounter(onFinish:Void->Void) { public function initGemCounter() {
gemCountNumbers[0].position = new Vector(30, 0); gemCountNumbers[0].position = new Vector(30, 0);
gemCountNumbers[0].extent = new Vector(43, 55); gemCountNumbers[0].extent = new Vector(43, 55);
@ -326,9 +324,8 @@ class PlayGui {
// gemImageObject.matNameOverride.set("base.gem", "base.gem."); // gemImageObject.matNameOverride.set("base.gem", "base.gem.");
gemImageObject.ambientSpinFactor /= -2; gemImageObject.ambientSpinFactor /= -2;
// ["base.gem"] = color + ".gem"; // ["base.gem"] = color + ".gem";
ResourceLoader.load("shapes/items/gem.dts").entry.load(() -> { gemImageObject.init(null, () -> {});
ResourceLoader.load("shapes/items/" + gemColor + ".gem.png").entry.load(() -> {
gemImageObject.init(null, () -> {
for (mat in gemImageObject.materials) { for (mat in gemImageObject.materials) {
mat.mainPass.enableLights = false; mat.mainPass.enableLights = false;
@ -343,10 +340,6 @@ class PlayGui {
gemImageScene.camera.pos = new Vector(0, 3, gemImageCenter.z); gemImageScene.camera.pos = new Vector(0, 3, gemImageCenter.z);
gemImageScene.camera.target = new Vector(gemImageCenter.x, gemImageCenter.y, gemImageCenter.z); gemImageScene.camera.target = new Vector(gemImageCenter.x, gemImageCenter.y, gemImageCenter.z);
onFinish();
});
});
});
} }
function initPowerupBox() { function initPowerupBox() {