Update blend
This commit is contained in:
unknown
@@ -437,7 +437,7 @@ class UINodes extends iron.Trait {
|
||||
alpha_blend_source: 'blend_one',
|
||||
alpha_blend_destination: eraser ? 'blend_zero' : 'blend_one',
|
||||
alpha_blend_operation: 'add',
|
||||
vertex_structure: [{name: "pos", size: 3},{name: "nor", size: 3},{name: "tex", size: 2}] });
|
||||
vertex_structure: [{name: "pos", data: 'short4norm'},{name: "nor", data: 'short2norm'},{name: "tex", data: 'short2norm'}] });
|
||||
|
||||
con_paint.data.color_writes_red = [true, true, true, true];
|
||||
con_paint.data.color_writes_green = [true, true, true, true];
|
||||
@@ -676,7 +676,7 @@ class UINodes extends iron.Trait {
|
||||
depth_write: true,
|
||||
compare_mode: 'less',
|
||||
cull_mode: 'clockwise',
|
||||
vertex_structure: [{name: "pos", size: 3},{name: "nor", size: 3},{name: "tex", size: 2}] });
|
||||
vertex_structure: [{name: "pos", data: 'short4norm'},{name: "nor", data: 'short2norm'},{name: "tex", data: 'short2norm'}] });
|
||||
|
||||
var vert = con_mesh.make_vert();
|
||||
var frag = con_mesh.make_frag();
|
||||
@@ -745,7 +745,7 @@ class UINodes extends iron.Trait {
|
||||
color_write_green: false,
|
||||
color_write_blue: false,
|
||||
color_write_alpha: false,
|
||||
vertex_structure: [{name: "pos", size: 3}]
|
||||
vertex_structure: [{name: "pos", data: 'short4norm'}]
|
||||
});
|
||||
|
||||
var vert = con_depth.make_vert();
|
||||
@@ -755,7 +755,7 @@ class UINodes extends iron.Trait {
|
||||
|
||||
if (shadowmap) {
|
||||
if (UITrait.inst.paintHeight) {
|
||||
con_depth.add_elem('nor', 3);
|
||||
con_depth.add_elem('nor', 'short2norm');
|
||||
vert.wposition = true;
|
||||
vert.n = true;
|
||||
vert.add_uniform('sampler2D texpaint_opt');
|
||||
@@ -812,7 +812,7 @@ class UINodes extends iron.Trait {
|
||||
depth_write: true,
|
||||
compare_mode: 'less',
|
||||
cull_mode: UITrait.inst.culling ? 'clockwise' : 'none',
|
||||
vertex_structure: [{name: "pos", size: 3},{name: "nor", size: 3},{name: "tex", size: 2}] });
|
||||
vertex_structure: [{name: "pos", data: 'short4norm'},{name: "nor", data: 'short2norm'},{name: "tex", data: 'short2norm'}] });
|
||||
|
||||
var vert = con_mesh.make_vert();
|
||||
var frag = con_mesh.make_frag();
|
||||
|
||||
+42
-42
@@ -2271,7 +2271,7 @@ void main() {
|
||||
if (iron.Scene.active.world.probe.radianceMipmaps.length > 0) {
|
||||
ui.image(iron.Scene.active.world.probe.radianceMipmaps[0]);
|
||||
}
|
||||
var p = iron.Scene.active.world.getGlobalProbe();
|
||||
var p = iron.Scene.active.world.probe;
|
||||
ui.row([1/2, 1/2]);
|
||||
var envType = ui.combo(Id.handle({position: 0}), ["Default"], "Envmap");
|
||||
var envHandle = Id.handle({value: p.raw.strength});
|
||||
@@ -3325,51 +3325,51 @@ void main() {
|
||||
}
|
||||
|
||||
function mergeMesh() {
|
||||
var vlen = 0;
|
||||
var ilen = 0;
|
||||
for (i in 0...paintObjects.length) {
|
||||
vlen += paintObjects[i].data.raw.vertex_arrays[0].values.length;
|
||||
ilen += paintObjects[i].data.raw.index_arrays[0].values.length;
|
||||
}
|
||||
vlen = Std.int(vlen / 3);
|
||||
var va0 = new kha.arrays.Float32Array(vlen * 3);
|
||||
var va1 = new kha.arrays.Float32Array(vlen * 3);
|
||||
var va2 = new kha.arrays.Float32Array(vlen * 2);
|
||||
var ia = new kha.arrays.Uint32Array(ilen);
|
||||
// var vlen = 0;
|
||||
// var ilen = 0;
|
||||
// for (i in 0...paintObjects.length) {
|
||||
// vlen += paintObjects[i].data.raw.vertex_arrays[0].values.length;
|
||||
// ilen += paintObjects[i].data.raw.index_arrays[0].values.length;
|
||||
// }
|
||||
// vlen = Std.int(vlen / 3);
|
||||
// var va0 = new kha.arrays.Float32Array(vlen * 3);
|
||||
// var va1 = new kha.arrays.Float32Array(vlen * 3);
|
||||
// var va2 = new kha.arrays.Float32Array(vlen * 2);
|
||||
// var ia = new kha.arrays.Uint32Array(ilen);
|
||||
|
||||
var voff = 0;
|
||||
var ioff = 0;
|
||||
for (i in 0...paintObjects.length) {
|
||||
var vas = paintObjects[i].data.raw.vertex_arrays;
|
||||
var ias = paintObjects[i].data.raw.index_arrays;
|
||||
// var voff = 0;
|
||||
// var ioff = 0;
|
||||
// for (i in 0...paintObjects.length) {
|
||||
// var vas = paintObjects[i].data.raw.vertex_arrays;
|
||||
// var ias = paintObjects[i].data.raw.index_arrays;
|
||||
|
||||
for (j in 0...vas[0].values.length) va0[j + voff * 3] = vas[0].values[j];
|
||||
for (j in 0...vas[1].values.length) va1[j + voff * 3] = vas[1].values[j];
|
||||
for (j in 0...vas[2].values.length) va2[j + voff * 2] = vas[2].values[j];
|
||||
for (j in 0...ias[0].values.length) ia[j + ioff] = ias[0].values[j] + voff;
|
||||
// for (j in 0...vas[0].values.length) va0[j + voff * 3] = vas[0].values[j];
|
||||
// for (j in 0...vas[1].values.length) va1[j + voff * 3] = vas[1].values[j];
|
||||
// for (j in 0...vas[2].values.length) va2[j + voff * 2] = vas[2].values[j];
|
||||
// for (j in 0...ias[0].values.length) ia[j + ioff] = ias[0].values[j] + voff;
|
||||
|
||||
voff += Std.int(vas[0].values.length / 3);
|
||||
ioff += Std.int(ias[0].values.length);
|
||||
}
|
||||
// voff += Std.int(vas[0].values.length / 3);
|
||||
// ioff += Std.int(ias[0].values.length);
|
||||
// }
|
||||
|
||||
var raw:TMeshData = {
|
||||
name: paintObject.name,
|
||||
vertex_arrays: [
|
||||
{ values: va0, attrib: "pos" },
|
||||
{ values: va1, attrib: "nor" },
|
||||
{ values: va2, attrib: "tex" }
|
||||
],
|
||||
index_arrays: [
|
||||
{ values: ia, material: 0 }
|
||||
]
|
||||
};
|
||||
// var raw:TMeshData = {
|
||||
// name: paintObject.name,
|
||||
// vertex_arrays: [
|
||||
// { values: va0, attrib: "pos" },
|
||||
// { values: va1, attrib: "nor" },
|
||||
// { values: va2, attrib: "tex" }
|
||||
// ],
|
||||
// index_arrays: [
|
||||
// { values: ia, material: 0 }
|
||||
// ]
|
||||
// };
|
||||
|
||||
new MeshData(raw, function(md:MeshData) {
|
||||
mergedObject = new MeshObject(md, paintObject.materials);
|
||||
mergedObject.name = paintObject.name;
|
||||
mergedObject.force_context = "paint";
|
||||
paintObjects[0].addChild(mergedObject);
|
||||
});
|
||||
// new MeshData(raw, function(md:MeshData) {
|
||||
// mergedObject = new MeshObject(md, paintObject.materials);
|
||||
// mergedObject.name = paintObject.name;
|
||||
// mergedObject.force_context = "paint";
|
||||
// paintObjects[0].addChild(mergedObject);
|
||||
// });
|
||||
}
|
||||
|
||||
function resetViewport() {
|
||||
@@ -3401,7 +3401,7 @@ void main() {
|
||||
|
||||
var vertices = g.vertexBuffer.lock(); // posnortex
|
||||
var verticesDepth = g.vertexBufferMap.get("pos").lock();
|
||||
if (!g.vertexBufferMap.exists("posnor")) g.get([{name: "pos", size: 3}, {name: "nor", size: 3}]);
|
||||
if (!g.vertexBufferMap.exists("posnor")) g.get([{name: "pos", data: 'short4norm'}, {name: "nor", data: 'short2norm'}]);
|
||||
var verticesVox = g.vertexBufferMap.get("posnor").lock();
|
||||
if (axisUp == 1) { // Y
|
||||
for (i in 0...Std.int(vertices.length / g.structLength)) {
|
||||
|
||||
@@ -7,7 +7,6 @@ class RenderPathCreator {
|
||||
|
||||
public static var drawMeshes:Void->Void = RenderPathDeferred.drawMeshes;
|
||||
public static var applyConfig:Void->Void = RenderPathDeferred.applyConfig;
|
||||
public static var finalTarget:RenderTarget = null;
|
||||
|
||||
public static function get():RenderPath {
|
||||
var path = new RenderPath();
|
||||
@@ -16,4 +15,11 @@ class RenderPathCreator {
|
||||
path.commands = RenderPathDeferred.commands;
|
||||
return path;
|
||||
}
|
||||
|
||||
#if (rp_gi != "Off")
|
||||
public static var voxelFrame = 0;
|
||||
public static var voxelFreq = 6; // Revoxelizing frequency
|
||||
#end
|
||||
|
||||
public static var finalTarget:RenderTarget = null;
|
||||
}
|
||||
|
||||
@@ -26,376 +26,7 @@ class RenderPathDeferred {
|
||||
|
||||
path = _path;
|
||||
|
||||
#if (rp_shadowmap && kha_webgl)
|
||||
Inc.initEmpty();
|
||||
#end
|
||||
|
||||
#if (rp_background == "World")
|
||||
{
|
||||
path.loadShader("shader_datas/world_pass/world_pass");
|
||||
}
|
||||
#end
|
||||
|
||||
#if (rp_translucency)
|
||||
{
|
||||
Inc.initTranslucency();
|
||||
}
|
||||
#end
|
||||
|
||||
#if (rp_gi != "Off")
|
||||
{
|
||||
Inc.initGI();
|
||||
#if arm_voxelgi_temporal
|
||||
{
|
||||
Inc.initGI("voxelsB");
|
||||
}
|
||||
#end
|
||||
#if (rp_gi == "Voxel GI")
|
||||
{
|
||||
Inc.initGI("voxelsOpac");
|
||||
Inc.initGI("voxelsNor");
|
||||
#if (rp_gi_bounces)
|
||||
Inc.initGI("voxelsBounce");
|
||||
#end
|
||||
}
|
||||
#end
|
||||
#if (rp_gi == "Voxel AO")
|
||||
path.loadShader("shader_datas/deferred_light/deferred_light_VoxelAOvar");
|
||||
#end
|
||||
}
|
||||
#end
|
||||
|
||||
{
|
||||
path.createDepthBuffer("main", "DEPTH24");
|
||||
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "gbuffer0";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = "RGBA64";
|
||||
t.scale = Inc.getSuperSampling();
|
||||
t.depth_buffer = "main";
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "tex";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = Inc.getHdrFormat();
|
||||
t.scale = Inc.getSuperSampling();
|
||||
t.depth_buffer = "main";
|
||||
#if rp_autoexposure
|
||||
t.mipmaps = true;
|
||||
#end
|
||||
path.createRenderTarget(t);
|
||||
#if rp_autoexposure
|
||||
// Texture lod is fetched manually, prevent mipmap filtering
|
||||
t.mipmaps = false;
|
||||
#end
|
||||
}
|
||||
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "buf";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = Inc.getHdrFormat();
|
||||
t.scale = Inc.getSuperSampling();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "gbuffer1";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = "RGBA64";
|
||||
t.scale = Inc.getSuperSampling();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
|
||||
#if rp_gbuffer2
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "gbuffer2";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = "RGBA64";
|
||||
t.scale = Inc.getSuperSampling();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "taa";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = "RGBA32";
|
||||
t.scale = Inc.getSuperSampling();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
#end
|
||||
|
||||
path.loadShader("shader_datas/deferred_light/deferred_light");
|
||||
|
||||
#if rp_probes
|
||||
path.loadShader("shader_datas/probe_planar/probe_planar");
|
||||
path.loadShader("shader_datas/probe_cubemap/probe_cubemap");
|
||||
path.loadShader("shader_datas/copy_pass/copy_pass");
|
||||
#end
|
||||
|
||||
#if ((rp_ssgi == "RTGI") || (rp_ssgi == "RTAO"))
|
||||
{
|
||||
path.loadShader("shader_datas/ssgi_pass/ssgi_pass");
|
||||
path.loadShader("shader_datas/ssgi_blur_pass/ssgi_blur_pass_x");
|
||||
path.loadShader("shader_datas/ssgi_blur_pass/ssgi_blur_pass_y");
|
||||
}
|
||||
#elseif (rp_ssgi == "SSAO")
|
||||
{
|
||||
path.loadShader("shader_datas/ssao_pass/ssao_pass");
|
||||
path.loadShader("shader_datas/blur_edge_pass/blur_edge_pass_x");
|
||||
path.loadShader("shader_datas/blur_edge_pass/blur_edge_pass_y");
|
||||
}
|
||||
#end
|
||||
|
||||
#if ((rp_ssgi != "Off") || (rp_antialiasing == "SMAA") || (rp_antialiasing == "TAA"))
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "bufa";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = "RGBA32";
|
||||
t.scale = Inc.getSuperSampling();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "bufb";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = "RGBA32";
|
||||
t.scale = Inc.getSuperSampling();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
#end
|
||||
|
||||
// #if rp_rendercapture
|
||||
// {
|
||||
// var t = new RenderTargetRaw();
|
||||
// t.name = "capture";
|
||||
// t.width = 0;
|
||||
// t.height = 0;
|
||||
// t.format = Inc.getRenderCaptureFormat();
|
||||
// path.createRenderTarget(t);
|
||||
// }
|
||||
// #end
|
||||
|
||||
#if rp_compositornodes
|
||||
{
|
||||
path.loadShader("shader_datas/compositor_pass/compositor_pass");
|
||||
}
|
||||
#end
|
||||
|
||||
#if ((!rp_compositornodes) || (rp_antialiasing == "TAA") || (rp_rendercapture) || (rp_motionblur == "Camera") || (rp_motionblur == "Object"))
|
||||
{
|
||||
path.loadShader("shader_datas/copy_pass/copy_pass");
|
||||
}
|
||||
#end
|
||||
|
||||
#if ((rp_antialiasing == "SMAA") || (rp_antialiasing == "TAA"))
|
||||
{
|
||||
path.loadShader("shader_datas/smaa_edge_detect/smaa_edge_detect");
|
||||
path.loadShader("shader_datas/smaa_blend_weight/smaa_blend_weight");
|
||||
path.loadShader("shader_datas/smaa_neighborhood_blend/smaa_neighborhood_blend");
|
||||
|
||||
#if (rp_antialiasing == "TAA")
|
||||
{
|
||||
path.loadShader("shader_datas/taa_pass/taa_pass");
|
||||
}
|
||||
#end
|
||||
}
|
||||
#end
|
||||
|
||||
#if (rp_supersampling == 4)
|
||||
{
|
||||
path.loadShader("shader_datas/supersample_resolve/supersample_resolve");
|
||||
}
|
||||
#end
|
||||
|
||||
#if rp_volumetriclight
|
||||
{
|
||||
path.loadShader("shader_datas/volumetric_light_quad/volumetric_light_quad");
|
||||
path.loadShader("shader_datas/volumetric_light/volumetric_light");
|
||||
path.loadShader("shader_datas/blur_bilat_pass/blur_bilat_pass_x");
|
||||
path.loadShader("shader_datas/blur_bilat_blend_pass/blur_bilat_blend_pass_y");
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "bufvola";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = "R8";
|
||||
t.scale = Inc.getSuperSampling();
|
||||
// t.scale = 0.5;
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "bufvolb";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.displayp = Inc.getDisplayp();
|
||||
t.format = "R8";
|
||||
t.scale = Inc.getSuperSampling();
|
||||
// t.scale = 0.5;
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
}
|
||||
#end
|
||||
|
||||
#if rp_ocean
|
||||
{
|
||||
path.loadShader("shader_datas/water_pass/water_pass");
|
||||
}
|
||||
#end
|
||||
|
||||
#if rp_bloom
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "bloomtex";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.scale = 0.25;
|
||||
t.format = Inc.getHdrFormat();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "bloomtex2";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.scale = 0.25;
|
||||
t.format = Inc.getHdrFormat();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
|
||||
{
|
||||
path.loadShader("shader_datas/bloom_pass/bloom_pass");
|
||||
path.loadShader("shader_datas/blur_gaus_pass/blur_gaus_pass_x");
|
||||
path.loadShader("shader_datas/blur_gaus_pass/blur_gaus_pass_y");
|
||||
path.loadShader("shader_datas/blur_gaus_pass/blur_gaus_pass_y_blend");
|
||||
}
|
||||
#end
|
||||
|
||||
#if rp_sss
|
||||
{
|
||||
path.loadShader("shader_datas/sss_pass/sss_pass_x");
|
||||
path.loadShader("shader_datas/sss_pass/sss_pass_y");
|
||||
}
|
||||
#end
|
||||
|
||||
#if rp_ssr
|
||||
{
|
||||
path.loadShader("shader_datas/ssr_pass/ssr_pass");
|
||||
path.loadShader("shader_datas/blur_adaptive_pass/blur_adaptive_pass_x");
|
||||
path.loadShader("shader_datas/blur_adaptive_pass/blur_adaptive_pass_y3_blend");
|
||||
|
||||
#if rp_ssr_half
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "ssra";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.scale = 0.5;
|
||||
t.format = Inc.getHdrFormat();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "ssrb";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.scale = 0.5;
|
||||
t.format = Inc.getHdrFormat();
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
#end
|
||||
}
|
||||
#end
|
||||
|
||||
#if ((rp_motionblur == "Camera") || (rp_motionblur == "Object"))
|
||||
{
|
||||
#if (rp_motionblur == "Camera")
|
||||
{
|
||||
path.loadShader("shader_datas/motion_blur_pass/motion_blur_pass");
|
||||
}
|
||||
#else
|
||||
{
|
||||
path.loadShader("shader_datas/motion_blur_veloc_pass/motion_blur_veloc_pass");
|
||||
}
|
||||
#end
|
||||
}
|
||||
#end
|
||||
|
||||
#if rp_soft_shadows
|
||||
{
|
||||
path.loadShader("shader_datas/dilate_pass/dilate_pass_x");
|
||||
path.loadShader("shader_datas/dilate_pass/dilate_pass_y");
|
||||
path.loadShader("shader_datas/visibility_pass/visibility_pass");
|
||||
path.loadShader("shader_datas/blur_shadow_pass/blur_shadow_pass_x");
|
||||
path.loadShader("shader_datas/blur_shadow_pass/blur_shadow_pass_y");
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "visa";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.format = 'R16';
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "visb";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.format = 'R16';
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "dist";
|
||||
t.width = 0;
|
||||
t.height = 0;
|
||||
t.format = 'R16';
|
||||
path.createRenderTarget(t);
|
||||
}
|
||||
}
|
||||
#end
|
||||
|
||||
#if arm_config
|
||||
{
|
||||
var t = new RenderTargetRaw();
|
||||
t.name = "empty_white";
|
||||
t.width = 1;
|
||||
t.height = 1;
|
||||
t.format = 'R8';
|
||||
var rt = new RenderTarget(t);
|
||||
var b = haxe.io.Bytes.alloc(1);
|
||||
b.set(0, 255);
|
||||
rt.image = kha.Image.fromBytes(b, t.width, t.height, kha.graphics4.TextureFormat.L8);
|
||||
path.renderTargets.set(t.name, rt);
|
||||
}
|
||||
#end
|
||||
armory.renderpath.RenderPathDeferred.init(path);
|
||||
|
||||
// Paint
|
||||
{
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user