From 61826b8099b5b2a0604d79007b2cbf4ae6d303c7 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Tue, 23 Sep 2025 16:57:33 +0200 Subject: [PATCH] Merge shader_datas.arm into Scene.arm --- paint/assets/Scene.arm | Bin 149755 -> 167727 bytes paint/assets/shader_datas.arm | Bin 18163 -> 0 bytes paint/sources/history.ts | 6 +-- paint/sources/render_path_base.ts | 42 ++++++++++----------- paint/sources/render_path_deferred.ts | 22 +++++------ paint/sources/render_path_forward.ts | 4 +- paint/sources/render_path_paint.ts | 34 ++++++++--------- paint/sources/render_path_preview.ts | 14 +++---- paint/sources/render_path_raytrace.ts | 4 +- paint/sources/render_path_raytrace_bake.ts | 2 +- paint/sources/util_render.ts | 2 +- 11 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 paint/assets/shader_datas.arm diff --git a/paint/assets/Scene.arm b/paint/assets/Scene.arm index 05f9b8c50afc57beedffaca3051504536a3822be..b817733b5d2d0aa001b34bde869229f752d85598 100644 GIT binary patch delta 8327 zcmeHMOK%)S5MDQV$95hLCN_CNB1DJ@@viewV#hXd6mj4{khtV9jCb4i#IrNY%&Z?d zFdX;;oaPn@!4>6#lp8YtAQHz_lz#x1+=vvaY92k^)3duKj^L1+U0q#M^>w}X?;rL* zdU)Ww?+1QmKV2U<{P^eVY+@+dnq!AX4pl0Zy4!5Iz7@Eh(K3BM`h9`Dr#+as$)@-2 zf*X$OM3-)}V4g=ZS1ucR07ePl|Hhxu#{9%g^?%|)9#4N|4-K@I??f$GJqiiLsy z6pc|V>Sgh+d-!?2Q7y#;^{czBO#-EZc+_17k@cUV_dG*S6$nb)Q30?a^p{Lpgor65 zfb7qKt?0K|c0qXaN#V_%_zR97m=34_;wsVC3+#hWik8Zn9ZbG__gehC|4uiGv)y|T z>ATmquVt;5mT}r>ZQi}}>HL+cSJpI_5&FPzs+V>coA`RD-DGtKfIPStfsCbXAI-3+ zuN==KAl+}bxaXVAmdy>1`>wslWiO_vk$t7?9{Ny&w}KU8-LnE7P2Xe_Qr>>&xc-ae z>7|EhniyiWs)9m3k7K&Hg%0A^J3>Kj=~ITdlBF|2N)0SY8MV^H zM!6L=7P%Ek@Z8ZibL`|kdRYAL+ZlG6NV^8%9RGcn($iP9=-~`I5n`EuGS1hHrWttF zMop==loz3tdr*%i=q0OB|$kHGrCkT9-McZ|o znqEj#Mc&TX8}7Q3lpq=e3W;QFyp$Kw?Q)!gT#`XQnt>K`2Wp0rG_dEcw>_950;6fQ z44bcUTci$jNXrS52p&s^i5R=wJ*q@ki|#8sCI)4EwcYB9B9$2(XI6uBhk)S4VQMR> zuQp)zh@Q-|(J7fm^N?w`R+9eP@ZGjo=bhLopm#SOaL;Kah4J$KY6qVc@+^i^{*odSlYPR}&(Mlcr9u;a zaxz|YGC8)h!KCR0HBEfuePz}uUMZ<4H1K3{MMY8Q;D|4d*QyuIWsfv9ZQB9svsF_%#>9Ynf@4% zIzJHoG0R59jQC$8GS?>}SQRpJlF{eYA&CHz=Vx=%RHx+c|Ct{xm7*s5DotLNZNl;j zE2!M?X<}31F9hcCgAE}KBl46)05pqRhijGaa>vF#Lu5LkQpVnqa49LVk>dqP&^6OJP2Cub$+6RJ;ur){b0q+E6+;m8(A4l2Z)h}3)mQg1 zp;8I-3mHWqmKDIvfKGe0U~djMvN!oM@+xAmD-Hb>%k$!fk$$B};Lo9!HxhWEESgT8 zU(yI8S#fXKudI-SO_m9Z+t7Z6k*sQ&tQZ(Y7EVp{GnU>;b+v|&k(Dt%im>jorgVyh z2><26Bld*K+Lao7Uoms%#-c02)YVbePdu|p+cZz^ZovBZsu-V7iY>M|#= z&$DE$Hnyr^hlr@T<(0GHP`gsf?R3y09!B~2rfPY@T4zxm)ol;z#unLDHyBhvht1PQ zHN&|fTGBpnfmsKbw*eOhoPd26L^j*|e75vJ8*`oG#ikwx+b|^2TB0zxZL)(x_iA6K z2R(@sKKft5fZBcupn`|`Q?#d5=A$juX?L(3AhzUjPLmiRSy1{paBt#DT z^=N6q*JP8-o*6Wqo*fNSC#t$DI3dyooak}94c5sHBEBQxi}_6HLQZF?qM)+K(}l8Q zcJ|@yvoSPpm^1Pxzm#D|D>UJtTrSSFH1YfS*}l-}2`F#~77W}XFrnajLr5`stfP86qRp%6Dr*>|5jsPDT^AYy2vtjJ-32k^I|cX>o_ zEZzu*3eR(Y2hnRl?{aYT+7O4@jMALyy8YrcYm5!{9~$yFzs~9?nr9AUuYU=x7dG4B zDF=IsT$;{CAUnO%xV$IRJ9uEX<32ZkQ~Y}67QKZ%pr-Lv}FsM0}t&^mf)@L z^5Uaut<;ny_Wy*n*+Vl5t>UYcF_>)p!6;CPKOA@01gFiR=SJ@}L7R78Ie5jf*1%}^ z`mG0v!RAB{?E#~fdK1^EwSOKWY7voGs2#XY?1ADDwxO0|fJA4?a7eTl+Kfbp_K3tiAQ7>E0ko*nzp07aHPRil`ZgwD8B~FSxCIZS_c@Nek|^#>d-oz z;MLSuv-uQdKVsU6eITk;^n-O2{TU8h2)J&VdZh*{habWz+A%?ejjLWb)!8<_+j?Qp zI&6^OD<+B7CgaP|U4P5Ew@9=U4azK1_d~o)a(E|Rry*V@kGvDFvk)({Ej#gY`{bJa zGJx8N*F{LK2fYW_fvbP-AB1>4+@04$Pmm3`4%WNZ=>iPb5xB@#tJO%yW4T@E$TUIl(zG5b*-rDs}2K1{4RsG7QzK-m&5%nShRQPWpTO%i?*KPWpTCz zi;h*meY!Vtz6Fa8E`2O692R&|=(yaJn?b(kI@f9J$xeFQ5{Dc(HRoUGix#kEsiF^N z@Egm`_bm9oG>@*Xlfw5=3siVpvBDmSLwEE>TyLbpf%%v!px7xy?UVy-zG%T=qa8GX z-2X)j7oecba?J{EfBWLxJnZJ%7oO-8u=w}y&E5-F`HQP%oKNZVD89yRC_!y+Ac0`S zY_h=IJl&tMRqp`K9y7JIY0$7*k+~VvKo+vl2WfzDGr(V;!6L;>$*c9JX3Pg^)O4ic JnBoF6>wjdPa_|5E diff --git a/paint/sources/history.ts b/paint/sources/history.ts index b0da5b7b..b03a6f97 100644 --- a/paint/sources/history.ts +++ b/paint/sources/history.ts @@ -665,8 +665,8 @@ function history_copy_to_undo(from_id: i32, to_id: i32, is_mask: bool) { if (is_mask) { render_path_set_target("texpaint_undo" + to_id); render_path_bind_target("texpaint" + from_id, "tex"); - // render_path_draw_shader("shader_datas/copy_pass/copyR8_pass"); - render_path_draw_shader("shader_datas/copy_pass/copy_pass"); + // render_path_draw_shader("Scene/copy_pass/copyR8_pass"); + render_path_draw_shader("Scene/copy_pass/copy_pass"); } else { let additional: string[] = ["texpaint_nor_undo" + to_id, "texpaint_pack_undo" + to_id]; @@ -684,7 +684,7 @@ function history_copy_to_undo(from_id: i32, to_id: i32, is_mask: bool) { format == tex_format_t.RGBA64 ? "copy_mrt3RGBA64_pass" : "copy_mrt3RGBA128_pass"; - render_path_draw_shader("shader_datas/copy_mrt3_pass/" + pipe); + render_path_draw_shader("Scene/copy_mrt3_pass/" + pipe); } history_undo_i = (history_undo_i + 1) % config_raw.undo_steps; } diff --git a/paint/sources/render_path_base.ts b/paint/sources/render_path_base.ts index 7686c21d..5f40d5e3 100644 --- a/paint/sources/render_path_base.ts +++ b/paint/sources/render_path_base.ts @@ -119,10 +119,10 @@ function render_path_base_is_cached(): bool { render_path_set_target(""); render_path_bind_target("last", "tex"); if (render_path_base_ssaa4()) { - render_path_draw_shader("shader_datas/supersample_resolve/supersample_resolveRGBA64"); + render_path_draw_shader("Scene/supersample_resolve/supersample_resolveRGBA64"); } else { - render_path_draw_shader("shader_datas/copy_pass/copy_pass"); + render_path_draw_shader("Scene/copy_pass/copy_pass"); } render_path_paint_commands_cursor(); context_raw.ddirty--; @@ -180,8 +180,8 @@ function render_path_base_draw_bloom(source: string, target: string) { array_push(render_path_base_bloom_mipmaps, render_path_create_render_target(t)); } - render_path_load_shader("shader_datas/bloom_pass/bloom_downsample_pass"); - render_path_load_shader("shader_datas/bloom_pass/bloom_upsample_pass"); + render_path_load_shader("Scene/bloom_pass/bloom_downsample_pass"); + render_path_load_shader("Scene/bloom_pass/bloom_upsample_pass"); } let bloom_radius: f32 = 6.5; @@ -194,14 +194,14 @@ function render_path_base_draw_bloom(source: string, target: string) { render_path_base_bloom_current_mip = i; render_path_set_target(render_path_base_bloom_mipmaps[i].name, null, null, clear_flag_t.COLOR, 0x00000000); render_path_bind_target(i == 0 ? source : render_path_base_bloom_mipmaps[i - 1].name, "tex"); - render_path_draw_shader("shader_datas/bloom_pass/bloom_downsample_pass"); + render_path_draw_shader("Scene/bloom_pass/bloom_downsample_pass"); } for (let i: i32 = 0; i < num_mips; ++i) { let mip_level: i32 = num_mips - 1 - i; render_path_base_bloom_current_mip = mip_level; render_path_set_target(mip_level == 0 ? target : render_path_base_bloom_mipmaps[mip_level - 1].name); render_path_bind_target(render_path_base_bloom_mipmaps[mip_level].name, "tex"); - render_path_draw_shader("shader_datas/bloom_pass/bloom_upsample_pass"); + render_path_draw_shader("Scene/bloom_pass/bloom_upsample_pass"); } } @@ -254,9 +254,9 @@ function render_path_base_init_ssao() { t.scale = scale * render_path_base_get_super_sampling(); render_path_create_render_target(t); } - render_path_load_shader("shader_datas/ssao_pass/ssao_pass"); - render_path_load_shader("shader_datas/ssao_blur_pass/ssao_blur_pass_x"); - render_path_load_shader("shader_datas/ssao_blur_pass/ssao_blur_pass_y"); + render_path_load_shader("Scene/ssao_pass/ssao_pass"); + render_path_load_shader("Scene/ssao_blur_pass/ssao_blur_pass_x"); + render_path_load_shader("Scene/ssao_blur_pass/ssao_blur_pass_y"); } function render_path_base_draw_ssao() { @@ -269,17 +269,17 @@ function render_path_base_draw_ssao() { render_path_set_target("singlea"); render_path_bind_target("main", "gbufferD"); render_path_bind_target("gbuffer0", "gbuffer0"); - render_path_draw_shader("shader_datas/ssao_pass/ssao_pass"); + render_path_draw_shader("Scene/ssao_pass/ssao_pass"); render_path_set_target("singleb"); render_path_bind_target("singlea", "tex"); render_path_bind_target("gbuffer0", "gbuffer0"); - render_path_draw_shader("shader_datas/ssao_blur_pass/ssao_blur_pass_x"); + render_path_draw_shader("Scene/ssao_blur_pass/ssao_blur_pass_x"); render_path_set_target("singlea"); render_path_bind_target("singleb", "tex"); render_path_bind_target("gbuffer0", "gbuffer0"); - render_path_draw_shader("shader_datas/ssao_blur_pass/ssao_blur_pass_y"); + render_path_draw_shader("Scene/ssao_blur_pass/ssao_blur_pass_y"); } } @@ -296,10 +296,10 @@ function render_path_base_draw_deferred_light() { render_path_bind_target("empty_white", "ssaotex"); } - render_path_draw_shader("shader_datas/deferred_light/deferred_light"); + render_path_draw_shader("Scene/deferred_light/deferred_light"); render_path_set_target("buf", null, "main"); - render_path_draw_skydome("shader_datas/world_pass/world_pass"); + render_path_draw_skydome("Scene/world_pass/world_pass"); } // function render_path_base_draw_histogram() { @@ -310,11 +310,11 @@ function render_path_base_draw_deferred_light() { // t.height = 1; // t.format = "RGBA64"; // render_path_create_render_target(t); -// render_path_load_shader("shader_datas/histogram_pass/histogram_pass"); +// render_path_load_shader("Scene/histogram_pass/histogram_pass"); // } // render_path_set_target("histogram"); // render_path_bind_target("last", "tex"); -// render_path_draw_shader("shader_datas/histogram_pass/histogram_pass"); +// render_path_draw_shader("Scene/histogram_pass/histogram_pass"); // } function render_path_base_draw_taa(bufa: string, bufb: string) { @@ -323,21 +323,21 @@ function render_path_base_draw_taa(bufa: string, bufb: string) { let skip_taa: bool = context_raw.split_view; if (skip_taa) { - render_path_draw_shader("shader_datas/copy_pass/copyRGBA64_pass"); + render_path_draw_shader("Scene/copy_pass/copyRGBA64_pass"); } else { render_path_bind_target("last", "tex2"); - render_path_draw_shader("shader_datas/taa_pass/taa_pass"); + render_path_draw_shader("Scene/taa_pass/taa_pass"); } render_path_set_target(""); render_path_bind_target(bufb, "tex"); if (render_path_base_ssaa4()) { - render_path_draw_shader("shader_datas/supersample_resolve/supersample_resolveRGBA64"); + render_path_draw_shader("Scene/supersample_resolve/supersample_resolveRGBA64"); } else { - render_path_draw_shader("shader_datas/copy_pass/copy_pass"); + render_path_draw_shader("Scene/copy_pass/copy_pass"); } // Swap buf and last targets @@ -431,5 +431,5 @@ function render_path_base_copy_to_gbuffer() { render_path_bind_target("gbuffer0_copy", "tex0"); render_path_bind_target("gbuffer1_copy", "tex1"); render_path_bind_target("gbuffer2_copy", "tex2"); - render_path_draw_shader("shader_datas/copy_mrt3_pass/copy_mrt3RGBA64_pass"); + render_path_draw_shader("Scene/copy_mrt3_pass/copy_mrt3RGBA64_pass"); } diff --git a/paint/sources/render_path_deferred.ts b/paint/sources/render_path_deferred.ts index e299c065..a6065c25 100644 --- a/paint/sources/render_path_deferred.ts +++ b/paint/sources/render_path_deferred.ts @@ -85,16 +85,16 @@ function render_path_deferred_init() { render_path_base_init_ssao(); } - render_path_load_shader("shader_datas/world_pass/world_pass"); - render_path_load_shader("shader_datas/deferred_light/deferred_light"); - render_path_load_shader("shader_datas/compositor_pass/compositor_pass"); - render_path_load_shader("shader_datas/copy_pass/copy_pass"); - render_path_load_shader("shader_datas/copy_pass/copyR8_pass"); - render_path_load_shader("shader_datas/copy_pass/copyRGBA64_pass"); - render_path_load_shader("shader_datas/copy_pass/copyRGBA128_pass"); - render_path_load_shader("shader_datas/taa_pass/taa_pass"); - render_path_load_shader("shader_datas/supersample_resolve/supersample_resolve"); - render_path_load_shader("shader_datas/supersample_resolve/supersample_resolveRGBA64"); + render_path_load_shader("Scene/world_pass/world_pass"); + render_path_load_shader("Scene/deferred_light/deferred_light"); + render_path_load_shader("Scene/compositor_pass/compositor_pass"); + render_path_load_shader("Scene/copy_pass/copy_pass"); + render_path_load_shader("Scene/copy_pass/copyR8_pass"); + render_path_load_shader("Scene/copy_pass/copyRGBA64_pass"); + render_path_load_shader("Scene/copy_pass/copyRGBA128_pass"); + render_path_load_shader("Scene/taa_pass/taa_pass"); + render_path_load_shader("Scene/supersample_resolve/supersample_resolve"); + render_path_load_shader("Scene/supersample_resolve/supersample_resolveRGBA64"); render_path_paint_init(); render_path_preview_init(); @@ -115,7 +115,7 @@ function render_path_deferred_draw_deferred() { render_path_set_target("gbuffer1"); render_path_bind_target("buf", "tex"); // render_path_bind_target("histogram", "histogram"); - render_path_draw_shader("shader_datas/compositor_pass/compositor_pass"); + render_path_draw_shader("Scene/compositor_pass/compositor_pass"); render_path_set_target("gbuffer1"); render_path_base_draw_compass(); diff --git a/paint/sources/render_path_forward.ts b/paint/sources/render_path_forward.ts index a25222aa..ea98ffe3 100644 --- a/paint/sources/render_path_forward.ts +++ b/paint/sources/render_path_forward.ts @@ -9,11 +9,11 @@ function render_path_forward_commands() { function render_path_forward_draw_forward() { render_path_set_target("gbuffer1", null, "main"); - render_path_draw_skydome("shader_datas/world_pass/world_pass"); + render_path_draw_skydome("Scene/world_pass/world_pass"); render_path_set_target("buf"); render_path_bind_target("gbuffer1", "tex"); - render_path_draw_shader("shader_datas/compositor_pass/compositor_pass"); + render_path_draw_shader("Scene/compositor_pass/compositor_pass"); render_path_set_target("buf"); render_path_base_draw_compass(); diff --git a/paint/sources/render_path_paint.ts b/paint/sources/render_path_paint.ts index 5f06e33c..05b79d9c 100644 --- a/paint/sources/render_path_paint.ts +++ b/paint/sources/render_path_paint.ts @@ -94,12 +94,12 @@ function render_path_paint_init() { render_path_create_render_target(t); } - render_path_load_shader("shader_datas/copy_mrt3_pass/copy_mrt3_pass"); - render_path_load_shader("shader_datas/copy_mrt3_pass/copy_mrt3RGBA64_pass"); - render_path_load_shader("shader_datas/copy_mrt3_pass/copy_mrt3RGBA128_pass"); - render_path_load_shader("shader_datas/dilate_pass/dilate_pass"); - render_path_load_shader("shader_datas/dilate_pass/dilateRGBA64_pass"); - render_path_load_shader("shader_datas/dilate_pass/dilateRGBA128_pass"); + render_path_load_shader("Scene/copy_mrt3_pass/copy_mrt3_pass"); + render_path_load_shader("Scene/copy_mrt3_pass/copy_mrt3RGBA64_pass"); + render_path_load_shader("Scene/copy_mrt3_pass/copy_mrt3RGBA128_pass"); + render_path_load_shader("Scene/dilate_pass/dilate_pass"); + render_path_load_shader("Scene/dilate_pass/dilateRGBA64_pass"); + render_path_load_shader("Scene/dilate_pass/dilateRGBA128_pass"); } function render_path_paint_draw_fullscreen_triangle(context: string) { @@ -233,7 +233,7 @@ function render_path_paint_commands_paint(dilation: bool = true) { render_path_set_target("texpaint_blend1"); render_path_bind_target("texpaint_blend0", "tex"); - render_path_draw_shader("shader_datas/copy_pass/copyR8_pass"); + render_path_draw_shader("Scene/copy_pass/copyR8_pass"); let is_mask: bool = slot_layer_is_mask(context_raw.layer); if (is_mask) { let ptid: i32 = context_raw.layer.parent.id; @@ -284,10 +284,10 @@ function render_path_paint_commands_paint(dilation: bool = true) { for (let i: i32 = 0; i < blurs; ++i) { render_path_set_target("texpaint_blur"); render_path_bind_target(texpaint, "tex"); - render_path_draw_shader("shader_datas/copy_pass/copy_pass"); + render_path_draw_shader("Scene/copy_pass/copy_pass"); render_path_set_target(texpaint); render_path_bind_target("texpaint_blur", "tex"); - render_path_draw_shader("shader_datas/copy_pass/copy_pass"); + render_path_draw_shader("Scene/copy_pass/copy_pass"); } } @@ -354,7 +354,7 @@ function render_path_paint_commands_live_brush() { if (slot_layer_is_mask(context_raw.layer)) { render_path_set_target("texpaint_live"); render_path_bind_target("texpaint" + tid, "tex"); - render_path_draw_shader("shader_datas/copy_pass/copy_pass"); + render_path_draw_shader("Scene/copy_pass/copy_pass"); } else { let additional: string[] = ["texpaint_nor_live", "texpaint_pack_live"]; @@ -362,7 +362,7 @@ function render_path_paint_commands_live_brush() { render_path_bind_target("texpaint" + tid, "tex0"); render_path_bind_target("texpaint_nor" + tid, "tex1"); render_path_bind_target("texpaint_pack" + tid, "tex2"); - render_path_draw_shader("shader_datas/copy_mrt3_pass/copy_mrt3_pass"); + render_path_draw_shader("Scene/copy_mrt3_pass/copy_mrt3_pass"); } render_path_paint_use_live_layer(true); @@ -829,25 +829,25 @@ function render_path_paint_dilate(base: bool, nor_pack: bool) { let texpaint: string = "texpaint"; render_path_set_target("temptex0"); render_path_bind_target(texpaint + tid, "tex"); - render_path_draw_shader("shader_datas/copy_pass/" + copy_pass); + render_path_draw_shader("Scene/copy_pass/" + copy_pass); render_path_set_target(texpaint + tid); render_path_bind_target("temptex0", "tex"); - render_path_draw_shader("shader_datas/dilate_pass/" + dilate_pass); + render_path_draw_shader("Scene/dilate_pass/" + dilate_pass); } if (nor_pack && !slot_layer_is_mask(context_raw.layer)) { render_path_set_target("temptex0"); render_path_bind_target("texpaint_nor" + tid, "tex"); - render_path_draw_shader("shader_datas/copy_pass/" + copy_pass); + render_path_draw_shader("Scene/copy_pass/" + copy_pass); render_path_set_target("texpaint_nor" + tid); render_path_bind_target("temptex0", "tex"); - render_path_draw_shader("shader_datas/dilate_pass/" + dilate_pass); + render_path_draw_shader("Scene/dilate_pass/" + dilate_pass); render_path_set_target("temptex0"); render_path_bind_target("texpaint_pack" + tid, "tex"); - render_path_draw_shader("shader_datas/copy_pass/" + copy_pass); + render_path_draw_shader("Scene/copy_pass/" + copy_pass); render_path_set_target("texpaint_pack" + tid); render_path_bind_target("temptex0", "tex"); - render_path_draw_shader("shader_datas/dilate_pass/" + dilate_pass); + render_path_draw_shader("Scene/dilate_pass/" + dilate_pass); } } } diff --git a/paint/sources/render_path_preview.ts b/paint/sources/render_path_preview.ts index b9aadcb5..49a391a6 100644 --- a/paint/sources/render_path_preview.ts +++ b/paint/sources/render_path_preview.ts @@ -73,10 +73,10 @@ function render_path_preview_commands_preview() { render_path_bind_target("mgbuffer0", "gbuffer0"); render_path_bind_target("mgbuffer1", "gbuffer1"); render_path_bind_target("empty_white", "ssaotex"); - render_path_draw_shader("shader_datas/deferred_light/deferred_light"); + render_path_draw_shader("Scene/deferred_light/deferred_light"); render_path_set_target("mtex", null, "mmain"); - render_path_draw_skydome("shader_datas/world_pass/world_pass"); + render_path_draw_skydome("Scene/world_pass/world_pass"); let framebuffer: string = "texpreview"; let selected_mat: slot_material_t = context_raw.material; @@ -87,11 +87,11 @@ function render_path_preview_commands_preview() { render_path_set_target(framebuffer); render_path_bind_target("mtex", "tex"); - render_path_draw_shader("shader_datas/compositor_pass/compositor_pass"); + render_path_draw_shader("Scene/compositor_pass/compositor_pass"); render_path_set_target("texpreview_icon"); render_path_bind_target("texpreview", "tex"); - render_path_draw_shader("shader_datas/supersample_resolve/supersample_resolveRGBA64"); + render_path_draw_shader("Scene/supersample_resolve/supersample_resolveRGBA64"); } function render_path_preview_commands_decal() { @@ -107,10 +107,10 @@ function render_path_preview_commands_decal() { render_path_bind_target("gbuffer0", "gbuffer0"); render_path_bind_target("gbuffer1", "gbuffer1"); render_path_bind_target("empty_white", "ssaotex"); - render_path_draw_shader("shader_datas/deferred_light/deferred_light"); + render_path_draw_shader("Scene/deferred_light/deferred_light"); render_path_set_target(output, null, "main"); - render_path_draw_skydome("shader_datas/world_pass/world_pass"); + render_path_draw_skydome("Scene/world_pass/world_pass"); let framebuffer: string = "texpreview"; let texpreview: render_target_t = map_get(render_path_render_targets, "texpreview"); @@ -119,5 +119,5 @@ function render_path_preview_commands_decal() { render_path_set_target(framebuffer); render_path_bind_target(output, "tex"); - render_path_draw_shader("shader_datas/compositor_pass/compositor_pass"); + render_path_draw_shader("Scene/compositor_pass/compositor_pass"); } diff --git a/paint/sources/render_path_raytrace.ts b/paint/sources/render_path_raytrace.ts index f6a38cc3..fa1a11dd 100644 --- a/paint/sources/render_path_raytrace.ts +++ b/paint/sources/render_path_raytrace.ts @@ -210,10 +210,10 @@ function render_path_raytrace_draw(use_live_layer: bool) { render_path_base_draw_compass(); render_path_set_target("last"); render_path_bind_target("buf", "tex"); - render_path_draw_shader("shader_datas/compositor_pass/compositor_pass"); + render_path_draw_shader("Scene/compositor_pass/compositor_pass"); render_path_base_draw_bloom("buf", "last"); render_path_set_target(""); render_path_bind_target("last", "tex"); - render_path_draw_shader("shader_datas/copy_pass/copy_pass"); + render_path_draw_shader("Scene/copy_pass/copy_pass"); render_path_paint_commands_cursor(); } diff --git a/paint/sources/render_path_raytrace_bake.ts b/paint/sources/render_path_raytrace_bake.ts index 1c52150f..4c454da3 100644 --- a/paint/sources/render_path_raytrace_bake.ts +++ b/paint/sources/render_path_raytrace_bake.ts @@ -130,7 +130,7 @@ function render_path_raytrace_bake_commands(parse_paint_material: (b?: bool)=>vo let texpaint_id: string = "texpaint" + id; render_path_set_target(texpaint_id); render_path_bind_target("baketex2", "tex"); - render_path_draw_shader("shader_datas/copy_pass/copy_pass"); + render_path_draw_shader("Scene/copy_pass/copy_pass"); ///if arm_metal let samples_per_frame: i32 = 4; diff --git a/paint/sources/util_render.ts b/paint/sources/util_render.ts index 28197c5d..64f3af45 100644 --- a/paint/sources/util_render.ts +++ b/paint/sources/util_render.ts @@ -367,7 +367,7 @@ function util_render_make_brush_preview() { texpreview_icon._image = context_raw.brush.image_icon; render_path_set_target("texpreview_icon"); render_path_bind_target("texpreview", "tex"); - render_path_draw_shader("shader_datas/supersample_resolve/supersample_resolve"); + render_path_draw_shader("Scene/supersample_resolve/supersample_resolve"); context_raw.brush.preview_ready = true; context_raw.brush_blend_dirty = true;