mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2025-10-30 08:11:25 +00:00
minor improvements
This commit is contained in:
parent
2ceeb6ddb5
commit
c6de2f341e
4 changed files with 35 additions and 18 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue