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

Link to embedded data

Browse source
This commit is contained in:
luboslenco 2019-04-26 11:12:09 +02:00
parent d8bd7f6972
commit aa5c4f7e73
11 changed files with 25 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Shaders/compositor_pass/compositor_pass.json
View file

@ -63,7 +63,7 @@
}, },
{ {
"name": "lensTexture", "name": "lensTexture",
"link": "_lensTexture", "link": "$lenstexture.jpg",
"ifdef": ["_CLensTex"] "ifdef": ["_CLensTex"]
}, },
{ {
@ -73,7 +73,7 @@
}, },
{ {
"name": "lutTexture", "name": "lutTexture",
"link": "_lutTexture", "link": "$luttexture.jpg",
"ifdef": ["_CLUT"] "ifdef": ["_CLUT"]
} }
], ],

6
Shaders/deferred_light/deferred_light.json
View file

@ -46,7 +46,7 @@
}, },
{ {
"name": "senvmapBrdf", "name": "senvmapBrdf",
"link": "_envmapBrdf", "link": "$brdf.png",
"ifdef": ["_Brdf"] "ifdef": ["_Brdf"]
}, },
{ {
@ -120,7 +120,7 @@
}, },
{ {
"name": "texClouds", "name": "texClouds",
"link": "_cloudsTexture", "link": "$cloudstexture.png",
"ifdef": ["_LightClouds"] "ifdef": ["_LightClouds"]
}, },
{ {
@ -130,7 +130,7 @@
}, },
{ {
"name": "texIES", "name": "texIES",
"link": "_iesTexture", "link": "$iestexture.png",
"ifdef": ["_LightIES"] "ifdef": ["_LightIES"]
}, },
{ {

2
Shaders/deferred_light_mobile/deferred_light_mobile.json
View file

@ -35,7 +35,7 @@
}, },
{ {
"name": "senvmapBrdf", "name": "senvmapBrdf",
"link": "_envmapBrdf", "link": "$brdf.png",
"ifdef": ["_Brdf"] "ifdef": ["_Brdf"]
}, },
{ {

4
Shaders/smaa_blend_weight/smaa_blend_weight.json
View file

@ -8,11 +8,11 @@
"links": [ "links": [
{ {
"name": "areaTex", "name": "areaTex",
"link": "_smaaArea" "link": "$smaa_area.png"
}, },
{ {
"name": "searchTex", "name": "searchTex",
"link": "_smaaSearch" "link": "$smaa_search.png"
}, },
{ {
"name": "screenSize", "name": "screenSize",

4
Shaders/volumetric_light/volumetric_light.json
View file

@ -6,6 +6,10 @@
"compare_mode": "always", "compare_mode": "always",
"cull_mode": "none", "cull_mode": "none",
"links": [ "links": [
{
"name": "snoise",
"link": "$blue_noise64.png"
},
{ {
"name": "eye", "name": "eye",
"link": "_cameraPosition" "link": "_cameraPosition"

6
Shaders/world_pass/world_pass.json
View file

@ -77,17 +77,17 @@
}, },
{ {
"name": "scloudsBase", "name": "scloudsBase",
"link": "_cloudsBase", "link": "$clouds_base.raw",
"ifdef": ["_EnvClouds"] "ifdef": ["_EnvClouds"]
}, },
{ {
"name": "scloudsDetail", "name": "scloudsDetail",
"link": "_cloudsDetail", "link": "$clouds_detail.raw",
"ifdef": ["_EnvClouds"] "ifdef": ["_EnvClouds"]
}, },
{ {
"name": "scloudsMap", "name": "scloudsMap",
"link": "_cloudsMap", "link": "$clouds_map.png",
"ifdef": ["_EnvClouds"] "ifdef": ["_EnvClouds"]
}, },
{ {

17
Sources/armory/object/Uniforms.hx
View file

@ -15,14 +15,8 @@ class Uniforms {
} }
public static function textureLink(object:Object, mat:MaterialData, link:String):kha.Image { 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 #if arm_ltc
else if (link == "_ltcMat") { if (link == "_ltcMat") {
if (armory.data.ConstData.ltcMatTex == null) armory.data.ConstData.initLTC(); if (armory.data.ConstData.ltcMatTex == null) armory.data.ConstData.initLTC();
return armory.data.ConstData.ltcMatTex; return armory.data.ConstData.ltcMatTex;
} }
@ -31,15 +25,6 @@ class Uniforms {
return armory.data.ConstData.ltcMagTex; return armory.data.ConstData.ltcMagTex;
} }
#end #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; return null;
} }

12
Sources/armory/system/Cycles.hx
View file

@ -618,7 +618,7 @@ class Cycles {
else if (node.type == 'TEX_NOISE') { else if (node.type == 'TEX_NOISE') {
curshader.add_function(CyclesFunctions.str_tex_noise); curshader.add_function(CyclesFunctions.str_tex_noise);
curshader.add_uniform('sampler2D snoise256', '_noise256'); curshader.add_uniform('sampler2D snoise256', '$noise256.png');
var co = ''; var co = '';
if (getInputLink(node.inputs[0]) != null) { if (getInputLink(node.inputs[0]) != null) {
co = parse_vector_input(node.inputs[0]); co = parse_vector_input(node.inputs[0]);
@ -645,9 +645,7 @@ class Cycles {
else if (node.type == 'TEX_VORONOI') { else if (node.type == 'TEX_VORONOI') {
curshader.add_function(CyclesFunctions.str_tex_voronoi); curshader.add_function(CyclesFunctions.str_tex_voronoi);
// c_state.assets_add(c_state.get_sdk_path() + '/armory/Assets/' + 'noise64.png') curshader.add_uniform('sampler2D snoise256', '$noise256.png');
// c_state.assets_add_embedded_data('noise64.png')
curshader.add_uniform('sampler2D snoise256', '_noise256');
var co = ''; var co = '';
if (getInputLink(node.inputs[0]) != null) { if (getInputLink(node.inputs[0]) != null) {
co = parse_vector_input(node.inputs[0]); co = parse_vector_input(node.inputs[0]);
@ -1445,7 +1443,7 @@ class Cycles {
else if (node.type == 'TEX_NOISE') { else if (node.type == 'TEX_NOISE') {
curshader.add_function(CyclesFunctions.str_tex_noise); curshader.add_function(CyclesFunctions.str_tex_noise);
curshader.add_uniform('sampler2D snoise256', '_noise256'); curshader.add_uniform('sampler2D snoise256', '$noise256.png');
var co = ''; var co = '';
if (getInputLink(node.inputs[0]) != null) { if (getInputLink(node.inputs[0]) != null) {
co = parse_vector_input(node.inputs[0]); co = parse_vector_input(node.inputs[0]);
@ -1467,9 +1465,7 @@ class Cycles {
else if (node.type == 'TEX_VORONOI') { else if (node.type == 'TEX_VORONOI') {
curshader.add_function(CyclesFunctions.str_tex_voronoi); curshader.add_function(CyclesFunctions.str_tex_voronoi);
// c_state.assets_add(c_state.get_sdk_path() + '/armory/Assets/' + 'noise64.png') curshader.add_uniform('sampler2D snoise256', '$noise256.png');
// c_state.assets_add_embedded_data('noise64.png')
curshader.add_uniform('sampler2D snoise256', '_noise256');
var co = ''; var co = '';
if (getInputLink(node.inputs[0]) != null) { if (getInputLink(node.inputs[0]) != null) {
co = parse_vector_input(node.inputs[0]); co = parse_vector_input(node.inputs[0]);

1
blender/arm/make_renderpath.py
View file

@ -134,7 +134,6 @@ def build():
assets.add_embedded_data('clouds_detail.raw') assets.add_embedded_data('clouds_detail.raw')
assets.add(assets_path + 'clouds_map.png') assets.add(assets_path + 'clouds_map.png')
assets.add_embedded_data('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: if rpdat.rp_renderer == 'Deferred' and not rpdat.rp_compositornodes:
assets.add_shader_pass('copy_pass') assets.add_shader_pass('copy_pass')

8
blender/arm/material/cycles.py
View file

@ -519,7 +519,7 @@ def parse_vector(node, socket):
curshader.add_function(c_functions.str_tex_noise) curshader.add_function(c_functions.str_tex_noise)
assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png') assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png')
assets_add_embedded_data('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) curshader.add_function(c_functions.str_tex_noise)
if node.inputs[0].is_linked: if node.inputs[0].is_linked:
co = parse_vector_input(node.inputs[0]) co = parse_vector_input(node.inputs[0])
@ -546,7 +546,7 @@ def parse_vector(node, socket):
curshader.add_function(c_functions.str_tex_voronoi) curshader.add_function(c_functions.str_tex_voronoi)
assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png') assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png')
assets_add_embedded_data('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: if node.inputs[0].is_linked:
co = parse_vector_input(node.inputs[0]) co = parse_vector_input(node.inputs[0])
else: else:
@ -1177,7 +1177,7 @@ def parse_value(node, socket):
curshader.add_function(c_functions.str_tex_noise) curshader.add_function(c_functions.str_tex_noise)
assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png') assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png')
assets_add_embedded_data('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: if node.inputs[0].is_linked:
co = parse_vector_input(node.inputs[0]) co = parse_vector_input(node.inputs[0])
else: else:
@ -1197,7 +1197,7 @@ def parse_value(node, socket):
curshader.add_function(c_functions.str_tex_voronoi) curshader.add_function(c_functions.str_tex_voronoi)
assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png') assets_add(get_sdk_path() + '/armory/Assets/' + 'noise256.png')
assets_add_embedded_data('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: if node.inputs[0].is_linked:
co = parse_vector_input(node.inputs[0]) co = parse_vector_input(node.inputs[0])
else: else:

2
blender/arm/material/make_mesh.py
View file

@ -599,7 +599,7 @@ def make_forward_base(con_mesh, parse_opacity=False, transluc_pass=False):
frag.write('vec3 f0 = surfaceF0(basecol, metallic);') frag.write('vec3 f0 = surfaceF0(basecol, metallic);')
if '_Brdf' in wrd.world_defs: 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;') frag.write('vec2 envBRDF = texture(senvmapBrdf, vec2(roughness, 1.0 - dotNV)).xy;')
if '_Irr' in wrd.world_defs: if '_Irr' in wrd.world_defs: