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

Cleanup

Browse Source
This commit is contained in:
luboslenco
2025-02-09 17:15:58 +01:00
parent be4c63728a
commit 4df4b09340
39 changed files with 4 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/sources/box_preferences.ts
-3
View File
@@ -573,7 +573,6 @@ function box_preferences_show() {
}
if (ui_tab(box_preferences_htab, tr("Viewport"), true)) {
///if (arm_direct3d12 || arm_vulkan || arm_metal)
let hpathtrace_mode: ui_handle_t = ui_handle(__ID__);
if (hpathtrace_mode.init) {
@@ -587,8 +586,6 @@ function box_preferences_show() {
context_raw.ddirty = 2;
}
///end
let hrender_mode: ui_handle_t = ui_handle(__ID__);
if (hrender_mode.init) {
hrender_mode.position = context_raw.render_mode;
base/sources/context.ts
-2
View File
@@ -589,12 +589,10 @@ function context_init_tool() {
make_material_parse_particle_material();
}
else if (context_raw.tool == workspace_tool_t.BAKE) {
///if (arm_direct3d12 || arm_vulkan || arm_metal)
// Bake in lit mode for now
if (context_raw.viewport_mode == viewport_mode_t.PATH_TRACE) {
context_raw.viewport_mode = viewport_mode_t.LIT;
}
///end
}
else if (context_raw.tool == workspace_tool_t.MATERIAL) {
layers_update_fill_layers();
base/sources/import_mesh.ts
-2
View File
@@ -101,9 +101,7 @@ function import_mesh_finish_import() {
ui_view2d_hwnd.redraws = 2;
///end
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_ready = false;
///end
///if arm_physics
context_raw.paint_body = null;
base/sources/layers.ts
-2
View File
@@ -109,9 +109,7 @@ function layers_resize() {
if (render_path_paint_live_layer != null) {
slot_layer_resize_and_set_bits(render_path_paint_live_layer);
}
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_ready = false; // Rebuild baketex
///end
context_raw.ddirty = 2;
}
base/sources/parser_material.ts
+1 -12
View File
@@ -1198,11 +1198,7 @@ function parse_normal_map_color_input(inp: ui_node_socket_t) {
node_shader_add_function(parser_material_frag, str_cotangent_frame);
}
parser_material_frag.n = true;
///if (arm_direct3d12 || arm_metal || arm_vulkan)
node_shader_write(parser_material_frag, "mat3 TBN = cotangent_frame(n, vvec, tex_coord);");
///else
node_shader_write(parser_material_frag, "mat3 TBN = cotangent_frame(n, -vvec, tex_coord);");
///end
node_shader_write(parser_material_frag, "n = mul(normalize(texn), TBN);");
}
@@ -1259,12 +1255,8 @@ function parser_material_parse_value(node: ui_node_t, socket: ui_node_socket_t):
else if (node.type == "CAMERA") {
if (socket == node.outputs[1]) { // View Z Depth
node_shader_add_uniform(parser_material_curshader, "vec2 camera_proj", "_camera_plane_proj");
///if (arm_direct3d12 || arm_metal || arm_vulkan)
parser_material_curshader.wvpposition = true;
return "(camera_proj.y / ((wvpposition.z / wvpposition.w) - camera_proj.x))";
///else
return "(camera_proj.y / (gl_FragCoord.z - camera_proj.x))";
///end
}
else { // View Distance
node_shader_add_uniform(parser_material_curshader, "vec3 eye", "_camera_pos");
@@ -1362,11 +1354,8 @@ function parser_material_parse_value(node: ui_node_t, socket: ui_node_socket_t):
}
else if (node.type == "NEW_GEOMETRY") {
if (socket == node.outputs[6]) { // Backfacing
///if (arm_direct3d12 || arm_metal || arm_vulkan)
return "0.0"; // SV_IsFrontFace
///else
return "(1.0 - float(gl_FrontFacing))";
///end
// return "(1.0 - float(gl_FrontFacing))";
}
else if (socket == node.outputs[7]) { // Pointiness
let strength: f32 = 1.0;
base/sources/pipes.ts
-5
View File
@@ -102,7 +102,6 @@ function pipes_init() {
g4_pipeline_compile(pipes_copy_bgra);
}
///if (arm_metal || arm_vulkan || arm_direct3d12)
{
pipes_copy8 = g4_pipeline_create();
pipes_copy8.vertex_shader = sys_get_shader("layer_view.vert");
@@ -130,10 +129,6 @@ function pipes_init() {
pipes_copy128.color_attachments[0] = tex_format_t.RGBA128;
g4_pipeline_compile(pipes_copy128);
}
///else
pipes_copy8 = pipes_copy;
pipes_copy128 = pipes_copy;
///end
///if (is_paint || is_sculpt)
{
base/sources/project.ts
-2
View File
@@ -332,9 +332,7 @@ function project_new(reset_layers: bool = true) {
context_init_tool();
///end
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_ready = false;
///end
}
function project_import_material() {
base/sources/render_path_base.ts
+3 -11
View File
@@ -171,7 +171,6 @@ function render_path_base_commands(draw_commands: ()=>void) {
render_path_base_draw_gbuffer();
render_path_paint_draw();
///if (arm_direct3d12 || arm_vulkan || arm_metal)
if (context_raw.viewport_mode == viewport_mode_t.PATH_TRACE) {
let use_live_layer: bool = context_raw.tool == workspace_tool_t.MATERIAL;
render_path_raytrace_draw(use_live_layer);
@@ -179,7 +178,6 @@ function render_path_base_commands(draw_commands: ()=>void) {
render_path_base_end();
return;
}
///end
draw_commands();
render_path_paint_end();
@@ -244,12 +242,10 @@ function render_path_base_draw_split(draw_commands: ()=>void) {
render_path_base_draw_gbuffer();
///if (arm_direct3d12 || arm_vulkan || arm_metal)
let use_live_layer: bool = context_raw.tool == workspace_tool_t.MATERIAL;
context_raw.viewport_mode == viewport_mode_t.PATH_TRACE ? render_path_raytrace_draw(use_live_layer) : draw_commands();
///else
draw_commands();
///end
context_raw.viewport_mode == viewport_mode_t.PATH_TRACE ?
render_path_raytrace_draw(use_live_layer) :
draw_commands();
context_raw.view_index = context_raw.view_index == 0 ? 1 : 0;
transform_set_matrix(cam.base.transform, camera_views[context_raw.view_index].v);
@@ -351,16 +347,12 @@ function render_path_base_draw_deferred_light() {
render_path_draw_shader("shader_datas/deferred_light/deferred_light_voxel") :
render_path_draw_shader("shader_datas/deferred_light/deferred_light");
///if (arm_direct3d12 || arm_metal || arm_vulkan)
render_path_set_depth_from("tex", "gbuffer0"); // Bind depth for world pass
///end
render_path_set_target("tex");
render_path_draw_skydome("shader_datas/world_pass/world_pass");
///if (arm_direct3d12 || arm_metal || arm_vulkan)
render_path_set_depth_from("tex", "gbuffer1"); // Unbind depth
///end
}
// function render_path_base_draw_motion_blur() {
base/sources/render_path_deferred.ts
-2
View File
@@ -157,9 +157,7 @@ function render_path_deferred_init() {
render_path_preview_init();
///end
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_init();
///end
}
function render_path_deferred_commands() {
base/sources/render_path_preview.ts
-8
View File
@@ -82,16 +82,12 @@ function render_path_preview_commands_preview() {
}
render_path_draw_shader("shader_datas/deferred_light/deferred_light");
///if (arm_direct3d12 || arm_metal || arm_vulkan)
render_path_set_depth_from("mtex", "mgbuffer0"); // Bind depth for world pass
///end
render_path_set_target("mtex"); // Re-binds depth
render_path_draw_skydome("shader_datas/world_pass/world_pass");
///if (arm_direct3d12 || arm_metal || arm_vulkan)
render_path_set_depth_from("mtex", "mgbuffer1"); // Unbind depth
///end
let framebuffer: string = "texpreview";
let selected_mat: slot_material_t = context_raw.material;
@@ -129,16 +125,12 @@ function render_path_preview_commands_decal() {
}
render_path_draw_shader("shader_datas/deferred_light/deferred_light");
///if (arm_direct3d12 || arm_metal || arm_vulkan)
render_path_set_depth_from("tex", "gbuffer0"); // Bind depth for world pass
///end
render_path_set_target("tex");
render_path_draw_skydome("shader_datas/world_pass/world_pass");
///if (arm_direct3d12 || arm_metal || arm_vulkan)
render_path_set_depth_from("tex", "gbuffer1"); // Unbind depth
///end
let framebuffer: string = "texpreview";
let texpreview: render_target_t = map_get(render_path_render_targets, "texpreview");
base/sources/render_path_raytrace.ts
-4
View File
@@ -1,6 +1,4 @@
///if (arm_direct3d12 || arm_vulkan || arm_metal)
let render_path_raytrace_frame: i32 = 0;
let render_path_raytrace_ready: bool = false;
let render_path_raytrace_dirty: i32 = 0;
@@ -236,5 +234,3 @@ function render_path_raytrace_draw(use_live_layer: bool) {
render_path_paint_commands_cursor();
}
}
///end
base/sources/render_path_raytrace_bake.ts
-4
View File
@@ -1,6 +1,4 @@
///if (arm_direct3d12 || arm_vulkan || arm_metal)
let render_path_raytrace_bake_rays_pix: i32 = 0;
let render_path_raytrace_bake_rays_sec: i32 = 0;
let render_path_raytrace_bake_current_sample: i32 = 0;
@@ -150,5 +148,3 @@ function render_path_raytrace_bake_get_bake_shader_name(): string {
context_raw.bake_type == bake_type_t.BENT_NORMAL ? "raytrace_bake_bent" + render_path_raytrace_ext :
"raytrace_bake_thick" + render_path_raytrace_ext;
}
///end
base/sources/tab_layers.ts
-2
View File
@@ -206,9 +206,7 @@ function tab_layers_combo_filter() {
layers_set_object_mask();
util_uv_uvmap_cached = false;
context_raw.ddirty = 2;
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_ready = false;
///end
}
}
base/sources/tab_meshes.ts
-2
View File
@@ -205,7 +205,5 @@ function tab_meshes_set_default_mesh(name: string) {
scene_meshes = [mo];
}
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_ready = false;
///end
}
base/sources/ui_base.ts
-6
View File
@@ -591,12 +591,10 @@ function ui_base_update() {
let shortcuts: string[] = ["l", "b", "n", "o", "r", "m", "a", "h", "e", "s", "t", "1", "2", "3", "4"];
///if (arm_direct3d12 || arm_vulkan || arm_metal)
if (iron_raytrace_supported()) {
array_push(modes, tr("Path Traced"));
array_push(shortcuts, "p");
}
///end
for (let i: i32 = 0; i < modes.length; ++i) {
ui_radio(mode_handle, i, modes[i], shortcuts[i]);
@@ -1401,11 +1399,7 @@ function ui_base_render_cursor() {
let cx: f32 = decalx + psizex / 2;
let cy: f32 = decaly + psizey / 2;
g2_set_transformation(mat3_multmat(mat3_multmat(mat3_translation(cx, cy), mat3_rotation(angle)), mat3_translation(-cx, -cy)));
///if (arm_direct3d12 || arm_metal || arm_vulkan)
g2_draw_scaled_image(context_raw.decal_image, decalx, decaly, psizex, psizey);
///else
g2_draw_scaled_image(context_raw.decal_image, decalx, decaly + psizey, psizex, -psizey);
///end
g2_set_transformation(mat3_nan());
g2_set_color(0xffffffff);
}
base/sources/ui_menu.ts
-4
View File
@@ -263,10 +263,8 @@ function ui_menu_render() {
context_raw.brush_scale = ui_slider(brush_scale_handle, tr("UV Scale"), 0.01, 5.0, true);
if (brush_scale_handle.changed) {
make_material_parse_mesh_material();
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_uv_scale = context_raw.brush_scale;
render_path_raytrace_ready = false;
///end
}
///end
@@ -361,12 +359,10 @@ function ui_menu_render() {
];
let shortcuts: string[] = ["l", "b", "n", "o", "r", "m", "a", "h", "e", "s", "t", "1", "2", "3", "4"];
///if (arm_direct3d12 || arm_vulkan || arm_metal)
if (iron_raytrace_supported()) {
array_push(modes, tr("Path Traced"));
array_push(shortcuts, "p");
}
///end
for (let i: i32 = 0; i < modes.length; ++i) {
let shortcut: string = config_raw.touch_ui ? "" : map_get(config_keymap, "viewport_mode") + ", " + shortcuts[i];
base/sources/ui_menubar.ts
-2
View File
@@ -201,9 +201,7 @@ function ui_menubar_draw_tab_header() {
m = mat4_translate(m, 0, 0, 1.6);
transform_set_matrix(scene_camera.base.transform, m);
}
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_ready = false;
///end
}
///end
}
base/sources/util_mesh.ts
-6
View File
@@ -123,9 +123,7 @@ function util_mesh_merge(paint_objects: mesh_object_t[] = null) {
context_raw.merged_object.force_context = "paint";
object_set_parent(context_raw.merged_object.base, context_main_object().base);
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_ready = false;
///end
}
function util_mesh_remove_merged() {
@@ -199,9 +197,7 @@ function util_mesh_flip_normals() {
g4_vertex_buffer_unlock(g._.vertex_buffer);
}
///if (arm_direct3d12 || arm_vulkan || arm_metal)
render_path_raytrace_ready = false;
///end
}
function util_mesh_calc_normals(smooth: bool = false) {
@@ -301,10 +297,8 @@ function util_mesh_calc_normals(smooth: bool = false) {
}
}
///if (arm_direct3d12 || arm_vulkan || arm_metal)
util_mesh_merge();
render_path_raytrace_ready = false;
///end
}
function util_mesh_to_origin() {