diff --git a/src/Main.hx b/src/Main.hx index d2acf084..2083f294 100644 --- a/src/Main.hx +++ b/src/Main.hx @@ -85,7 +85,7 @@ class Main extends hxd.App { ResourceLoader.init(s2d, () -> { AudioManager.init(); AudioManager.playShell(); - Marbleland.init(); + // Marbleland.init(); marbleGame = new MarbleGame(s2d, s3d); MarbleGame.canvas.setContent(new PresentsGui()); MissionList.buildMissionList(); // Yeah pls diff --git a/src/Mission.hx b/src/Mission.hx index fffc9495..d2f2e26d 100644 --- a/src/Mission.hx +++ b/src/Mission.hx @@ -58,7 +58,8 @@ class Mission { public function load() { var entry = ResourceLoader.getFileEntry(this.path).entry; - var misText = Util.toASCII(entry.getBytes()); + var misText = entry.getText(); + trace('Loading ${this.path}'); var misParser = new MisParser(misText); var contents = misParser.parse(); diff --git a/src/Renderer.hx b/src/Renderer.hx index ec70099d..4f792c8d 100644 --- a/src/Renderer.hx +++ b/src/Renderer.hx @@ -86,7 +86,11 @@ class Renderer extends h3d.scene.Renderer { override function render() { if (backBuffer == null) { - depthBuffer = new DepthBuffer(cast ctx.engine.width / pixelRatio, cast ctx.engine.height / pixelRatio, Depth24Stencil8); + depthBuffer = new DepthBuffer(cast ctx.engine.width / pixelRatio, cast ctx.engine.height / pixelRatio, Depth24); + if (depthBuffer.format != Depth24) { + depthBuffer.dispose(); + depthBuffer = new DepthBuffer(cast ctx.engine.width / pixelRatio, cast ctx.engine.height / pixelRatio, Depth24); + } backBuffer = ctx.textures.allocTarget("backBuffer", cast ctx.engine.width / pixelRatio, cast ctx.engine.height / pixelRatio, false); backBuffer.depthBuffer = depthBuffer; } @@ -122,9 +126,9 @@ class Renderer extends h3d.scene.Renderer { renderPass(defaultPass, get("skyshape"), backToFront); } if (!cubemapPass || Settings.optionsSettings.reflectionDetail >= 2) { - if (!cubemapPass) - ProfilerUI.measure("interiorZPass"); - renderPass(defaultPass, get("zPass")); + // if (!cubemapPass) + // ProfilerUI.measure("interiorZPass"); + // renderPass(defaultPass, get("zPass")); if (!cubemapPass) ProfilerUI.measure("interior"); renderPass(defaultPass, get("interior")); diff --git a/src/shaders/CubemapRenderer.hx b/src/shaders/CubemapRenderer.hx index 504c9d85..607e56c2 100644 --- a/src/shaders/CubemapRenderer.hx +++ b/src/shaders/CubemapRenderer.hx @@ -24,7 +24,7 @@ class CubemapRenderer { this.scene = scene; this.sky = sky; this.cubemap = new Texture(128, 128, [Cube, Dynamic, Target], h3d.mat.Data.TextureFormat.RGB8); - this.cubemap.depthBuffer = new h3d.mat.DepthBuffer(128, 128, h3d.mat.DepthBuffer.DepthFormat.Depth16); + this.cubemap.depthBuffer = new h3d.mat.DepthBuffer(128, 128, h3d.mat.DepthBuffer.DepthFormat.Depth24); this.camera = new Camera(90, 1, 1, 0.1, 1000); this.position = new Vector(); this.nextFaceToRender = 0; diff --git a/src/touch/PauseButton.hx b/src/touch/PauseButton.hx index 3130fabd..424df4eb 100644 --- a/src/touch/PauseButton.hx +++ b/src/touch/PauseButton.hx @@ -13,7 +13,6 @@ class PauseButton extends TouchButton { this.onClick = () -> { if (MarbleGame.instance.world != null) { - @:privateAccess MarbleGame.instance.paused = true; MarbleGame.instance.handlePauseGame(); } }