maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Relight fix

Browse source
This commit is contained in:
luboslenco 2019-01-11 20:54:36 +01:00
parent 735ba8eb91
commit 4a0166c6c2
2 changed files with 32 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Sources/armory/renderpath/RenderPathDeferred.hx
View file

@ -551,11 +551,17 @@ class RenderPathDeferred {
// Voxels
#if (rp_gi != "Off")
var relight = false;
if (armory.data.Config.raw.rp_gi != false)
{
var voxelize = path.voxelize();
#if ((rp_gi == "Voxel GI") && (rp_voxelgi_relight))
// Relight if light was moved
for (light in iron.Scene.active.lights) {
if (light.transform.diff()) { voxelize = true; break; }
}
#end
#if arm_voxelgi_temporal
voxelize = ++RenderPathCreator.voxelFrame % RenderPathCreator.voxelFreq == 0;
@ -578,39 +584,25 @@ class RenderPathDeferred {
path.setTarget("");
path.setViewport(res, res);
path.bindTarget(voxtex, "voxels");
// #if (rp_gi == "Voxel GI")
#if (rp_gi == "Voxel GI")
// path.bindTarget("voxelsNor", "voxelsNor");
// #voxelsOpac
for (l in iron.Scene.active.lights) {
if (!l.visible || !l.data.raw.cast_shadow || l.data.raw.type != "sun") continue;
var n = "shadowMap";
path.bindTarget(n, n);
break;
}
#end
path.drawMeshes("voxel");
relight = true;
}
#if ((rp_gi == "Voxel GI") && (rp_voxelgi_relight))
// Relight if light was moved
for (light in iron.Scene.active.lights) {
if (light.transform.diff()) { relight = true; break; }
}
#end
if (relight) {
// #if (rp_gi == "Voxel GI")
// Inc.computeVoxelsBegin();
// Inc.computeVoxels();
// Inc.computeVoxelsEnd();
// // #if (rp_gi_bounces)
// // voxels = "voxelsBounce";
// // #end
// #else
path.generateMipmaps(voxels);
// #end
}
// if (relight) {
// Inc.computeVoxelsBegin();
// Inc.computeVoxels();
// Inc.computeVoxelsEnd();
// path.generateMipmaps(voxels);
// }
}
#end

40
Sources/armory/renderpath/RenderPathForward.hx
View file

@ -229,6 +229,13 @@ class RenderPathForward {
{
var voxelize = path.voxelize();
#if ((rp_gi == "Voxel GI") && (rp_voxelgi_relight))
// Relight if light was moved
for (light in iron.Scene.active.lights) {
if (light.transform.diff()) { voxelize = true; break; }
}
#end
#if arm_voxelgi_temporal
voxelize = ++RenderPathCreator.voxelFrame % RenderPathCreator.voxelFreq == 0;
@ -238,7 +245,6 @@ class RenderPathForward {
}
#end
var relight = false;
if (voxelize) {
var res = Inc.getVoxelRes();
@ -252,39 +258,25 @@ class RenderPathForward {
path.setTarget("");
path.setViewport(res, res);
path.bindTarget(voxtex, "voxels");
// #if (rp_gi == "Voxel GI")
#if (rp_gi == "Voxel GI")
// path.bindTarget("voxelsNor", "voxelsNor");
// #end
for (l in iron.Scene.active.lights) {
if (!l.visible || !l.data.raw.cast_shadow || l.data.raw.type != "sun") continue;
var n = "shadowMap";
path.bindTarget(n, n);
break;
}
#end
path.drawMeshes("voxel");
relight = true;
}
#if ((rp_gi == "Voxel GI") && (rp_voxelgi_relight))
// Relight if light was moved
for (light in iron.Scene.active.lights) {
if (light.transform.diff()) { relight = true; break; }
}
#end
if (relight) {
// #if (rp_gi == "Voxel GI")
// Inc.computeVoxelsBegin();
// Inc.computeVoxels();
// Inc.computeVoxelsEnd();
// // #if (rp_gi_bounces)
// // voxels = "voxelsBounce";
// // #end
// #else
path.generateMipmaps(voxels);
// #end
}
// if (relight) {
// Inc.computeVoxelsBegin();
// Inc.computeVoxels();
// Inc.computeVoxelsEnd();
// path.generateMipmaps(voxels);
// }
}
#end