more ui and bugfixes

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));

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;

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);
+			var visibleinstances = batch.instances.filter(x -> scene.camera.frustum.hasPoint(x.position.toPoint()));
-			for (instance in batch.instances) {
+			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();
 				}
 			}

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.position = new Vector(162, 160);
-		dialogImg.extent = new Vector(388, 186);
+		dialogImg.extent = new Vector(315, 160);
 
-		var domcasual32fontdata = ResourceLoader.getFileEntry("data/font/DomCasualD.fnt");
+		var overlay = new GuiImage(ResourceLoader.getResource("data/ui/common/quitfromthislvl_overlay.png", ResourceLoader.getImage, this.imageResources)
-		var domcasual32b = new BitmapFont(domcasual32fontdata.entry);
+			.toTile());
-		@:privateAccess domcasual32b.loader = ResourceLoader.loader;
+		overlay.horizSizing = Right;
-		var domcasual32 = domcasual32b.toSdfFont(cast 26 * Settings.uiScale, MultiChannel);
+		overlay.vertSizing = Bottom;
-
+		overlay.position = new Vector(36, 22);
-		var exitGameText = new GuiText(domcasual32);
+		overlay.extent = new Vector(235, 42);
-		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 yesButton = new GuiButton(loadButtonImages("data/ui/common/yes"));
-		yesButton.position = new Vector(47, 107);
+		yesButton.position = new Vector(19, 103);
-		yesButton.extent = new Vector(88, 52);
+		yesButton.extent = new Vector(86, 40);
-		yesButton.vertSizing = Bottom;
+		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.position = new Vector(105, 102);
-		noButton.extent = new Vector(83, 55);
+		noButton.extent = new Vector(86, 40);
-		noButton.vertSizing = Bottom;
+		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.position = new Vector(214, 104);
-		restartButton.extent = new Vector(103, 56);
+		restartButton.extent = new Vector(86, 40);
-		restartButton.vertSizing = Bottom;
+		restartButton.vertSizing = Top;
 		restartButton.horizSizing = Right;
 		restartButton.pressedAction = restartFunc;
 
-		dialogImg.addChild(exitGameText);
+		dialogImg.addChild(overlay);
 		dialogImg.addChild(yesButton);
 		dialogImg.addChild(noButton);
 		dialogImg.addChild(restartButton);

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.position = new Vector(6, 33);
-		mapName.extent = new Vector(323, 32);
+		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.vertSizing = Top;
-		progress.position = new Vector(153, 133);
+		progress.position = new Vector(194, 145);
-		progress.extent = new Vector(269, 78);
+		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.position = new Vector(333, 243);
-		cancelButton.extent = new Vector(88, 50);
+		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.position = new Vector(188, 139);
-		overlay.extent = new Vector(278, 86);
+		overlay.extent = new Vector(242, 75);
 
 		loadingGui.addChild(mapName);
 		loadingGui.addChild(progress);