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

sky color things

Browse source
This commit is contained in:
RandomityGuy 2023-02-15 19:51:56 +05:30
parent be9ec77e13
commit 97e8e2ebee
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/MarbleWorld.hx
View file

@ -355,7 +355,7 @@ class MarbleWorld extends Scheduler {
sky.dmlPath = ResourceLoader.getProperFilepath(skyElement.materiallist); sky.dmlPath = ResourceLoader.getProperFilepath(skyElement.materiallist);
worker.addTask(fwd -> sky.init(cast this, fwd)); worker.addTask(fwd -> sky.init(cast this, fwd, skyElement));
// worker.addTask(fwd -> { // worker.addTask(fwd -> {
// scene.addChild(sky); // scene.addChild(sky);
// return fwd(); // return fwd();

26
src/Sky.hx
View file

@ -1,5 +1,7 @@
package src; package src;
import mis.MisParser;
import mis.MissionElement.MissionElementSky;
import hxd.Pixels; import hxd.Pixels;
import shaders.Skybox; import shaders.Skybox;
import h3d.shader.pbr.PropsValues; import h3d.shader.pbr.PropsValues;
@ -29,8 +31,8 @@ class Sky extends Object {
super(); super();
} }
public function init(level:MarbleWorld, onFinish:Void->Void) { public function init(level:MarbleWorld, onFinish:Void->Void, element:MissionElementSky) {
createSkyboxCubeTextured(this.dmlPath, texture -> { createSkyboxCubeTextured(this.dmlPath, element, texture -> {
var sky = new h3d.prim.Sphere(1, 128, 128); var sky = new h3d.prim.Sphere(1, 128, 128);
sky.addNormals(); sky.addNormals();
sky.addUVs(); sky.addUVs();
@ -68,7 +70,7 @@ class Sky extends Object {
} }
} }
function createSkyboxCubeTextured(dmlPath:String, onFinish:Texture->Void) { function createSkyboxCubeTextured(dmlPath:String, element:MissionElementSky, onFinish:Texture->Void) {
#if (js || android) #if (js || android)
dmlPath = StringTools.replace(dmlPath, "data/", ""); dmlPath = StringTools.replace(dmlPath, "data/", "");
#end #end
@ -93,13 +95,27 @@ class Sky extends Object {
} }
} }
var fogColor = MisParser.parseVector4(element.fogcolor);
var skySolidColor = MisParser.parseVector4(element.skysolidcolor);
var skyColor = fogColor;
if (skySolidColor.x != 0.6 || skySolidColor.y != 0.6 || skySolidColor.z != 0.6)
skyColor = skySolidColor;
if (skyColor.x > 1)
skyColor.x = 1 - (skyColor.x - 1) % 256 / 256;
if (skyColor.y > 1)
skyColor.y = 1 - (skyColor.y - 1) % 256 / 256;
if (skyColor.z > 1)
skyColor.z = 1 - (skyColor.z - 1) % 256 / 256;
var noSkyTexture = element.useskytextures == "0";
var worker = new ResourceLoaderWorker(() -> { var worker = new ResourceLoaderWorker(() -> {
var fnames = []; var fnames = [];
for (i in 0...6) { for (i in 0...6) {
var line = StringTools.trim(lines[i]); var line = StringTools.trim(lines[i]);
var filenames = ResourceLoader.getFullNamesOf(dmlDirectory + '/' + line); var filenames = ResourceLoader.getFullNamesOf(dmlDirectory + '/' + line);
if (filenames.length == 0) { if (filenames.length == 0 || noSkyTexture) {
var pixels = Texture.fromColor(0).capturePixels(0, 0); var pixels = Texture.fromColor(skyColor.toColor()).capturePixels(0, 0);
skyboxImages.push(pixels); skyboxImages.push(pixels);
// var tex = new h3d.mat.Texture(); // var tex = new h3d.mat.Texture();
// skyboxImages.push(new BitmapData(128, 128)); // skyboxImages.push(new BitmapData(128, 128));