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

minor improvements

Browse source
This commit is contained in:
RandomityGuy 2023-06-29 00:33:38 +05:30
parent 2ceeb6ddb5
commit c6de2f341e
4 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/Renderer.hx
View file

@ -26,6 +26,8 @@ class Renderer extends h3d.scene.Renderer {
var copyPass:h3d.pass.Copy; var copyPass:h3d.pass.Copy;
var backBuffer:h3d.mat.Texture; var backBuffer:h3d.mat.Texture;
public static var cubemapPass:Bool = false;
public function new() { public function new() {
super(); super();
defaultPass = new h3d.pass.Default("default"); defaultPass = new h3d.pass.Default("default");
@ -103,23 +105,27 @@ class Renderer extends h3d.scene.Renderer {
renderPass(defaultPass, get("glowPre")); renderPass(defaultPass, get("glowPre"));
// Glow pass // Glow pass
var glowObjects = get("glow"); if (!cubemapPass) {
if (!glowObjects.isEmpty()) { var glowObjects = get("glow");
ctx.engine.pushTarget(glowBuffer); if (!glowObjects.isEmpty()) {
ctx.engine.clear(0); ctx.engine.pushTarget(glowBuffer);
renderPass(defaultPass, glowObjects); ctx.engine.clear(0);
bloomPass(ctx); renderPass(defaultPass, glowObjects);
ctx.engine.popTarget(); bloomPass(ctx);
copyPass.shader.texture = growBufferTemps[0]; ctx.engine.popTarget();
copyPass.pass.blend(One, One); copyPass.shader.texture = growBufferTemps[0];
copyPass.pass.depth(false, Always); copyPass.pass.blend(One, One);
copyPass.render(); copyPass.pass.depth(false, Always);
copyPass.render();
}
} }
// Refraction pass // Refraction pass
var refractObjects = get("refract"); if (!cubemapPass) {
if (!refractObjects.isEmpty()) { var refractObjects = get("refract");
h3d.pass.Copy.run(backBuffer, sfxBuffer); if (!refractObjects.isEmpty()) {
renderPass(defaultPass, refractObjects); h3d.pass.Copy.run(backBuffer, sfxBuffer);
renderPass(defaultPass, refractObjects);
}
} }
renderPass(defaultPass, get("alpha"), backToFront); renderPass(defaultPass, get("alpha"), backToFront);

9
src/gui/LevelSelectGui.hx
View file

@ -165,6 +165,11 @@ class LevelSelectGui extends GuiImage {
statIcon.extent = new Vector(20, 20); statIcon.extent = new Vector(20, 20);
levelWnd.addChild(statIcon); 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 c0 = 0xEBEBEB;
var c1 = 0x8DFF8D; var c1 = 0x8DFF8D;
var c2 = 0x88BCEE; var c2 = 0x88BCEE;
@ -205,6 +210,10 @@ class LevelSelectGui extends GuiImage {
var misFile = Path.withoutExtension(Path.withoutDirectory(curMission.path)); var misFile = Path.withoutExtension(Path.withoutDirectory(curMission.path));
var mis = difficultyMissions[idx]; var mis = difficultyMissions[idx];
var requestToken = currentToken; var requestToken = currentToken;
if (Settings.easterEggs.exists(mis.path))
eggIcon.bmp.visible = true;
else
eggIcon.bmp.visible = false;
MarbleGame.instance.setPreviewMission(misFile, () -> { MarbleGame.instance.setPreviewMission(misFile, () -> {
lock = false; lock = false;
if (requestToken != currentToken) if (requestToken != currentToken)

4
src/shaders/CubemapRenderer.hx
View file

@ -1,5 +1,6 @@
package shaders; package shaders;
import src.Renderer;
import src.Sky; import src.Sky;
import h3d.Vector; import h3d.Vector;
import h3d.scene.Scene; import h3d.scene.Scene;
@ -33,7 +34,7 @@ class CubemapRenderer {
var start = haxe.Timer.stamp(); var start = haxe.Timer.stamp();
var renderedFaces = 0; var renderedFaces = 0;
Renderer.cubemapPass = true;
for (i in 0...6) { for (i in 0...6) {
var index = (nextFaceToRender + i) % 6; var index = (nextFaceToRender + i) % 6;
@ -51,6 +52,7 @@ class CubemapRenderer {
if (elapsedPerFace * (renderedFaces + 1) >= budget) if (elapsedPerFace * (renderedFaces + 1) >= budget)
break; break;
} }
Renderer.cubemapPass = false;
scene.camera = scenecam; scene.camera = scenecam;
this.nextFaceToRender += renderedFaces; this.nextFaceToRender += renderedFaces;

4
src/shapes/EasterEgg.hx
View file

@ -23,10 +23,10 @@ class EasterEgg extends PowerUp {
if (!found) { if (!found) {
Settings.easterEggs.set(this.level.mission.path, this.level.timeState.currentAttemptTime); 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.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 { } else {
this.pickupSound = ResourceLoader.getResource("data/sound/pu_easter.wav", ResourceLoader.getAudio, this.soundResources); 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; return true;