Merge pull request #3291 from moisesjpelaez/background_world

World's background color strength fix

Author: luboslenco

armory/Sources/iron/RenderPath.hx

@@ -295,7 +295,9 @@ class RenderPath {
 	public function clearTarget(colorFlag: Null<Int> = null, depthFlag: Null<Float> = null) {
 		if (colorFlag == -1) { // -1 == 0xffffffff
 			if (Scene.active.world != null) {
-				colorFlag = Scene.active.world.raw.background_color;
+				var col = Scene.active.world.raw.background_color;
+				var strength = Scene.active.world.probe != null ? Scene.active.world.probe.raw.strength : 1.0;
+				colorFlag = Color.fromFloats(((col >> 16) & 0xff) / 255 * strength, ((col >> 8) & 0xff) / 255 * strength, (col & 0xff) / 255 * strength);
 			}
 			else if (Scene.active.camera != null) {
 				var cc = Scene.active.camera.data.raw.clear_color;

armory/Sources/iron/object/Uniforms.hx

@@ -485,7 +485,11 @@ class Uniforms {
 					v = helpVec;
 				}
 				case "_backgroundCol": {
-					if (camera.data.raw.clear_color != null) helpVec.set(camera.data.raw.clear_color[0], camera.data.raw.clear_color[1], camera.data.raw.clear_color[2]);
+					if (Scene.active.world != null) {
+						var col = Scene.active.world.raw.background_color;
+						helpVec.set(((col >> 16) & 0xff) / 255, ((col >> 8) & 0xff) / 255, (col & 0xff) / 255);
+					}
+					else if (camera.data.raw.clear_color != null) helpVec.set(camera.data.raw.clear_color[0], camera.data.raw.clear_color[1], camera.data.raw.clear_color[2]);
 					v = helpVec;
 				}
 				case "_hosekSunDirection": {

armory/blender/arm/exporter.py

@@ -3645,7 +3645,7 @@ def post_export_world(world: bpy.types.World, out_world: Dict):
         strength = world.arm_envtex_strength
 
         mobile_mat = rpdat.arm_material_model in ('Mobile', 'Solid')
-        if mobile_mat:
+        if mobile_mat or '_EnvCol' in world.world_defs:
             arm_radiance = False
 
         out_probe = {'name': arm.utils.asset_name(world) if world.library else world.name}

armory/blender/arm/make_renderpath.py

@@ -154,7 +154,7 @@ def add_world_defs():
         wrd.world_defs += '_Clusters'
         assets.add_khafile_def('arm_clusters')
 
-    if '_Rad' in wrd.world_defs and '_Brdf' not in wrd.world_defs:
+    if ('_Rad' in wrd.world_defs or ('_EnvCol' in wrd.world_defs and rpdat.arm_material_model == 'Full')) and '_Brdf' not in wrd.world_defs:
         wrd.world_defs += '_Brdf'
         assets.add_khafile_def("arm_brdf")
 

armory/blender/arm/make_world.py

@@ -31,6 +31,29 @@
 shader_datas = []
 
 
+def add_world_def(world: bpy.types.World, define: str):
+    if define not in world.world_defs:
+        world.world_defs += define
+
+
+def add_global_def(define: str):
+    wrd = bpy.data.worlds['Arm']
+    if define not in wrd.world_defs:
+        wrd.world_defs += define
+
+
+def add_irradiance_defs(world: bpy.types.World, rpdat):
+    if rpdat.arm_irradiance and rpdat.arm_material_model != 'Solid':
+        add_world_def(world, '_Irr')
+        add_global_def('_Irr')
+        assets.add_khafile_def("arm_irradiance")
+
+
+def mark_color_environment(world: bpy.types.World):
+    add_world_def(world, '_EnvCol')
+    add_global_def('_EnvCol')
+
+
 def build():
     """Builds world shaders for all exported worlds."""
     global shader_datas
@@ -174,7 +197,7 @@ def build_node_tree(world: bpy.types.World, frag: Shader, vert: Shader, con: Sha
 
     # film_transparent, do not render
     if bpy.context.scene is not None and bpy.context.scene.render.film_transparent:
-        world.world_defs += '_EnvCol'
+        mark_color_environment(world)
         frag.add_uniform('vec3 backgroundCol', link='_backgroundCol')
         frag.write('fragColor.rgb = backgroundCol;')
         return
@@ -195,14 +218,11 @@ def build_node_tree(world: bpy.types.World, frag: Shader, vert: Shader, con: Sha
 
     # No world nodes/no output node, use background color
     if not is_parsed:
-        solid_mat = rpdat.arm_material_model == 'Solid'
-        if rpdat.arm_irradiance and not solid_mat:
-            world.world_defs += '_Irr'
-            assets.add_khafile_def("arm_irradiance")
+        add_irradiance_defs(world, rpdat)
         col = world.color
         world.arm_envtex_color = [col[0], col[1], col[2], 1.0]
         world.arm_envtex_strength = 1.0
-        world.world_defs += '_EnvCol'
+        mark_color_environment(world)
 
     # Clouds enabled
     if rpdat.arm_clouds and world.arm_use_clouds:
@@ -212,12 +232,13 @@ def build_node_tree(world: bpy.types.World, frag: Shader, vert: Shader, con: Sha
         wrd.world_defs += '_EnvClouds'
         frag_write_clouds(world, frag)
 
-    if '_EnvSky' in world.world_defs or '_EnvTex' in world.world_defs or '_EnvImg' in world.world_defs or '_EnvClouds' in world.world_defs:
+    if '_EnvSky' in world.world_defs or '_EnvTex' in world.world_defs or '_EnvImg' in world.world_defs or '_EnvCol' in world.world_defs or '_EnvClouds' in world.world_defs:
         frag.add_uniform('float envmapStrength', link='_envmapStrength')
 
     # Clear background color
     if '_EnvCol' in world.world_defs:
-        frag.write('fragColor.rgb = backgroundCol;')
+        frag.add_uniform('vec3 backgroundCol', link='_backgroundCol')
+        frag.write('fragColor.rgb = backgroundCol * envmapStrength;')
 
     elif '_EnvTex' in world.world_defs and '_EnvLDR' in world.world_defs:
         frag.write('fragColor.rgb = pow(fragColor.rgb, vec3(2.2));')
@@ -276,14 +297,11 @@ def parse_world_output(world: bpy.types.World, node_output: bpy.types.Node, frag
 
 
 def parse_surface(world: bpy.types.World, node_surface: bpy.types.Node, frag: Shader):
-    wrd = bpy.data.worlds['Arm']
     rpdat = arm.utils.get_rp()
-    solid_mat = rpdat.arm_material_model == 'Solid'
 
     if node_surface.type in ('BACKGROUND', 'EMISSION'):
         # Append irradiance define
-        if rpdat.arm_irradiance and not solid_mat:
-            wrd.world_defs += '_Irr'
+        add_irradiance_defs(world, rpdat)
 
         # Extract environment strength
         # Todo: follow/parse strength input
@@ -294,11 +312,8 @@ def parse_surface(world: bpy.types.World, node_surface: bpy.types.Node, frag: Sh
         frag.write(f'fragColor.rgb = {out};')
 
         if not node_surface.inputs[0].is_linked:
-            solid_mat = rpdat.arm_material_model == 'Solid'
-            if rpdat.arm_irradiance and not solid_mat:
-                world.world_defs += '_Irr'
             world.arm_envtex_color = node_surface.inputs[0].default_value
-            world.arm_envtex_strength = 1.0
+            mark_color_environment(world)
 
     else:
         log.warn(f'World node type {node_surface.type} must not be connected to the world output node!')

armory/blender/arm/write_probes.py

@@ -439,8 +439,10 @@ def write_sky_irradiance(base_name):
 
 def write_color_irradiance(base_name, col):
     """Constant color irradiance"""
-    # Adjust to Cycles
-    irradiance_floats = [col[0] * 1.13, col[1] * 1.13, col[2] * 1.13]
+    # Match shIrradiance()'s c4 factor so a constant color environment
+    # decodes back to the same diffuse radiance at strength 1.
+    sh_l00 = 1.0 / 0.886227
+    irradiance_floats = [col[0] * sh_l00, col[1] * sh_l00, col[2] * sh_l00]
     for i in range(0, 24):
         irradiance_floats.append(0.0)