edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Envmap fixes

Browse Source
This commit is contained in:
luboslenco
2019-10-22 12:05:39 +02:00
parent 7f225418b7
commit 970901f5fa
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/Project.hx
+1
View File
@@ -224,6 +224,7 @@ class Project {
UITrait.inst.savedEnvmap = UITrait.inst.defaultEnvmap;
Scene.active.world.envmap = UITrait.inst.emptyEnvmap;
Scene.active.world.raw.envmap = "World.hdr";
UITrait.inst.showEnvmapHandle.selected = UITrait.inst.showEnvmap = false;
Scene.active.world.probe.radiance = UITrait.inst.defaultRadiance;
Scene.active.world.probe.radianceMipmaps = UITrait.inst.defaultRadianceMipmaps;
Sources/arm/io/ImportEnvmap.hx
+1
View File
@@ -87,6 +87,7 @@ class ImportEnvmap {
// World envmap
Scene.active.world.probe.raw.strength = 1.0;
Scene.active.world.envmap = image;
Scene.active.world.raw.envmap = path;
UITrait.inst.savedEnvmap = image;
UITrait.inst.showEnvmapHandle.selected = UITrait.inst.showEnvmap = true;
Sources/arm/ui/TabViewport.hx
+12 -10
View File
@@ -39,7 +39,8 @@ class TabViewport {
MaterialParser.parseMeshMaterial();
}
var p = Scene.active.world.probe;
var envHandle = Id.handle({value: p.raw.strength});
var envHandle = Id.handle();
envHandle.value = p.raw.strength;
p.raw.strength = ui.slider(envHandle, "Environment", 0.0, 8.0, true);
if (envHandle.changed) Context.ddirty = 2;
@@ -49,8 +50,7 @@ class TabViewport {
var light = Scene.active.lights[0];
var sxhandle = Id.handle();
var f32:kha.FastFloat = light.data.raw.size; // hl fix
sxhandle.value = f32;
sxhandle.value = light.data.raw.size;
light.data.raw.size = ui.slider(sxhandle, "Light Size", 0.0, 4.0, true);
if (sxhandle.changed) Context.ddirty = 2;
// var syhandle = Id.handle();
@@ -108,7 +108,7 @@ class TabViewport {
if (UITrait.inst.showEnvmapHandle.changed) {
var world = Scene.active.world;
world.loadEnvmap(function(_) {});
UITrait.inst.savedEnvmap = world.envmap;
if (UITrait.inst.savedEnvmap == null) UITrait.inst.savedEnvmap = world.envmap;
Context.ddirty = 2;
}
var compassHandle = Id.handle({selected: UITrait.inst.showCompass});
@@ -117,11 +117,7 @@ class TabViewport {
if (UITrait.inst.showEnvmap) {
UITrait.inst.showEnvmapBlur = ui.check(UITrait.inst.showEnvmapBlurHandle, "Blurred");
if (UITrait.inst.showEnvmapBlurHandle.changed) {
var probe = Scene.active.world.probe;
UITrait.inst.savedEnvmap = UITrait.inst.showEnvmapBlur ? probe.radianceMipmaps[0] : probe.radiance;
Context.ddirty = 2;
}
if (UITrait.inst.showEnvmapBlurHandle.changed) Context.ddirty = 2;
}
else {
if (ui.panel(Id.handle({selected: false}), "Viewport Color")) {
@@ -144,7 +140,13 @@ class TabViewport {
}
}
}
Scene.active.world.envmap = UITrait.inst.showEnvmap ? UITrait.inst.savedEnvmap : UITrait.inst.emptyEnvmap;
if (UITrait.inst.showEnvmap) {
Scene.active.world.envmap = UITrait.inst.showEnvmapBlur ? Scene.active.world.probe.radianceMipmaps[0] : UITrait.inst.savedEnvmap;
}
else {
Scene.active.world.envmap = UITrait.inst.emptyEnvmap;
}
}
}
}
Sources/arm/ui/UITrait.hx
+2 -2
View File
@@ -312,8 +312,8 @@ class UITrait {
var world = Scene.active.world;
if (savedEnvmap == null) {
savedEnvmap = world.envmap;
defaultEnvmap = world.envmap;
// savedEnvmap = world.envmap;
// defaultEnvmap = world.envmap;
defaultIrradiance = world.probe.irradiance;
defaultRadiance = world.probe.radiance;
defaultRadianceMipmaps = world.probe.radianceMipmaps;