Link to embedded data
This commit is contained in:
parent
d8bd7f6972
commit
aa5c4f7e73
|
@ -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"]
|
||||
}
|
||||
],
|
||||
|
|
|
@ -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"]
|
||||
},
|
||||
{
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
},
|
||||
{
|
||||
"name": "senvmapBrdf",
|
||||
"link": "_envmapBrdf",
|
||||
"link": "$brdf.png",
|
||||
"ifdef": ["_Brdf"]
|
||||
},
|
||||
{
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
"links": [
|
||||
{
|
||||
"name": "areaTex",
|
||||
"link": "_smaaArea"
|
||||
"link": "$smaa_area.png"
|
||||
},
|
||||
{
|
||||
"name": "searchTex",
|
||||
"link": "_smaaSearch"
|
||||
"link": "$smaa_search.png"
|
||||
},
|
||||
{
|
||||
"name": "screenSize",
|
||||
|
|
|
@ -6,6 +6,10 @@
|
|||
"compare_mode": "always",
|
||||
"cull_mode": "none",
|
||||
"links": [
|
||||
{
|
||||
"name": "snoise",
|
||||
"link": "$blue_noise64.png"
|
||||
},
|
||||
{
|
||||
"name": "eye",
|
||||
"link": "_cameraPosition"
|
||||
|
|
|
@ -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"]
|
||||
},
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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]);
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue