From 2e7737f630e17f35bff4c9c0b543a9b1dcc5e01f Mon Sep 17 00:00:00 2001 From: luboslenco Date: Sun, 9 Feb 2025 18:04:33 +0100 Subject: [PATCH] Cleanup --- armorcore/sources/ts/render_path.ts | 14 +++----------- armorcore/sources/ts/scene.ts | 1 - armorcore/sources/ts/uniforms.ts | 12 +----------- armorpaint/sources/make_bake.ts | 4 +--- base/assets/Scene.arm | Bin 179413 -> 179394 bytes base/assets/readme/readme_dxr.txt | 20 -------------------- base/assets/readme/readme_vkrt.txt | 21 --------------------- base/assets/shader_datas.arm | Bin 25551 -> 24430 bytes base/project.js | 2 -- base/sources/node_shader.ts | 9 ++++----- base/sources/node_shader_context.ts | 5 +---- base/sources/util_clone.ts | 1 - 12 files changed, 10 insertions(+), 79 deletions(-) delete mode 100644 base/assets/readme/readme_dxr.txt delete mode 100644 base/assets/readme/readme_vkrt.txt diff --git a/armorcore/sources/ts/render_path.ts b/armorcore/sources/ts/render_path.ts index 9b2c229b..2c4e8d47 100644 --- a/armorcore/sources/ts/render_path.ts +++ b/armorcore/sources/ts/render_path.ts @@ -9,7 +9,6 @@ type render_target_t = { depth_buffer?: string; // 2D texture mipmaps?: bool; depth?: i32; // 3D texture - is_image?: bool; // Image // Runtime _depth_format?: depth_format_t; _depth_from?: string; @@ -430,15 +429,9 @@ function render_path_create_image(t: render_target_t, depth_format: depth_format return img; } else { // 2D texture - if (t.is_image) { // Image - return image_create(width, height, - t.format != null ? render_path_get_tex_format(t.format) : tex_format_t.RGBA32); - } - else { // Render target - return image_create_render_target(width, height, - t.format != null ? render_path_get_tex_format(t.format) : tex_format_t.RGBA32, - depth_format); - } + return image_create_render_target(width, height, + t.format != null ? render_path_get_tex_format(t.format) : tex_format_t.RGBA32, + depth_format); } } @@ -485,7 +478,6 @@ function render_target_create(): render_target_t { raw.scale = 1.0; raw.mipmaps = false; raw.depth = 1; - raw.is_image = false; raw._depth_from = ""; raw._has_depth = false; return raw; diff --git a/armorcore/sources/ts/scene.ts b/armorcore/sources/ts/scene.ts index 8fcb8157..4455a7db 100644 --- a/armorcore/sources/ts/scene.ts +++ b/armorcore/sources/ts/scene.ts @@ -692,7 +692,6 @@ type shader_const_t = { type tex_unit_t = { name?: string; link?: string; - image_uniform?: bool; // uniform layout(r8) writeonly image3D voxels }; type speaker_data_t = { diff --git a/armorcore/sources/ts/uniforms.ts b/armorcore/sources/ts/uniforms.ts index e957857d..812ed360 100644 --- a/armorcore/sources/ts/uniforms.ts +++ b/armorcore/sources/ts/uniforms.ts @@ -117,12 +117,8 @@ function uniforms_bind_render_target(rt: render_target_t, context: shader_contex for (let j: i32 = 0; j < tus.length; ++j) { // Set texture if (sampler_id == tus[j].name) { - let is_image: bool = tus[j].image_uniform; - if (is_image) { - g4_set_image_tex(context._.tex_units[j], rt._image); // image2D/3D - } - else if (attach_depth) { + if (attach_depth) { g4_set_tex_depth(context._.tex_units[j], rt._image); // sampler2D } else { @@ -134,12 +130,6 @@ function uniforms_bind_render_target(rt: render_target_t, context: shader_contex continue; } - if (is_image) { - // Multiple voxel volumes, always set params - g4_set_tex_3d_params(context._.tex_units[j], tex_addressing_t.CLAMP, tex_addressing_t.CLAMP, tex_addressing_t.CLAMP, tex_filter_t.LINEAR, tex_filter_t.POINT, mip_map_filter_t.LINEAR); - continue; - } - if (rt.mipmaps) { g4_set_tex_params(context._.tex_units[j], tex_addressing_t.CLAMP, tex_addressing_t.CLAMP, tex_filter_t.LINEAR, tex_filter_t.LINEAR, mip_map_filter_t.LINEAR); continue; diff --git a/armorpaint/sources/make_bake.ts b/armorpaint/sources/make_bake.ts index 9d3410bb..be7eaf3f 100644 --- a/armorpaint/sources/make_bake.ts +++ b/armorpaint/sources/make_bake.ts @@ -1,8 +1,6 @@ function make_bake_run(con: node_shader_context_t, vert: node_shader_t, frag: node_shader_t) { - if (context_raw.bake_type == bake_type_t.AO) { // Voxel - } - else if (context_raw.bake_type == bake_type_t.CURVATURE) { + if (context_raw.bake_type == bake_type_t.CURVATURE) { let pass: bool = parser_material_bake_passthrough; let strength: string = pass ? parser_material_bake_passthrough_strength : context_raw.bake_curv_strength + ""; let radius: string = pass ? parser_material_bake_passthrough_radius : context_raw.bake_curv_radius + ""; diff --git a/base/assets/Scene.arm b/base/assets/Scene.arm index 78b2a9cb76b6ed3f19de4e1ecc133856f1b214aa..66f2a882e24e96510ada6033b02c75744dec909b 100644 GIT binary patch delta 26 icmccmlk3n=u7(!IElly-8JVUhY-dv6K5ILZH7fw3!wQoC delta 49 zcmX@~lk4hFu7(!IElly-r)R8W;+vkkok>dgHZKDMLuPJbdTM-WUS?W;QSPDb?c15G FSpol_6I1{I diff --git a/base/assets/readme/readme_dxr.txt b/base/assets/readme/readme_dxr.txt deleted file mode 100644 index a5c2cf39..00000000 --- a/base/assets/readme/readme_dxr.txt +++ /dev/null @@ -1,20 +0,0 @@ -! This is an experimental build with hardware accelerated ray-tracing using DXR and Direct3D12 ! - -Supported GPUs: -- NVIDIA RTX 20 Series or better -- AMD RX 6800 XT or better - -Up to date Windows 10/11 and graphics drivers required. - -Learn more: -https://en.wikipedia.org/wiki/DirectX_Raytracing - -This build is only intended for testing ray-tracing features and -may be sub-par in other areas compared to regular builds. - -Currently exposed ray-tracing features: -- Bake Tool - AO -- Bake Tool - Bent Normal -- Bake Tool - Lightmap -- Bake Tool - Thickness -- Viewport Mode - Path-Trace diff --git a/base/assets/readme/readme_vkrt.txt b/base/assets/readme/readme_vkrt.txt deleted file mode 100644 index 19f47f57..00000000 --- a/base/assets/readme/readme_vkrt.txt +++ /dev/null @@ -1,21 +0,0 @@ -! This is an experimental build with hardware accelerated ray-tracing powered by Vulkan Ray Tracing ! - -Supported GPUs: -- NVIDIA RTX 20 Series or better -- AMD RX 6800 XT or better - -Requires Vulkan driver 455.46.04 or newer on NVIDIA cards: -https://developer.nvidia.com/vulkan-driver - -Learn more: -https://www.khronos.org/blog/ray-tracing-in-vulkan - -This build is only intended for testing ray-tracing features and -may be sub-par in other areas compared to regular builds. - -Currently exposed ray-tracing features: -- Bake Tool - AO -- Bake Tool - Bent Normal -- Bake Tool - Lightmap -- Bake Tool - Thickness -- Viewport Mode - Path-Trace diff --git a/base/assets/shader_datas.arm b/base/assets/shader_datas.arm index 3cac2165330ef2abff025bbbfb85cea0e05e188a..01c65fb41592580914681cdff74a2ac925ed1dc2 100644 GIT binary patch delta 695 zcmX?qobla0#to;LCwFoRO+H}ByZJBkZzdpzZ*mr&_+|rkPi97@$yHn`O!t{4Z{{)v zQNOv&H@k9+gCt`4z!K9S)CWPu&CL9*Op{Fn!DfLJZ}gQ1Q6MQ5p$?GA5NqyOwfiaA~hMAgMh bOb&_{hcNXwABZmjg+Je9r(}i6rO8nMT9@)D delta 1808 zcmaF2kMaC*#to;LC$CiEoBU5eQ1mu00|P^5Zen_Bd}&^0T7FUPq5Dje6?TC-davMtqYKxx}%W!#uf)%NU2udMCgjpg}AHt^lj$ zOp_fYRX6KNUW6;dYLT4GR%S-#$qsfBli$d5V>JmRtBg(adRjaiz%$kVt&Cmf#ou?5CvIfGqz6-;)F7TL^gvIrF1_(F?7 zMBof%iOB{Q+*n;^ZSj&UKTpoJP@J5lT($YX-8aTbnrZ|bjy;VeI4W*#v714b12!i( z?j%d&WJfj8%|$M!$