mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2025-10-30 08:11:25 +00:00
fix few noise and web things
This commit is contained in:
parent
7f0a51e9e8
commit
b874663c63
2 changed files with 4 additions and 1 deletions
|
|
@ -198,6 +198,7 @@ class DifBuilder {
|
|||
var normalTex = ResourceLoader.getTexture('data/shaders/tex/tile_mbu.normal.png').resource;
|
||||
normalTex.wrap = Repeat;
|
||||
var noiseTex = ResourceLoader.getTexture('data/shaders/tex/noise${noiseSuffix}.jpg').resource;
|
||||
noiseTex.wrap = Repeat;
|
||||
var shader = new NoiseTileMaterial(diffuseTex, specularTex, normalTex, noiseTex, shininess, specularIntensity, MarbleGame.instance.world.ambient,
|
||||
MarbleGame.instance.world.dirLight, MarbleGame.instance.world.dirLightDir, 1);
|
||||
onFinish(shader);
|
||||
|
|
@ -700,11 +701,11 @@ class DifBuilder {
|
|||
retrievefunc(shad -> {
|
||||
material.mainPass.removeShader(material.textureShader);
|
||||
material.mainPass.addShader(shad);
|
||||
material.receiveShadows = true;
|
||||
var thisprops:Dynamic = material.getDefaultProps();
|
||||
thisprops.light = false; // We will calculate our own lighting
|
||||
material.props = thisprops;
|
||||
material.shadows = false;
|
||||
material.receiveShadows = true;
|
||||
fwd();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -361,6 +361,8 @@ class MarbleWorld extends Scheduler {
|
|||
"shapes/pads/red.jpg",
|
||||
"shapes/pads/blue.jpg",
|
||||
"shapes/pads/green.jpg",
|
||||
"shapes/items/gem.dts", // Ew ew
|
||||
"shapes/items/gemshine.png"
|
||||
];
|
||||
marblefiles.push(StringTools.replace(Settings.optionsSettings.marbleModel, "data/", ""));
|
||||
marblefiles.push("shapes/balls/" + Settings.optionsSettings.marbleSkin + ".marble.png");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue