minor tweaks and update textures to be even more accurate
|
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 142 B |
|
Before Width: | Height: | Size: 183 KiB After Width: | Height: | Size: 178 KiB |
|
Before Width: | Height: | Size: 163 KiB After Width: | Height: | Size: 163 KiB |
|
Before Width: | Height: | Size: 198 KiB After Width: | Height: | Size: 183 KiB |
|
Before Width: | Height: | Size: 211 KiB After Width: | Height: | Size: 205 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 209 KiB After Width: | Height: | Size: 208 KiB |
|
Before Width: | Height: | Size: 209 KiB After Width: | Height: | Size: 202 KiB |
|
Before Width: | Height: | Size: 227 KiB After Width: | Height: | Size: 226 KiB |
|
Before Width: | Height: | Size: 241 KiB After Width: | Height: | Size: 226 KiB |
|
Before Width: | Height: | Size: 237 KiB After Width: | Height: | Size: 223 KiB |
|
Before Width: | Height: | Size: 109 KiB After Width: | Height: | Size: 105 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 224 KiB After Width: | Height: | Size: 224 KiB |
|
Before Width: | Height: | Size: 301 KiB After Width: | Height: | Size: 299 KiB |
|
Before Width: | Height: | Size: 260 KiB After Width: | Height: | Size: 261 KiB |
|
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 92 KiB |
|
Before Width: | Height: | Size: 252 KiB After Width: | Height: | Size: 254 KiB |
|
Before Width: | Height: | Size: 143 KiB After Width: | Height: | Size: 143 KiB |
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 157 KiB After Width: | Height: | Size: 150 KiB |
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 88 KiB |
|
Before Width: | Height: | Size: 173 KiB After Width: | Height: | Size: 163 KiB |
|
Before Width: | Height: | Size: 205 KiB After Width: | Height: | Size: 202 KiB |
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 146 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 95 KiB |
|
Before Width: | Height: | Size: 95 KiB After Width: | Height: | Size: 94 KiB |
|
Before Width: | Height: | Size: 195 KiB After Width: | Height: | Size: 185 KiB |
|
Before Width: | Height: | Size: 188 KiB After Width: | Height: | Size: 179 KiB |
|
Before Width: | Height: | Size: 183 KiB After Width: | Height: | Size: 175 KiB |
|
Before Width: | Height: | Size: 180 KiB After Width: | Height: | Size: 172 KiB |
|
Before Width: | Height: | Size: 188 KiB After Width: | Height: | Size: 180 KiB |
|
Before Width: | Height: | Size: 184 KiB After Width: | Height: | Size: 176 KiB |
|
Before Width: | Height: | Size: 192 KiB After Width: | Height: | Size: 185 KiB |
|
Before Width: | Height: | Size: 95 KiB After Width: | Height: | Size: 96 KiB |
|
Before Width: | Height: | Size: 234 KiB After Width: | Height: | Size: 221 KiB |
|
Before Width: | Height: | Size: 225 KiB After Width: | Height: | Size: 220 KiB |
|
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 436 KiB After Width: | Height: | Size: 410 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 41 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 137 KiB After Width: | Height: | Size: 133 KiB |
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 76 KiB |
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 162 KiB After Width: | Height: | Size: 150 KiB |
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 105 KiB After Width: | Height: | Size: 102 KiB |
|
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 119 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 57 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 123 KiB |
|
Before Width: | Height: | Size: 540 KiB After Width: | Height: | Size: 518 KiB |
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 256 KiB |
|
Before Width: | Height: | Size: 277 KiB After Width: | Height: | Size: 284 KiB |
|
Before Width: | Height: | Size: 248 KiB After Width: | Height: | Size: 228 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3 KiB |
|
Before Width: | Height: | Size: 98 B After Width: | Height: | Size: 100 B |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 229 B After Width: | Height: | Size: 253 B |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 152 KiB |
|
Before Width: | Height: | Size: 483 KiB After Width: | Height: | Size: 472 KiB |
|
Before Width: | Height: | Size: 372 KiB After Width: | Height: | Size: 367 KiB |
|
Before Width: | Height: | Size: 111 KiB |
|
Before Width: | Height: | Size: 403 KiB After Width: | Height: | Size: 388 KiB |
|
Before Width: | Height: | Size: 441 KiB After Width: | Height: | Size: 377 KiB |
|
Before Width: | Height: | Size: 126 KiB After Width: | Height: | Size: 113 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2 MiB After Width: | Height: | Size: 2 MiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 858 KiB After Width: | Height: | Size: 843 KiB |
|
Before Width: | Height: | Size: 587 KiB After Width: | Height: | Size: 580 KiB |
|
Before Width: | Height: | Size: 736 KiB After Width: | Height: | Size: 720 KiB |
|
Before Width: | Height: | Size: 136 KiB After Width: | Height: | Size: 135 KiB |
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 118 KiB |
|
|
@ -212,8 +212,8 @@ class DifBuilder {
|
|||
var worker = new ResourceLoaderWorker(() -> {
|
||||
var diffuseTex = ResourceLoader.getTexture(baseTexture).resource;
|
||||
diffuseTex.wrap = Repeat;
|
||||
diffuseTex.mipMap = Linear;
|
||||
diffuseTex.filter = Linear;
|
||||
diffuseTex.mipMap = Nearest;
|
||||
// diffuseTex.filter = Linear;
|
||||
var normalTex = ResourceLoader.getTexture(normalTexture).resource;
|
||||
normalTex.wrap = Repeat;
|
||||
normalTex.mipMap = Nearest;
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ class MarbleWorld extends Scheduler {
|
|||
this.playGui.init(this.scene2d, this.mission.game.toLowerCase());
|
||||
this.scene.addChild(this.sky);
|
||||
this._ready = true;
|
||||
AudioManager.playShell();
|
||||
// AudioManager.playShell();
|
||||
MarbleGame.canvas.clearContent();
|
||||
if (this.endPad != null)
|
||||
this.endPad.generateCollider();
|
||||
|
|
@ -1451,7 +1451,7 @@ class MarbleWorld extends Scheduler {
|
|||
}
|
||||
var endGameCode = () -> {
|
||||
this.dispose();
|
||||
var pmg = new LevelSelectGui(["beginner", "intermediate", "advanced"][mission.difficultyIndex]);
|
||||
var pmg = new LevelSelectGui(["beginner", "intermediate", "advanced", "multiplayer"][mission.difficultyIndex]);
|
||||
LevelSelectGui.currentSelectionStatic = mission.index + 1;
|
||||
MarbleGame.canvas.setContent(pmg);
|
||||
#if js
|
||||
|
|
@ -1466,6 +1466,7 @@ class MarbleWorld extends Scheduler {
|
|||
}, (sender) -> {
|
||||
var restartGameCode = () -> {
|
||||
MarbleGame.canvas.popDialog(egg);
|
||||
playGui.setGuiVisibility(true);
|
||||
this.restart(true);
|
||||
#if js
|
||||
pointercontainer.hidden = true;
|
||||
|
|
@ -1829,7 +1830,7 @@ class MarbleWorld extends Scheduler {
|
|||
|
||||
this._disposed = true;
|
||||
AudioManager.stopAllSounds();
|
||||
AudioManager.playShell();
|
||||
// AudioManager.playShell();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ class MissionList {
|
|||
ultraMissions.set("beginner", parseDifficulty("ultra", "missions", "beginner", 0));
|
||||
ultraMissions.set("intermediate", parseDifficulty("ultra", "missions", "intermediate", 1));
|
||||
ultraMissions.set("advanced", parseDifficulty("ultra", "missions", "advanced", 2));
|
||||
ultraMissions.set("multiplayer", parseDifficulty("ultra", "missions", "multiplayer", 2));
|
||||
ultraMissions.set("multiplayer", parseDifficulty("ultra", "missions", "multiplayer", 3));
|
||||
|
||||
@:privateAccess ultraMissions["beginner"][ultraMissions["beginner"].length - 1].next = ultraMissions["intermediate"][0];
|
||||
@:privateAccess ultraMissions["intermediate"][ultraMissions["intermediate"].length - 1].next = ultraMissions["advanced"][0];
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import h3d.Engine;
|
|||
import h3d.Camera;
|
||||
import src.MarbleGame;
|
||||
import h3d.mat.Texture;
|
||||
import src.Settings;
|
||||
|
||||
class CubemapRenderer {
|
||||
public var cubemap:Texture;
|
||||
|
|
@ -38,7 +39,8 @@ class CubemapRenderer {
|
|||
Renderer.cubemapPass = true;
|
||||
for (i in 0...facesPerRender) {
|
||||
var index = (nextFaceToRender + i) % 6;
|
||||
Renderer.dirtyBuffers = true;
|
||||
if (Settings.optionsSettings.reflectionDetail >= 4)
|
||||
Renderer.dirtyBuffers = true;
|
||||
|
||||
e.pushTarget(cubemap, index);
|
||||
this.camera.setCubeMap(index, position);
|
||||
|
|
|
|||