diff --git a/Shaders/compositor_pass/compositor_pass.json b/Shaders/compositor_pass/compositor_pass.json index 701aad03..6874932a 100755 --- a/Shaders/compositor_pass/compositor_pass.json +++ b/Shaders/compositor_pass/compositor_pass.json @@ -63,7 +63,7 @@ }, { "name": "lensTexture", - "link": "_lensTexture", + "link": "$lenstexture.jpg", "ifdef": ["_CLensTex"] }, { @@ -73,7 +73,7 @@ }, { "name": "lutTexture", - "link": "_lutTexture", + "link": "$luttexture.jpg", "ifdef": ["_CLUT"] } ], diff --git a/Shaders/deferred_light/deferred_light.json b/Shaders/deferred_light/deferred_light.json index 9f584290..e1152218 100755 --- a/Shaders/deferred_light/deferred_light.json +++ b/Shaders/deferred_light/deferred_light.json @@ -46,7 +46,7 @@ }, { "name": "senvmapBrdf", - "link": "_envmapBrdf", + "link": "$brdf.png", "ifdef": ["_Brdf"] }, { @@ -120,7 +120,7 @@ }, { "name": "texClouds", - "link": "_cloudsTexture", + "link": "$cloudstexture.png", "ifdef": ["_LightClouds"] }, { @@ -130,7 +130,7 @@ }, { "name": "texIES", - "link": "_iesTexture", + "link": "$iestexture.png", "ifdef": ["_LightIES"] }, { diff --git a/Shaders/deferred_light_mobile/deferred_light_mobile.json b/Shaders/deferred_light_mobile/deferred_light_mobile.json index f08b10ba..8a90e82e 100644 --- a/Shaders/deferred_light_mobile/deferred_light_mobile.json +++ b/Shaders/deferred_light_mobile/deferred_light_mobile.json @@ -35,7 +35,7 @@ }, { "name": "senvmapBrdf", - "link": "_envmapBrdf", + "link": "$brdf.png", "ifdef": ["_Brdf"] }, { diff --git a/Shaders/smaa_blend_weight/smaa_blend_weight.json b/Shaders/smaa_blend_weight/smaa_blend_weight.json index 66846c96..45f0a4eb 100755 --- a/Shaders/smaa_blend_weight/smaa_blend_weight.json +++ b/Shaders/smaa_blend_weight/smaa_blend_weight.json @@ -8,11 +8,11 @@ "links": [ { "name": "areaTex", - "link": "_smaaArea" + "link": "$smaa_area.png" }, { "name": "searchTex", - "link": "_smaaSearch" + "link": "$smaa_search.png" }, { "name": "screenSize", diff --git a/Shaders/volumetric_light/volumetric_light.json b/Shaders/volumetric_light/volumetric_light.json index 646f9a8e..06724e62 100755 --- a/Shaders/volumetric_light/volumetric_light.json +++ b/Shaders/volumetric_light/volumetric_light.json @@ -6,6 +6,10 @@ "compare_mode": "always", "cull_mode": "none", "links": [ + { + "name": "snoise", + "link": "$blue_noise64.png" + }, { "name": "eye", "link": "_cameraPosition" diff --git a/Shaders/world_pass/world_pass.json b/Shaders/world_pass/world_pass.json index 03a31074..810f8bb2 100644 --- a/Shaders/world_pass/world_pass.json +++ b/Shaders/world_pass/world_pass.json @@ -77,17 +77,17 @@ }, { "name": "scloudsBase", - "link": "_cloudsBase", + "link": "$clouds_base.raw", "ifdef": ["_EnvClouds"] }, { "name": "scloudsDetail", - "link": "_cloudsDetail", + "link": "$clouds_detail.raw", "ifdef": ["_EnvClouds"] }, { "name": "scloudsMap", - "link": "_cloudsMap", + "link": "$clouds_map.png", "ifdef": ["_EnvClouds"] }, { diff --git a/Sources/armory/object/Uniforms.hx b/Sources/armory/object/Uniforms.hx index 1aa74bba..2722044d 100644 --- a/Sources/armory/object/Uniforms.hx +++ b/Sources/armory/object/Uniforms.hx @@ -15,14 +15,8 @@ class Uniforms { } public static function textureLink(object:Object, mat:MaterialData, link:String):kha.Image { - if (link == "_smaaSearch") { - return Scene.active.embedded.get('smaa_search.png'); - } - else if (link == "_smaaArea") { - return Scene.active.embedded.get('smaa_area.png'); - } #if arm_ltc - else if (link == "_ltcMat") { + if (link == "_ltcMat") { if (armory.data.ConstData.ltcMatTex == null) armory.data.ConstData.initLTC(); return armory.data.ConstData.ltcMatTex; } @@ -31,15 +25,6 @@ class Uniforms { return armory.data.ConstData.ltcMagTex; } #end - else if (link == "_lensTexture") { - return Scene.active.embedded.get('lenstexture.jpg'); - } - else if (link == "_lutTexture") { - return Scene.active.embedded.get('luttexture.jpg'); - } - else if (link == "_cloudsTexture") { - return Scene.active.embedded.get('cloudstexture.png'); - } return null; } diff --git a/Sources/armory/system/Cycles.hx b/Sources/armory/system/Cycles.hx index b4484185..4f5697e3 100644 --- a/Sources/armory/system/Cycles.hx +++ b/Sources/armory/system/Cycles.hx @@ -618,7 +618,7 @@ class Cycles { else if (node.type == 'TEX_NOISE') { curshader.add_function(CyclesFunctions.str_tex_noise); - curshader.add_uniform('sampler2D snoise256', '_noise256'); + curshader.add_uniform('sampler2D snoise256', '$noise256.png'); var co = ''; if (getInputLink(node.inputs[0]) != null) { co = parse_vector_input(node.inputs[0]); @@ -645,9 +645,7 @@ class Cycles { else if (node.type == 'TEX_VORONOI') { curshader.add_function(CyclesFunctions.str_tex_voronoi); - // c_state.assets_add(c_state.get_sdk_path() + '/armory/Assets/' + 'noise64.png') - // c_state.assets_add_embedded_data('noise64.png') - curshader.add_uniform('sampler2D snoise256', '_noise256'); + curshader.add_uniform('sampler2D snoise256', '$noise256.png'); var co = ''; if (getInputLink(node.inputs[0]) != null) { co = parse_vector_input(node.inputs[0]); @@ -1445,7 +1443,7 @@ class Cycles { else if (node.type == 'TEX_NOISE') { curshader.add_function(CyclesFunctions.str_tex_noise); - curshader.add_uniform('sampler2D snoise256', '_noise256'); + curshader.add_uniform('sampler2D snoise256', '$noise256.png'); var co = ''; if (getInputLink(node.inputs[0]) != null) { co = parse_vector_input(node.inputs[0]); @@ -1467,9 +1465,7 @@ class Cycles { else if (node.type == 'TEX_VORONOI') { curshader.add_function(CyclesFunctions.str_tex_voronoi); - // c_state.assets_add(c_state.get_sdk_path() + '/armory/Assets/' + 'noise64.png') - // c_state.assets_add_embedded_data('noise64.png') - curshader.add_uniform('sampler2D snoise256', '_noise256'); + curshader.add_uniform('sampler2D snoise256', '$noise256.png'); var co = ''; if (getInputLink(node.inputs[0]) != null) { co = parse_vector_input(node.inputs[0]); diff --git a/blender/arm/make_renderpath.py b/blender/arm/make_renderpath.py index 413c1383..a67a09af 100755 --- a/blender/arm/make_renderpath.py +++ b/blender/arm/make_renderpath.py @@ -134,7 +134,6 @@ def build(): assets.add_embedded_data('clouds_detail.raw') assets.add(assets_path + 'clouds_map.png') assets.add_embedded_data('clouds_map.png') - assets.add_khafile_def('rp_clouds') if rpdat.rp_renderer == 'Deferred' and not rpdat.rp_compositornodes: assets.add_shader_pass('copy_pass') diff --git a/blender/arm/material/cycles.py b/blender/arm/material/cycles.py index 7bfb8753..00d52be1 100644 --- a/blender/arm/material/cycles.py +++ b/blender/arm/material/cycles.py @@ -519,7 +519,7 @@ def parse_vector(node, socket): curshader.add_function(c_functions.str_tex_noise) assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png') assets_add_embedded_data('noise256.png') - curshader.add_uniform('sampler2D snoise256', link='_noise256') + curshader.add_uniform('sampler2D snoise256', link='$noise256.png') curshader.add_function(c_functions.str_tex_noise) if node.inputs[0].is_linked: co = parse_vector_input(node.inputs[0]) @@ -546,7 +546,7 @@ def parse_vector(node, socket): curshader.add_function(c_functions.str_tex_voronoi) assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png') assets_add_embedded_data('noise256.png') - curshader.add_uniform('sampler2D snoise256', link='_noise256') + curshader.add_uniform('sampler2D snoise256', link='$noise256.png') if node.inputs[0].is_linked: co = parse_vector_input(node.inputs[0]) else: @@ -1177,7 +1177,7 @@ def parse_value(node, socket): curshader.add_function(c_functions.str_tex_noise) assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png') assets_add_embedded_data('noise256.png') - curshader.add_uniform('sampler2D snoise256', link='_noise256') + curshader.add_uniform('sampler2D snoise256', link='$noise256.png') if node.inputs[0].is_linked: co = parse_vector_input(node.inputs[0]) else: @@ -1197,7 +1197,7 @@ def parse_value(node, socket): curshader.add_function(c_functions.str_tex_voronoi) assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png') assets_add_embedded_data('noise256.png') - curshader.add_uniform('sampler2D snoise256', link='_noise256') + curshader.add_uniform('sampler2D snoise256', link='$noise256.png') if node.inputs[0].is_linked: co = parse_vector_input(node.inputs[0]) else: diff --git a/blender/arm/material/make_mesh.py b/blender/arm/material/make_mesh.py index f6b4b617..e4dbcb83 100644 --- a/blender/arm/material/make_mesh.py +++ b/blender/arm/material/make_mesh.py @@ -599,7 +599,7 @@ def make_forward_base(con_mesh, parse_opacity=False, transluc_pass=False): frag.write('vec3 f0 = surfaceF0(basecol, metallic);') if '_Brdf' in wrd.world_defs: - frag.add_uniform('sampler2D senvmapBrdf', link='_envmapBrdf') + frag.add_uniform('sampler2D senvmapBrdf', link='$brdf.png') frag.write('vec2 envBRDF = texture(senvmapBrdf, vec2(roughness, 1.0 - dotNV)).xy;') if '_Irr' in wrd.world_defs: