thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-12-23 08:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix few noise and web things

Browse source
This commit is contained in:
RandomityGuy 2022-12-09 01:18:26 +05:30
parent 7f0a51e9e8
commit b874663c63
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/DifBuilder.hx
View file

@ -198,6 +198,7 @@ class DifBuilder {
var normalTex = ResourceLoader.getTexture('data/shaders/tex/tile_mbu.normal.png').resource; var normalTex = ResourceLoader.getTexture('data/shaders/tex/tile_mbu.normal.png').resource;
normalTex.wrap = Repeat; normalTex.wrap = Repeat;
var noiseTex = ResourceLoader.getTexture('data/shaders/tex/noise${noiseSuffix}.jpg').resource; 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, var shader = new NoiseTileMaterial(diffuseTex, specularTex, normalTex, noiseTex, shininess, specularIntensity, MarbleGame.instance.world.ambient,
MarbleGame.instance.world.dirLight, MarbleGame.instance.world.dirLightDir, 1); MarbleGame.instance.world.dirLight, MarbleGame.instance.world.dirLightDir, 1);
onFinish(shader); onFinish(shader);
@ -700,11 +701,11 @@ class DifBuilder {
retrievefunc(shad -> { retrievefunc(shad -> {
material.mainPass.removeShader(material.textureShader); material.mainPass.removeShader(material.textureShader);
material.mainPass.addShader(shad); material.mainPass.addShader(shad);
material.receiveShadows = true;
var thisprops:Dynamic = material.getDefaultProps(); var thisprops:Dynamic = material.getDefaultProps();
thisprops.light = false; // We will calculate our own lighting thisprops.light = false; // We will calculate our own lighting
material.props = thisprops; material.props = thisprops;
material.shadows = false; material.shadows = false;
material.receiveShadows = true;
fwd(); fwd();
}); });
}); });

2
src/MarbleWorld.hx
View file

@ -361,6 +361,8 @@ class MarbleWorld extends Scheduler {
"shapes/pads/red.jpg", "shapes/pads/red.jpg",
"shapes/pads/blue.jpg", "shapes/pads/blue.jpg",
"shapes/pads/green.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(StringTools.replace(Settings.optionsSettings.marbleModel, "data/", ""));
marblefiles.push("shapes/balls/" + Settings.optionsSettings.marbleSkin + ".marble.png"); marblefiles.push("shapes/balls/" + Settings.optionsSettings.marbleSkin + ".marble.png");