From 2492613483a74406f540d7a7ac1b5e115ffc1d00 Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Thu, 29 Jun 2023 00:33:38 +0530
Subject: [PATCH] minor improvements

---
 src/Renderer.hx                | 36 ++++++++++++++++++++--------------
 src/gui/LevelSelectGui.hx      |  9 +++++++++
 src/shaders/CubemapRenderer.hx |  4 +++-
 src/shapes/EasterEgg.hx        |  4 ++--
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/Renderer.hx b/src/Renderer.hx
index 763cd642..1089d973 100644
--- a/src/Renderer.hx
+++ b/src/Renderer.hx
@@ -26,6 +26,8 @@ class Renderer extends h3d.scene.Renderer {
 	var copyPass:h3d.pass.Copy;
 	var backBuffer:h3d.mat.Texture;
 
+	public static var cubemapPass:Bool = false;
+
 	public function new() {
 		super();
 		defaultPass = new h3d.pass.Default("default");
@@ -103,23 +105,27 @@ class Renderer extends h3d.scene.Renderer {
 		renderPass(defaultPass, get("glowPre"));
 
 		// Glow pass
-		var glowObjects = get("glow");
-		if (!glowObjects.isEmpty()) {
-			ctx.engine.pushTarget(glowBuffer);
-			ctx.engine.clear(0);
-			renderPass(defaultPass, glowObjects);
-			bloomPass(ctx);
-			ctx.engine.popTarget();
-			copyPass.shader.texture = growBufferTemps[0];
-			copyPass.pass.blend(One, One);
-			copyPass.pass.depth(false, Always);
-			copyPass.render();
+		if (!cubemapPass) {
+			var glowObjects = get("glow");
+			if (!glowObjects.isEmpty()) {
+				ctx.engine.pushTarget(glowBuffer);
+				ctx.engine.clear(0);
+				renderPass(defaultPass, glowObjects);
+				bloomPass(ctx);
+				ctx.engine.popTarget();
+				copyPass.shader.texture = growBufferTemps[0];
+				copyPass.pass.blend(One, One);
+				copyPass.pass.depth(false, Always);
+				copyPass.render();
+			}
 		}
 		// Refraction pass
-		var refractObjects = get("refract");
-		if (!refractObjects.isEmpty()) {
-			h3d.pass.Copy.run(backBuffer, sfxBuffer);
-			renderPass(defaultPass, refractObjects);
+		if (!cubemapPass) {
+			var refractObjects = get("refract");
+			if (!refractObjects.isEmpty()) {
+				h3d.pass.Copy.run(backBuffer, sfxBuffer);
+				renderPass(defaultPass, refractObjects);
+			}
 		}
 
 		renderPass(defaultPass, get("alpha"), backToFront);
diff --git a/src/gui/LevelSelectGui.hx b/src/gui/LevelSelectGui.hx
index c2be5855..774d3f62 100644
--- a/src/gui/LevelSelectGui.hx
+++ b/src/gui/LevelSelectGui.hx
@@ -165,6 +165,11 @@ class LevelSelectGui extends GuiImage {
 		statIcon.extent = new Vector(20, 20);
 		levelWnd.addChild(statIcon);
 
+		var eggIcon = new GuiImage(ResourceLoader.getResource("data/ui/xbox/eggIcon.png", ResourceLoader.getImage, this.imageResources).toTile());
+		eggIcon.position = new Vector(29, 79);
+		eggIcon.extent = new Vector(20, 20);
+		levelWnd.addChild(eggIcon);
+
 		var c0 = 0xEBEBEB;
 		var c1 = 0x8DFF8D;
 		var c2 = 0x88BCEE;
@@ -205,6 +210,10 @@ class LevelSelectGui extends GuiImage {
 			var misFile = Path.withoutExtension(Path.withoutDirectory(curMission.path));
 			var mis = difficultyMissions[idx];
 			var requestToken = currentToken;
+			if (Settings.easterEggs.exists(mis.path))
+				eggIcon.bmp.visible = true;
+			else
+				eggIcon.bmp.visible = false;
 			MarbleGame.instance.setPreviewMission(misFile, () -> {
 				lock = false;
 				if (requestToken != currentToken)
diff --git a/src/shaders/CubemapRenderer.hx b/src/shaders/CubemapRenderer.hx
index 54261e5d..a43c0a7d 100644
--- a/src/shaders/CubemapRenderer.hx
+++ b/src/shaders/CubemapRenderer.hx
@@ -1,5 +1,6 @@
 package shaders;
 
+import src.Renderer;
 import src.Sky;
 import h3d.Vector;
 import h3d.scene.Scene;
@@ -33,7 +34,7 @@ class CubemapRenderer {
 
 		var start = haxe.Timer.stamp();
 		var renderedFaces = 0;
-
+		Renderer.cubemapPass = true;
 		for (i in 0...6) {
 			var index = (nextFaceToRender + i) % 6;
 
@@ -51,6 +52,7 @@ class CubemapRenderer {
 			if (elapsedPerFace * (renderedFaces + 1) >= budget)
 				break;
 		}
+		Renderer.cubemapPass = false;
 		scene.camera = scenecam;
 
 		this.nextFaceToRender += renderedFaces;
diff --git a/src/shapes/EasterEgg.hx b/src/shapes/EasterEgg.hx
index e1f64119..fdcf32ad 100644
--- a/src/shapes/EasterEgg.hx
+++ b/src/shapes/EasterEgg.hx
@@ -23,10 +23,10 @@ class EasterEgg extends PowerUp {
 		if (!found) {
 			Settings.easterEggs.set(this.level.mission.path, this.level.timeState.currentAttemptTime);
 			this.pickupSound = ResourceLoader.getResource("data/sound/easter_egg.wav", ResourceLoader.getAudio, this.soundResources);
-			this.customPickupMessage = "You picked up an Easter Egg!";
+			this.customPickupMessage = "You found a new egg! Yeah!";
 		} else {
 			this.pickupSound = ResourceLoader.getResource("data/sound/pu_easter.wav", ResourceLoader.getAudio, this.soundResources);
-			this.customPickupMessage = "You picked up an Easter Egg!.";
+			this.customPickupMessage = "You already found this egg!";
 		}
 
 		return true;