edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Preview rendering fixes

Browse Source
This commit is contained in:
luboslenco
2025-08-14 11:07:17 +02:00
parent c3cf9353d3
commit 3a0807810c
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/sources/ts/render_path_preview.ts
+8 -23
View File
@@ -59,22 +59,11 @@ function render_path_preview_init() {
t.scale = render_path_base_get_super_sampling(); t.scale = render_path_base_get_super_sampling();
render_path_create_render_target(t); render_path_create_render_target(t);
} }
{
let t: render_target_t = render_target_create();
t.name = "mgbuffer2";
t.width = size;
t.height = size;
t.format = "RGBA64";
t.scale = render_path_base_get_super_sampling();
render_path_create_render_target(t);
}
} }
function render_path_preview_commands_preview() { function render_path_preview_commands_preview() {
render_path_set_target("mgbuffer2", null, null, clear_flag_t.COLOR, 0xff000000);
render_path_set_target("mgbuffer0", null, "mmain", clear_flag_t.COLOR | clear_flag_t.DEPTH, 0xffffffff, 1.0); render_path_set_target("mgbuffer0", null, "mmain", clear_flag_t.COLOR | clear_flag_t.DEPTH, 0xffffffff, 1.0);
let additional: string[] = ["mgbuffer1", "mgbuffer2"]; let additional: string[] = ["mgbuffer1"];
render_path_set_target("mgbuffer0", additional, "mmain"); render_path_set_target("mgbuffer0", additional, "mmain");
render_path_draw_meshes("mesh"); render_path_draw_meshes("mesh");
@@ -83,9 +72,7 @@ function render_path_preview_commands_preview() {
render_path_bind_target("mmain", "gbufferD"); render_path_bind_target("mmain", "gbufferD");
render_path_bind_target("mgbuffer0", "gbuffer0"); render_path_bind_target("mgbuffer0", "gbuffer0");
render_path_bind_target("mgbuffer1", "gbuffer1"); render_path_bind_target("mgbuffer1", "gbuffer1");
{ render_path_bind_target("empty_white", "ssaotex");
render_path_bind_target("empty_white", "ssaotex");
}
render_path_draw_shader("shader_datas/deferred_light/deferred_light"); render_path_draw_shader("shader_datas/deferred_light/deferred_light");
render_path_set_target("mtex", null, "mmain"); render_path_set_target("mtex", null, "mmain");
@@ -108,23 +95,21 @@ function render_path_preview_commands_preview() {
} }
function render_path_preview_commands_decal() { function render_path_preview_commands_decal() {
render_path_set_target("gbuffer2", null, null, clear_flag_t.COLOR, 0xff000000);
render_path_set_target("gbuffer0", null, "main", clear_flag_t.COLOR | clear_flag_t.DEPTH, 0xffffffff, 1.0); render_path_set_target("gbuffer0", null, "main", clear_flag_t.COLOR | clear_flag_t.DEPTH, 0xffffffff, 1.0);
let additional: string[] = ["gbuffer1", "gbuffer2"]; let additional: string[] = ["gbuffer1"];
render_path_set_target("gbuffer0", additional, "main"); render_path_set_target("gbuffer0", additional, "main");
render_path_draw_meshes("mesh"); render_path_draw_meshes("mesh");
// Deferred light // Deferred light
render_path_set_target("buf"); let output: string = "gbuffer2";
render_path_set_target(output);
render_path_bind_target("main", "gbufferD"); render_path_bind_target("main", "gbufferD");
render_path_bind_target("gbuffer0", "gbuffer0"); render_path_bind_target("gbuffer0", "gbuffer0");
render_path_bind_target("gbuffer1", "gbuffer1"); render_path_bind_target("gbuffer1", "gbuffer1");
{ render_path_bind_target("empty_white", "ssaotex");
render_path_bind_target("empty_white", "ssaotex");
}
render_path_draw_shader("shader_datas/deferred_light/deferred_light"); render_path_draw_shader("shader_datas/deferred_light/deferred_light");
render_path_set_target("buf", null, "main"); render_path_set_target(output, null, "main");
render_path_draw_skydome("shader_datas/world_pass/world_pass"); render_path_draw_skydome("shader_datas/world_pass/world_pass");
let framebuffer: string = "texpreview"; let framebuffer: string = "texpreview";
@@ -133,6 +118,6 @@ function render_path_preview_commands_decal() {
render_path_set_target(framebuffer); render_path_set_target(framebuffer);
render_path_bind_target("buf", "tex"); render_path_bind_target(output, "tex");
render_path_draw_shader("shader_datas/compositor_pass/compositor_pass"); render_path_draw_shader("shader_datas/compositor_pass/compositor_pass");
} }
paint/sources/make_mesh_preview.ts
+1 -2
View File
@@ -22,7 +22,7 @@ function make_mesh_preview_run(data: material_t, matcon: material_context_t): no
data: "short2norm" data: "short2norm"
} }
], ],
color_attachments: ["RGBA64", "RGBA64", "RGBA64"], color_attachments: ["RGBA64", "RGBA64"],
depth_attachment: "D32" depth_attachment: "D32"
}; };
let con_mesh: node_shader_context_t = node_shader_context_create(data, props); let con_mesh: node_shader_context_t = node_shader_context_create(data, props);
@@ -118,7 +118,6 @@ function make_mesh_preview_run(data: material_t, matcon: material_context_t): no
node_shader_write_frag(kong, "output[0] = float4(n.x, n.y, lerp(1.0, roughness, opacity), pack_f32_i16(lerp(1.0, metallic, opacity), uint(0)));"); // metallic/matid node_shader_write_frag(kong, "output[0] = float4(n.x, n.y, lerp(1.0, roughness, opacity), pack_f32_i16(lerp(1.0, metallic, opacity), uint(0)));"); // metallic/matid
node_shader_write_frag(kong, "output[1] = float4(lerp3(float3(0.0, 0.0, 0.0), basecol, opacity), occlusion);"); node_shader_write_frag(kong, "output[1] = float4(lerp3(float3(0.0, 0.0, 0.0), basecol, opacity), occlusion);");
} }
node_shader_write_frag(kong, "output[2] = float4(0.0, 0.0, 0.0, 0.0);");
parser_material_finalize(con_mesh); parser_material_finalize(con_mesh);