diff --git a/data/ui/backgrounds/gold/1.jpg b/data/ui/backgrounds/gold/1.jpg new file mode 100644 index 00000000..b2217eb1 Binary files /dev/null and b/data/ui/backgrounds/gold/1.jpg differ diff --git a/data/ui/backgrounds/gold/10.jpg b/data/ui/backgrounds/gold/10.jpg new file mode 100644 index 00000000..0442747e Binary files /dev/null and b/data/ui/backgrounds/gold/10.jpg differ diff --git a/data/ui/backgrounds/gold/11.jpg b/data/ui/backgrounds/gold/11.jpg new file mode 100644 index 00000000..c98f4429 Binary files /dev/null and b/data/ui/backgrounds/gold/11.jpg differ diff --git a/data/ui/backgrounds/gold/12.jpg b/data/ui/backgrounds/gold/12.jpg new file mode 100644 index 00000000..a80ab83e Binary files /dev/null and b/data/ui/backgrounds/gold/12.jpg differ diff --git a/data/ui/backgrounds/gold/2.jpg b/data/ui/backgrounds/gold/2.jpg new file mode 100644 index 00000000..c0071863 Binary files /dev/null and b/data/ui/backgrounds/gold/2.jpg differ diff --git a/data/ui/backgrounds/gold/3.jpg b/data/ui/backgrounds/gold/3.jpg new file mode 100644 index 00000000..9be3a702 Binary files /dev/null and b/data/ui/backgrounds/gold/3.jpg differ diff --git a/data/ui/backgrounds/gold/4.jpg b/data/ui/backgrounds/gold/4.jpg new file mode 100644 index 00000000..ce969a33 Binary files /dev/null and b/data/ui/backgrounds/gold/4.jpg differ diff --git a/data/ui/backgrounds/gold/5.jpg b/data/ui/backgrounds/gold/5.jpg new file mode 100644 index 00000000..49583450 Binary files /dev/null and b/data/ui/backgrounds/gold/5.jpg differ diff --git a/data/ui/backgrounds/gold/6.jpg b/data/ui/backgrounds/gold/6.jpg new file mode 100644 index 00000000..85bb1777 Binary files /dev/null and b/data/ui/backgrounds/gold/6.jpg differ diff --git a/data/ui/backgrounds/gold/7.jpg b/data/ui/backgrounds/gold/7.jpg new file mode 100644 index 00000000..4f9791fa Binary files /dev/null and b/data/ui/backgrounds/gold/7.jpg differ diff --git a/data/ui/backgrounds/gold/8.jpg b/data/ui/backgrounds/gold/8.jpg new file mode 100644 index 00000000..111babba Binary files /dev/null and b/data/ui/backgrounds/gold/8.jpg differ diff --git a/data/ui/backgrounds/gold/9.jpg b/data/ui/backgrounds/gold/9.jpg new file mode 100644 index 00000000..5f1a0619 Binary files /dev/null and b/data/ui/backgrounds/gold/9.jpg differ diff --git a/data/ui/backgrounds/multi/1.jpg b/data/ui/backgrounds/multi/1.jpg new file mode 100644 index 00000000..2265cea6 Binary files /dev/null and b/data/ui/backgrounds/multi/1.jpg differ diff --git a/data/ui/backgrounds/multi/10.jpg b/data/ui/backgrounds/multi/10.jpg new file mode 100644 index 00000000..f1de220b Binary files /dev/null and b/data/ui/backgrounds/multi/10.jpg differ diff --git a/data/ui/backgrounds/multi/11.jpg b/data/ui/backgrounds/multi/11.jpg new file mode 100644 index 00000000..4e97e90b Binary files /dev/null and b/data/ui/backgrounds/multi/11.jpg differ diff --git a/data/ui/backgrounds/multi/12.jpg b/data/ui/backgrounds/multi/12.jpg new file mode 100644 index 00000000..eb3ee166 Binary files /dev/null and b/data/ui/backgrounds/multi/12.jpg differ diff --git a/data/ui/backgrounds/multi/13.jpg b/data/ui/backgrounds/multi/13.jpg new file mode 100644 index 00000000..d2580ba8 Binary files /dev/null and b/data/ui/backgrounds/multi/13.jpg differ diff --git a/data/ui/backgrounds/multi/2.jpg b/data/ui/backgrounds/multi/2.jpg new file mode 100644 index 00000000..21d9b33b Binary files /dev/null and b/data/ui/backgrounds/multi/2.jpg differ diff --git a/data/ui/backgrounds/multi/3.jpg b/data/ui/backgrounds/multi/3.jpg new file mode 100644 index 00000000..a3765066 Binary files /dev/null and b/data/ui/backgrounds/multi/3.jpg differ diff --git a/data/ui/backgrounds/multi/4.jpg b/data/ui/backgrounds/multi/4.jpg new file mode 100644 index 00000000..31291976 Binary files /dev/null and b/data/ui/backgrounds/multi/4.jpg differ diff --git a/data/ui/backgrounds/multi/5.jpg b/data/ui/backgrounds/multi/5.jpg new file mode 100644 index 00000000..58f4178d Binary files /dev/null and b/data/ui/backgrounds/multi/5.jpg differ diff --git a/data/ui/backgrounds/multi/6.jpg b/data/ui/backgrounds/multi/6.jpg new file mode 100644 index 00000000..325ac21e Binary files /dev/null and b/data/ui/backgrounds/multi/6.jpg differ diff --git a/data/ui/backgrounds/multi/7.jpg b/data/ui/backgrounds/multi/7.jpg new file mode 100644 index 00000000..aca405c3 Binary files /dev/null and b/data/ui/backgrounds/multi/7.jpg differ diff --git a/data/ui/backgrounds/multi/8.jpg b/data/ui/backgrounds/multi/8.jpg new file mode 100644 index 00000000..5204be70 Binary files /dev/null and b/data/ui/backgrounds/multi/8.jpg differ diff --git a/data/ui/backgrounds/multi/9.jpg b/data/ui/backgrounds/multi/9.jpg new file mode 100644 index 00000000..23b82338 Binary files /dev/null and b/data/ui/backgrounds/multi/9.jpg differ diff --git a/data/ui/backgrounds/platinum/1.jpg b/data/ui/backgrounds/platinum/1.jpg new file mode 100644 index 00000000..39c4ed8e Binary files /dev/null and b/data/ui/backgrounds/platinum/1.jpg differ diff --git a/data/ui/backgrounds/platinum/10.jpg b/data/ui/backgrounds/platinum/10.jpg new file mode 100644 index 00000000..9cb45b1f Binary files /dev/null and b/data/ui/backgrounds/platinum/10.jpg differ diff --git a/data/ui/backgrounds/platinum/11.jpg b/data/ui/backgrounds/platinum/11.jpg new file mode 100644 index 00000000..9bc2b95b Binary files /dev/null and b/data/ui/backgrounds/platinum/11.jpg differ diff --git a/data/ui/backgrounds/platinum/12.jpg b/data/ui/backgrounds/platinum/12.jpg new file mode 100644 index 00000000..f7257f77 Binary files /dev/null and b/data/ui/backgrounds/platinum/12.jpg differ diff --git a/data/ui/backgrounds/platinum/13.jpg b/data/ui/backgrounds/platinum/13.jpg new file mode 100644 index 00000000..68f36a95 Binary files /dev/null and b/data/ui/backgrounds/platinum/13.jpg differ diff --git a/data/ui/backgrounds/platinum/14.jpg b/data/ui/backgrounds/platinum/14.jpg new file mode 100644 index 00000000..1bebf9e3 Binary files /dev/null and b/data/ui/backgrounds/platinum/14.jpg differ diff --git a/data/ui/backgrounds/platinum/15.jpg b/data/ui/backgrounds/platinum/15.jpg new file mode 100644 index 00000000..f548fa7f Binary files /dev/null and b/data/ui/backgrounds/platinum/15.jpg differ diff --git a/data/ui/backgrounds/platinum/16.jpg b/data/ui/backgrounds/platinum/16.jpg new file mode 100644 index 00000000..c89bafd1 Binary files /dev/null and b/data/ui/backgrounds/platinum/16.jpg differ diff --git a/data/ui/backgrounds/platinum/17.jpg b/data/ui/backgrounds/platinum/17.jpg new file mode 100644 index 00000000..8510d8ed Binary files /dev/null and b/data/ui/backgrounds/platinum/17.jpg differ diff --git a/data/ui/backgrounds/platinum/18.jpg b/data/ui/backgrounds/platinum/18.jpg new file mode 100644 index 00000000..1f4ec78c Binary files /dev/null and b/data/ui/backgrounds/platinum/18.jpg differ diff --git a/data/ui/backgrounds/platinum/19.jpg b/data/ui/backgrounds/platinum/19.jpg new file mode 100644 index 00000000..fae925dc Binary files /dev/null and b/data/ui/backgrounds/platinum/19.jpg differ diff --git a/data/ui/backgrounds/platinum/2.jpg b/data/ui/backgrounds/platinum/2.jpg new file mode 100644 index 00000000..7fc3c88e Binary files /dev/null and b/data/ui/backgrounds/platinum/2.jpg differ diff --git a/data/ui/backgrounds/platinum/20.jpg b/data/ui/backgrounds/platinum/20.jpg new file mode 100644 index 00000000..8853c50b Binary files /dev/null and b/data/ui/backgrounds/platinum/20.jpg differ diff --git a/data/ui/backgrounds/platinum/21.jpg b/data/ui/backgrounds/platinum/21.jpg new file mode 100644 index 00000000..9853e8ce Binary files /dev/null and b/data/ui/backgrounds/platinum/21.jpg differ diff --git a/data/ui/backgrounds/platinum/22.jpg b/data/ui/backgrounds/platinum/22.jpg new file mode 100644 index 00000000..22f90595 Binary files /dev/null and b/data/ui/backgrounds/platinum/22.jpg differ diff --git a/data/ui/backgrounds/platinum/23.jpg b/data/ui/backgrounds/platinum/23.jpg new file mode 100644 index 00000000..b93daaab Binary files /dev/null and b/data/ui/backgrounds/platinum/23.jpg differ diff --git a/data/ui/backgrounds/platinum/24.jpg b/data/ui/backgrounds/platinum/24.jpg new file mode 100644 index 00000000..90843198 Binary files /dev/null and b/data/ui/backgrounds/platinum/24.jpg differ diff --git a/data/ui/backgrounds/platinum/25.jpg b/data/ui/backgrounds/platinum/25.jpg new file mode 100644 index 00000000..9b106be8 Binary files /dev/null and b/data/ui/backgrounds/platinum/25.jpg differ diff --git a/data/ui/backgrounds/platinum/26.jpg b/data/ui/backgrounds/platinum/26.jpg new file mode 100644 index 00000000..bc8c9176 Binary files /dev/null and b/data/ui/backgrounds/platinum/26.jpg differ diff --git a/data/ui/backgrounds/platinum/27.jpg b/data/ui/backgrounds/platinum/27.jpg new file mode 100644 index 00000000..cf80f6a1 Binary files /dev/null and b/data/ui/backgrounds/platinum/27.jpg differ diff --git a/data/ui/backgrounds/platinum/28.jpg b/data/ui/backgrounds/platinum/28.jpg new file mode 100644 index 00000000..768f661f Binary files /dev/null and b/data/ui/backgrounds/platinum/28.jpg differ diff --git a/data/ui/backgrounds/platinum/3.jpg b/data/ui/backgrounds/platinum/3.jpg new file mode 100644 index 00000000..c774c208 Binary files /dev/null and b/data/ui/backgrounds/platinum/3.jpg differ diff --git a/data/ui/backgrounds/platinum/4.jpg b/data/ui/backgrounds/platinum/4.jpg new file mode 100644 index 00000000..b4bbecf8 Binary files /dev/null and b/data/ui/backgrounds/platinum/4.jpg differ diff --git a/data/ui/backgrounds/platinum/5.jpg b/data/ui/backgrounds/platinum/5.jpg new file mode 100644 index 00000000..12082189 Binary files /dev/null and b/data/ui/backgrounds/platinum/5.jpg differ diff --git a/data/ui/backgrounds/platinum/6.jpg b/data/ui/backgrounds/platinum/6.jpg new file mode 100644 index 00000000..14f53a0e Binary files /dev/null and b/data/ui/backgrounds/platinum/6.jpg differ diff --git a/data/ui/backgrounds/platinum/7.jpg b/data/ui/backgrounds/platinum/7.jpg new file mode 100644 index 00000000..e56d1862 Binary files /dev/null and b/data/ui/backgrounds/platinum/7.jpg differ diff --git a/data/ui/backgrounds/platinum/8.jpg b/data/ui/backgrounds/platinum/8.jpg new file mode 100644 index 00000000..c3e666a4 Binary files /dev/null and b/data/ui/backgrounds/platinum/8.jpg differ diff --git a/data/ui/backgrounds/platinum/9.jpg b/data/ui/backgrounds/platinum/9.jpg new file mode 100644 index 00000000..0c6c58f0 Binary files /dev/null and b/data/ui/backgrounds/platinum/9.jpg differ diff --git a/data/ui/backgrounds/ultra/1.jpg b/data/ui/backgrounds/ultra/1.jpg new file mode 100644 index 00000000..f85984d1 Binary files /dev/null and b/data/ui/backgrounds/ultra/1.jpg differ diff --git a/data/ui/backgrounds/ultra/2.jpg b/data/ui/backgrounds/ultra/2.jpg new file mode 100644 index 00000000..40746323 Binary files /dev/null and b/data/ui/backgrounds/ultra/2.jpg differ diff --git a/data/ui/backgrounds/ultra/3.jpg b/data/ui/backgrounds/ultra/3.jpg new file mode 100644 index 00000000..e93bc8ec Binary files /dev/null and b/data/ui/backgrounds/ultra/3.jpg differ diff --git a/data/ui/backgrounds/ultra/4.jpg b/data/ui/backgrounds/ultra/4.jpg new file mode 100644 index 00000000..97c82617 Binary files /dev/null and b/data/ui/backgrounds/ultra/4.jpg differ diff --git a/data/ui/backgrounds/ultra/5.jpg b/data/ui/backgrounds/ultra/5.jpg new file mode 100644 index 00000000..612dc09c Binary files /dev/null and b/data/ui/backgrounds/ultra/5.jpg differ diff --git a/data/ui/backgrounds/ultra/6.jpg b/data/ui/backgrounds/ultra/6.jpg new file mode 100644 index 00000000..0ca9e741 Binary files /dev/null and b/data/ui/backgrounds/ultra/6.jpg differ diff --git a/data/ui/backgrounds/ultra/7.jpg b/data/ui/backgrounds/ultra/7.jpg new file mode 100644 index 00000000..5dfa527b Binary files /dev/null and b/data/ui/backgrounds/ultra/7.jpg differ diff --git a/data/ui/backgrounds/ultra/8.jpg b/data/ui/backgrounds/ultra/8.jpg new file mode 100644 index 00000000..c25bd2f8 Binary files /dev/null and b/data/ui/backgrounds/ultra/8.jpg differ diff --git a/data/ui/backgrounds/ultra/9.jpg b/data/ui/backgrounds/ultra/9.jpg new file mode 100644 index 00000000..9ed29f3f Binary files /dev/null and b/data/ui/backgrounds/ultra/9.jpg differ diff --git a/data/ui/common/dialog.png b/data/ui/common/dialog.png index b6427a25..ae9aa19f 100644 Binary files a/data/ui/common/dialog.png and b/data/ui/common/dialog.png differ diff --git a/data/ui/common/no_d.png b/data/ui/common/no_d.png index 738f2318..4736588a 100644 Binary files a/data/ui/common/no_d.png and b/data/ui/common/no_d.png differ diff --git a/data/ui/common/no_h.png b/data/ui/common/no_h.png index 2dd4f348..17be0742 100644 Binary files a/data/ui/common/no_h.png and b/data/ui/common/no_h.png differ diff --git a/data/ui/common/no_n.png b/data/ui/common/no_n.png index 08c9329f..703a51a7 100644 Binary files a/data/ui/common/no_n.png and b/data/ui/common/no_n.png differ diff --git a/data/ui/common/ok_d.png b/data/ui/common/ok_d.png index ed044e3d..578e1a71 100644 Binary files a/data/ui/common/ok_d.png and b/data/ui/common/ok_d.png differ diff --git a/data/ui/common/ok_h.png b/data/ui/common/ok_h.png index abb6f635..89461066 100644 Binary files a/data/ui/common/ok_h.png and b/data/ui/common/ok_h.png differ diff --git a/data/ui/common/ok_n.png b/data/ui/common/ok_n.png index 68a44006..b20c3776 100644 Binary files a/data/ui/common/ok_n.png and b/data/ui/common/ok_n.png differ diff --git a/data/ui/common/quitfromthislvl_overlay.png b/data/ui/common/quitfromthislvl_overlay.png new file mode 100644 index 00000000..b4d923be Binary files /dev/null and b/data/ui/common/quitfromthislvl_overlay.png differ diff --git a/data/ui/common/restart_d.png b/data/ui/common/restart_d.png index 10f5a13f..dc2bf010 100644 Binary files a/data/ui/common/restart_d.png and b/data/ui/common/restart_d.png differ diff --git a/data/ui/common/restart_h.png b/data/ui/common/restart_h.png index 1a5a97c7..24930ad1 100644 Binary files a/data/ui/common/restart_h.png and b/data/ui/common/restart_h.png differ diff --git a/data/ui/common/restart_n.png b/data/ui/common/restart_n.png index fd9a84a4..31c94ffc 100644 Binary files a/data/ui/common/restart_n.png and b/data/ui/common/restart_n.png differ diff --git a/data/ui/common/yes_d.png b/data/ui/common/yes_d.png index b25cc60e..333157f1 100644 Binary files a/data/ui/common/yes_d.png and b/data/ui/common/yes_d.png differ diff --git a/data/ui/common/yes_h.png b/data/ui/common/yes_h.png index 68282711..69706172 100644 Binary files a/data/ui/common/yes_h.png and b/data/ui/common/yes_h.png differ diff --git a/data/ui/common/yes_n.png b/data/ui/common/yes_n.png index c57b8ae0..99d90d47 100644 Binary files a/data/ui/common/yes_n.png and b/data/ui/common/yes_n.png differ diff --git a/data/ui/exit/black.png b/data/ui/exit/black.png new file mode 100644 index 00000000..339775c5 Binary files /dev/null and b/data/ui/exit/black.png differ diff --git a/data/ui/exit/no_d.png b/data/ui/exit/no_d.png new file mode 100644 index 00000000..7851c65a Binary files /dev/null and b/data/ui/exit/no_d.png differ diff --git a/data/ui/exit/no_h.png b/data/ui/exit/no_h.png new file mode 100644 index 00000000..abfda474 Binary files /dev/null and b/data/ui/exit/no_h.png differ diff --git a/data/ui/exit/no_n.png b/data/ui/exit/no_n.png new file mode 100644 index 00000000..f9ccaf31 Binary files /dev/null and b/data/ui/exit/no_n.png differ diff --git a/data/ui/exit/restart_d.png b/data/ui/exit/restart_d.png new file mode 100644 index 00000000..01ff2c60 Binary files /dev/null and b/data/ui/exit/restart_d.png differ diff --git a/data/ui/exit/restart_h.png b/data/ui/exit/restart_h.png new file mode 100644 index 00000000..887a759f Binary files /dev/null and b/data/ui/exit/restart_h.png differ diff --git a/data/ui/exit/restart_n.png b/data/ui/exit/restart_n.png new file mode 100644 index 00000000..342b5ed3 Binary files /dev/null and b/data/ui/exit/restart_n.png differ diff --git a/data/ui/exit/yes_d.png b/data/ui/exit/yes_d.png new file mode 100644 index 00000000..4b7fc654 Binary files /dev/null and b/data/ui/exit/yes_d.png differ diff --git a/data/ui/exit/yes_h.png b/data/ui/exit/yes_h.png new file mode 100644 index 00000000..f77ddd5a Binary files /dev/null and b/data/ui/exit/yes_h.png differ diff --git a/data/ui/exit/yes_n.png b/data/ui/exit/yes_n.png new file mode 100644 index 00000000..75067ea8 Binary files /dev/null and b/data/ui/exit/yes_n.png differ diff --git a/data/ui/loading/cancel_d.png b/data/ui/loading/cancel_d.png index 4598cffc..209d222b 100644 Binary files a/data/ui/loading/cancel_d.png and b/data/ui/loading/cancel_d.png differ diff --git a/data/ui/loading/cancel_h.png b/data/ui/loading/cancel_h.png index d54cfa6f..0153ae99 100644 Binary files a/data/ui/loading/cancel_h.png and b/data/ui/loading/cancel_h.png differ diff --git a/data/ui/loading/cancel_n.png b/data/ui/loading/cancel_n.png index 6c82ad77..adfc9075 100644 Binary files a/data/ui/loading/cancel_n.png and b/data/ui/loading/cancel_n.png differ diff --git a/data/ui/loading/loadinggui.png b/data/ui/loading/loadinggui.png index 13741984..139e77eb 100644 Binary files a/data/ui/loading/loadinggui.png and b/data/ui/loading/loadinggui.png differ diff --git a/data/ui/loading/overlay.png b/data/ui/loading/overlay.png index ebda2569..cc073f1d 100644 Binary files a/data/ui/loading/overlay.png and b/data/ui/loading/overlay.png differ diff --git a/src/DtsObject.hx b/src/DtsObject.hx index b1a88a9b..05814d32 100644 --- a/src/DtsObject.hx +++ b/src/DtsObject.hx @@ -176,6 +176,12 @@ class DtsObject extends GameObject { if (mesh == null) continue; + if (mesh.parent >= 0) + continue; // Fix teleporter being broken + + if (mesh.vertices.length == 0) + continue; + if (!isInstanced) { var vertices = mesh.vertices.map(v -> new Vector(v.x, v.y, v.z)); var vertexNormals = mesh.normals.map(v -> new Vector(v.x, v.y, v.z)); diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index 9fcb28a3..a8d5a30c 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -774,6 +774,7 @@ class MarbleWorld extends Scheduler { tsShape.useInstancing = true; tsShape.dtsPath = dtsPath; tsShape.identifier = shapeName; + tsShape.isCollideable = true; var shapePosition = MisParser.parseVector3(element.position); shapePosition.x = -shapePosition.x; diff --git a/src/ParticleSystem.hx b/src/ParticleSystem.hx index d2c3f5b7..b163f2ae 100644 --- a/src/ParticleSystem.hx +++ b/src/ParticleSystem.hx @@ -1,5 +1,6 @@ package src; +import h3d.Matrix; import src.TimeState; import h3d.prim.UV; import h3d.parts.Data.BlendMode; @@ -290,10 +291,11 @@ class ParticleManager { } this.tick(dt); for (batch in particlebatches) { - batch.meshBatch.begin(batch.instances.length); - for (instance in batch.instances) { + var visibleinstances = batch.instances.filter(x -> scene.camera.frustum.hasPoint(x.position.toPoint())); + batch.meshBatch.begin(visibleinstances.length); + for (instance in visibleinstances) { if (instance.currentAge != 0) { - batch.meshBatch.setPosition(instance.position.x, instance.position.y, instance.position.z); + batch.meshBatch.worldPosition = Matrix.T(instance.position.x, instance.position.y, instance.position.z); var particleShader = batch.meshBatch.material.mainPass.getShader(Billboard); particleShader.scale = instance.scale; particleShader.rotation = instance.rotation; @@ -303,7 +305,6 @@ class ParticleManager { // batch.meshBatch.material.mainPass.setPassName("overlay"); // batch.meshBatch.material.color.load(instance.color); batch.meshBatch.shadersChanged = true; - batch.meshBatch.setScale(instance.scale); batch.meshBatch.emitInstance(); } } diff --git a/src/gui/ExitGameDlg.hx b/src/gui/ExitGameDlg.hx index f8952ac4..333c950b 100644 --- a/src/gui/ExitGameDlg.hx +++ b/src/gui/ExitGameDlg.hx @@ -24,45 +24,38 @@ class ExitGameDlg extends GuiControl { var dialogImg = new GuiImage(ResourceLoader.getResource("data/ui/common/dialog.png", ResourceLoader.getImage, this.imageResources).toTile()); dialogImg.horizSizing = Center; dialogImg.vertSizing = Center; - dialogImg.position = new Vector(134, 148); - dialogImg.extent = new Vector(388, 186); + dialogImg.position = new Vector(162, 160); + dialogImg.extent = new Vector(315, 160); - var domcasual32fontdata = ResourceLoader.getFileEntry("data/font/DomCasualD.fnt"); - var domcasual32b = new BitmapFont(domcasual32fontdata.entry); - @:privateAccess domcasual32b.loader = ResourceLoader.loader; - var domcasual32 = domcasual32b.toSdfFont(cast 26 * Settings.uiScale, MultiChannel); - - var exitGameText = new GuiText(domcasual32); - exitGameText.text.textColor = 0x000000; - exitGameText.text.text = "Exit from this Level?"; - exitGameText.justify = Center; - exitGameText.position = new Vector(95, 46); - exitGameText.extent = new Vector(198, 23); - exitGameText.horizSizing = Center; - exitGameText.vertSizing = Bottom; + var overlay = new GuiImage(ResourceLoader.getResource("data/ui/common/quitfromthislvl_overlay.png", ResourceLoader.getImage, this.imageResources) + .toTile()); + overlay.horizSizing = Right; + overlay.vertSizing = Bottom; + overlay.position = new Vector(36, 22); + overlay.extent = new Vector(235, 42); var yesButton = new GuiButton(loadButtonImages("data/ui/common/yes")); - yesButton.position = new Vector(47, 107); - yesButton.extent = new Vector(88, 52); - yesButton.vertSizing = Bottom; + yesButton.position = new Vector(19, 103); + yesButton.extent = new Vector(86, 40); + yesButton.vertSizing = Top; yesButton.horizSizing = Right; yesButton.pressedAction = yesFunc; var noButton = new GuiButton(loadButtonImages("data/ui/common/no")); - noButton.position = new Vector(151, 107); - noButton.extent = new Vector(83, 55); - noButton.vertSizing = Bottom; + noButton.position = new Vector(105, 102); + noButton.extent = new Vector(86, 40); + noButton.vertSizing = Top; noButton.horizSizing = Right; noButton.pressedAction = noFunc; var restartButton = new GuiButton(loadButtonImages("data/ui/common/restart")); - restartButton.position = new Vector(249, 107); - restartButton.extent = new Vector(103, 56); - restartButton.vertSizing = Bottom; + restartButton.position = new Vector(214, 104); + restartButton.extent = new Vector(86, 40); + restartButton.vertSizing = Top; restartButton.horizSizing = Right; restartButton.pressedAction = restartFunc; - dialogImg.addChild(exitGameText); + dialogImg.addChild(overlay); dialogImg.addChild(yesButton); dialogImg.addChild(noButton); dialogImg.addChild(restartButton); diff --git a/src/gui/LoadingGui.hx b/src/gui/LoadingGui.hx index c58df043..094ae576 100644 --- a/src/gui/LoadingGui.hx +++ b/src/gui/LoadingGui.hx @@ -36,16 +36,16 @@ class LoadingGui extends GuiImage { var domcasual32 = domcasual32b.toSdfFont(cast 26 * Settings.uiScale, MultiChannel); var mapName = new GuiText(domcasual32); - mapName.position = new Vector(134, 78); - mapName.extent = new Vector(323, 32); + mapName.position = new Vector(6, 33); + mapName.extent = new Vector(456, 14); mapName.text.text = missionName; mapName.text.textColor = 0; mapName.justify = Center; var progress = new GuiProgress(); - progress.vertSizing = Bottom; - progress.position = new Vector(153, 133); - progress.extent = new Vector(269, 78); + progress.vertSizing = Top; + progress.position = new Vector(194, 145); + progress.extent = new Vector(225, 56); progress.progress = 0.5; setProgress = (progressPz) -> { @@ -53,15 +53,15 @@ class LoadingGui extends GuiImage { } var cancelButton = new GuiButton(loadButtonImages("data/ui/loading/cancel")); - cancelButton.position = new Vector(320, 233); - cancelButton.extent = new Vector(88, 50); + cancelButton.position = new Vector(333, 243); + cancelButton.extent = new Vector(112, 59); cancelButton.pressedAction = (sender) -> { MarbleGame.instance.quitMission(); } var overlay = new GuiImage(ResourceLoader.getResource("data/ui/loading/overlay.png", ResourceLoader.getImage, this.imageResources).toTile()); - overlay.position = new Vector(151, 131); - overlay.extent = new Vector(278, 86); + overlay.position = new Vector(188, 139); + overlay.extent = new Vector(242, 75); loadingGui.addChild(mapName); loadingGui.addChild(progress);