From 3faf6b3d7346188958f10f793c291bcf3ec5960f Mon Sep 17 00:00:00 2001 From: luboslenco Date: Mon, 1 Sep 2025 21:31:59 +0200 Subject: [PATCH] Cleanup --- base/project.js | 6 +- base/sources/ts/{iron => }/anim.ts | 0 base/sources/ts/{iron => }/anim_object.ts | 0 base/sources/ts/{iron => }/camera_data.ts | 0 base/sources/ts/{iron => }/camera_object.ts | 0 base/sources/ts/{iron => }/const_data.ts | 0 base/sources/ts/{iron => }/data.ts | 0 base/sources/ts/{iron => }/input.ts | 0 base/sources/ts/{iron => }/iron.ts | 0 base/sources/ts/{iron => }/lz4.ts | 0 base/sources/ts/{iron => }/material_data.ts | 0 base/sources/ts/{iron => }/mesh_data.ts | 0 base/sources/ts/{iron => }/mesh_object.ts | 0 base/sources/ts/nodes/brush_output_node.ts | 11 -- base/sources/ts/{iron => }/object.ts | 0 base/sources/ts/{iron => }/raycast.ts | 0 base/sources/ts/{iron => }/render_path.ts | 0 base/sources/ts/{iron => }/scene.ts | 0 base/sources/ts/{iron => }/shader_data.ts | 0 base/sources/ts/{iron => }/speaker_object.ts | 0 base/sources/ts/{iron => }/sys.ts | 0 base/sources/ts/{iron => }/tilesheet.ts | 0 base/sources/ts/{iron => }/transform.ts | 0 base/sources/ts/{iron => }/tween.ts | 0 base/sources/ts/ui_header.ts | 31 --- base/sources/ts/{iron => }/uniforms.ts | 0 base/sources/ts/{iron => }/world_data.ts | 0 {base => paint}/assets/Scene.arm | Bin {base => paint}/assets/World_irradiance.arm | Bin {base => paint}/assets/World_radiance.hdr | Bin {base => paint}/assets/World_radiance_0.hdr | Bin {base => paint}/assets/World_radiance_1.hdr | Bin {base => paint}/assets/World_radiance_2.hdr | Bin {base => paint}/assets/World_radiance_3.hdr | Bin {base => paint}/assets/World_radiance_4.hdr | Bin {base => paint}/assets/plugins/autosave.js | 0 {base => paint}/assets/plugins/export_gpl.js | 0 {base => paint}/assets/plugins/import_gpl.js | 0 {base => paint}/assets/plugins/import_tiff.js | 0 {base => paint}/assets/plugins/import_txt.js | 0 {base => paint}/assets/shader_datas.arm | Bin .../shaders/bloom_downsample_pass.kong | 0 .../shaders/bloom_upsample_pass.kong | 0 {base => paint}/shaders/compositor_pass.kong | 0 {base => paint}/shaders/copy_mrt3_pass.kong | 0 {base => paint}/shaders/copy_pass.kong | 0 {base => paint}/shaders/cursor.kong | 0 {base => paint}/shaders/deferred_light.kong | 0 {base => paint}/shaders/histogram_pass.kong | 0 {base => paint}/shaders/layer_copy.kong | 0 {base => paint}/shaders/layer_copy_bgra.kong | 0 {base => paint}/shaders/line.kong | 0 {base => paint}/shaders/line_overlay.kong | 0 {base => paint}/shaders/mask_apply.kong | 0 {base => paint}/shaders/mesh_poscol.kong | 0 {base => paint}/shaders/mesh_posnor.kong | 0 {base => paint}/shaders/mesh_posnortex.kong | 0 {base => paint}/shaders/prefilter_envmap.kong | 0 {base => paint}/shaders/ssao_blur_pass.kong | 0 {base => paint}/shaders/ssao_pass.kong | 0 .../shaders/supersample_resolve.kong | 0 {base => paint}/shaders/taa_pass.kong | 0 {base => paint}/shaders/world_pass.kong | 0 {base/sources/ts => paint/sources}/args.ts | 0 {base/sources/ts => paint/sources}/base.ts | 34 ++++ paint/sources/base_ext.ts | 33 ---- .../ts => paint/sources}/box_export.ts | 0 .../ts => paint/sources}/box_preferences.ts | 0 .../ts => paint/sources}/box_projects.ts | 0 .../sources/brush_nodes}/boolean_node.ts | 0 ...utput_node_ext.ts => brush_output_node.ts} | 13 ++ .../sources/brush_nodes}/color_node.ts | 0 .../sources/brush_nodes}/float_node.ts | 0 .../sources/brush_nodes}/integer_node.ts | 0 .../sources/brush_nodes}/math_node.ts | 0 .../sources/brush_nodes}/null_node.ts | 0 .../sources/brush_nodes}/random_node.ts | 0 .../brush_nodes}/separate_vector_node.ts | 0 .../sources/brush_nodes}/string_node.ts | 0 .../sources/brush_nodes}/time_node.ts | 0 .../sources/brush_nodes}/vector_math_node.ts | 0 .../sources/brush_nodes}/vector_node.ts | 0 {base/sources/ts => paint/sources}/camera.ts | 0 {base/sources/ts => paint/sources}/compass.ts | 0 {base/sources/ts => paint/sources}/config.ts | 0 {base/sources/ts => paint/sources}/console.ts | 0 {base/sources/ts => paint/sources}/context.ts | 36 ++++ paint/sources/context_ext.ts | 34 ---- {base/sources/ts => paint/sources}/enums.ts | 0 .../ts => paint/sources}/export_arm.ts | 0 .../ts => paint/sources}/export_mesh.ts | 0 .../ts => paint/sources}/export_obj.ts | 0 .../ts => paint/sources}/export_texture.ts | 0 {base/sources/ts => paint/sources}/file.ts | 0 {base/sources/ts => paint/sources}/geom.ts | 0 {base/sources/ts => paint/sources}/gizmo.ts | 0 {base/sources/ts => paint/sources}/history.ts | 0 .../ts => paint/sources}/import_arm.ts | 0 .../ts => paint/sources}/import_asset.ts | 0 .../sources}/import_blend_material.ts | 0 .../ts => paint/sources}/import_blend_mesh.ts | 0 .../ts => paint/sources}/import_envmap.ts | 0 .../ts => paint/sources}/import_folder.ts | 0 .../ts => paint/sources}/import_font.ts | 0 .../ts => paint/sources}/import_keymap.ts | 0 .../ts => paint/sources}/import_mesh.ts | 0 .../ts => paint/sources}/import_obj.ts | 0 .../ts => paint/sources}/import_plugin.ts | 0 .../ts => paint/sources}/import_texture.ts | 0 .../ts => paint/sources}/import_theme.ts | 0 {base/sources/ts => paint/sources}/keymap.ts | 0 {base/sources/ts => paint/sources}/layers.ts | 184 ++++++++++++++++++ paint/sources/layers_ext.ts | 182 ----------------- .../sources/ts => paint/sources}/line_draw.ts | 0 .../ts => paint/sources}/logic_node.ts | 0 {base/sources/ts => paint/sources}/main.ts | 0 .../ts => paint/sources}/node_shader.ts | 0 .../sources}/node_shader_context.ts | 0 .../ts => paint/sources}/nodes_material.ts | 0 .../sources/ts => paint/sources}/operator.ts | 0 .../ts => paint/sources}/parser_exr.ts | 0 .../ts => paint/sources}/parser_logic.ts | 0 .../ts => paint/sources}/parser_material.ts | 0 {base/sources/ts => paint/sources}/path.ts | 0 .../ts => paint/sources}/physics_body.ts | 0 .../ts => paint/sources}/physics_world.ts | 0 {base/sources/ts => paint/sources}/pipes.ts | 0 {base/sources/ts => paint/sources}/plugin.ts | 0 {base/sources/ts => paint/sources}/project.ts | 0 .../ts => paint/sources}/render_path_base.ts | 0 .../sources}/render_path_deferred.ts | 0 .../sources}/render_path_forward.ts | 0 .../sources}/render_path_preview.ts | 0 .../sources}/render_path_raytrace.ts | 0 .../sources}/render_path_raytrace_bake.ts | 0 .../sources/ts => paint/sources}/resource.ts | 0 .../ts => paint/sources}/slot_brush.ts | 0 .../sources/ts => paint/sources}/slot_font.ts | 0 .../ts => paint/sources}/slot_layer.ts | 0 .../ts => paint/sources}/slot_material.ts | 0 {base/sources/ts => paint/sources}/strings.ts | 0 .../ts => paint/sources}/tab_browser.ts | 0 .../ts => paint/sources}/tab_brushes.ts | 0 .../ts => paint/sources}/tab_console.ts | 0 .../sources/ts => paint/sources}/tab_fonts.ts | 0 .../ts => paint/sources}/tab_history.ts | 0 .../ts => paint/sources}/tab_layers.ts | 0 .../ts => paint/sources}/tab_materials.ts | 0 .../ts => paint/sources}/tab_meshes.ts | 0 .../ts => paint/sources}/tab_plugins.ts | 0 .../ts => paint/sources}/tab_scripts.ts | 0 .../ts => paint/sources}/tab_swatches.ts | 0 .../ts => paint/sources}/tab_textures.ts | 0 .../ts => paint/sources}/translator.ts | 0 {base/sources/ts => paint/sources}/ui_base.ts | 32 +++ paint/sources/ui_base_ext.ts | 30 --- {base/sources/ts => paint/sources}/ui_box.ts | 0 .../sources/ts => paint/sources}/ui_files.ts | 0 .../{ui_header_ext.ts => ui_header.ts} | 33 ++++ {base/sources/ts => paint/sources}/ui_menu.ts | 0 .../ts => paint/sources}/ui_menubar.ts | 0 .../sources/ts => paint/sources}/ui_nodes.ts | 0 .../sources/ts => paint/sources}/ui_status.ts | 0 .../ts => paint/sources}/ui_toolbar.ts | 19 ++ paint/sources/ui_toolbar_ext.ts | 17 -- .../sources/ts => paint/sources}/ui_view2d.ts | 0 .../ts => paint/sources}/uniforms_ext.ts | 0 .../ts => paint/sources}/util_clone.ts | 0 .../ts => paint/sources}/util_encode.ts | 0 .../sources/ts => paint/sources}/util_mesh.ts | 0 .../ts => paint/sources}/util_particle.ts | 0 .../ts => paint/sources}/util_render.ts | 0 {base/sources/ts => paint/sources}/util_uv.ts | 0 .../sources/ts => paint/sources}/viewport.ts | 0 174 files changed, 352 insertions(+), 343 deletions(-) rename base/sources/ts/{iron => }/anim.ts (100%) rename base/sources/ts/{iron => }/anim_object.ts (100%) rename base/sources/ts/{iron => }/camera_data.ts (100%) rename base/sources/ts/{iron => }/camera_object.ts (100%) rename base/sources/ts/{iron => }/const_data.ts (100%) rename base/sources/ts/{iron => }/data.ts (100%) rename base/sources/ts/{iron => }/input.ts (100%) rename base/sources/ts/{iron => }/iron.ts (100%) rename base/sources/ts/{iron => }/lz4.ts (100%) rename base/sources/ts/{iron => }/material_data.ts (100%) rename base/sources/ts/{iron => }/mesh_data.ts (100%) rename base/sources/ts/{iron => }/mesh_object.ts (100%) delete mode 100644 base/sources/ts/nodes/brush_output_node.ts rename base/sources/ts/{iron => }/object.ts (100%) rename base/sources/ts/{iron => }/raycast.ts (100%) rename base/sources/ts/{iron => }/render_path.ts (100%) rename base/sources/ts/{iron => }/scene.ts (100%) rename base/sources/ts/{iron => }/shader_data.ts (100%) rename base/sources/ts/{iron => }/speaker_object.ts (100%) rename base/sources/ts/{iron => }/sys.ts (100%) rename base/sources/ts/{iron => }/tilesheet.ts (100%) rename base/sources/ts/{iron => }/transform.ts (100%) rename base/sources/ts/{iron => }/tween.ts (100%) delete mode 100644 base/sources/ts/ui_header.ts rename base/sources/ts/{iron => }/uniforms.ts (100%) rename base/sources/ts/{iron => }/world_data.ts (100%) rename {base => paint}/assets/Scene.arm (100%) rename {base => paint}/assets/World_irradiance.arm (100%) rename {base => paint}/assets/World_radiance.hdr (100%) rename {base => paint}/assets/World_radiance_0.hdr (100%) rename {base => paint}/assets/World_radiance_1.hdr (100%) rename {base => paint}/assets/World_radiance_2.hdr (100%) rename {base => paint}/assets/World_radiance_3.hdr (100%) rename {base => paint}/assets/World_radiance_4.hdr (100%) rename {base => paint}/assets/plugins/autosave.js (100%) rename {base => paint}/assets/plugins/export_gpl.js (100%) rename {base => paint}/assets/plugins/import_gpl.js (100%) rename {base => paint}/assets/plugins/import_tiff.js (100%) rename {base => paint}/assets/plugins/import_txt.js (100%) rename {base => paint}/assets/shader_datas.arm (100%) rename {base => paint}/shaders/bloom_downsample_pass.kong (100%) rename {base => paint}/shaders/bloom_upsample_pass.kong (100%) rename {base => paint}/shaders/compositor_pass.kong (100%) rename {base => paint}/shaders/copy_mrt3_pass.kong (100%) rename {base => paint}/shaders/copy_pass.kong (100%) rename {base => paint}/shaders/cursor.kong (100%) rename {base => paint}/shaders/deferred_light.kong (100%) rename {base => paint}/shaders/histogram_pass.kong (100%) rename {base => paint}/shaders/layer_copy.kong (100%) rename {base => paint}/shaders/layer_copy_bgra.kong (100%) rename {base => paint}/shaders/line.kong (100%) rename {base => paint}/shaders/line_overlay.kong (100%) rename {base => paint}/shaders/mask_apply.kong (100%) rename {base => paint}/shaders/mesh_poscol.kong (100%) rename {base => paint}/shaders/mesh_posnor.kong (100%) rename {base => paint}/shaders/mesh_posnortex.kong (100%) rename {base => paint}/shaders/prefilter_envmap.kong (100%) rename {base => paint}/shaders/ssao_blur_pass.kong (100%) rename {base => paint}/shaders/ssao_pass.kong (100%) rename {base => paint}/shaders/supersample_resolve.kong (100%) rename {base => paint}/shaders/taa_pass.kong (100%) rename {base => paint}/shaders/world_pass.kong (100%) rename {base/sources/ts => paint/sources}/args.ts (100%) rename {base/sources/ts => paint/sources}/base.ts (97%) delete mode 100644 paint/sources/base_ext.ts rename {base/sources/ts => paint/sources}/box_export.ts (100%) rename {base/sources/ts => paint/sources}/box_preferences.ts (100%) rename {base/sources/ts => paint/sources}/box_projects.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/boolean_node.ts (100%) rename paint/sources/brush_nodes/{brush_output_node_ext.ts => brush_output_node.ts} (95%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/color_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/float_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/integer_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/math_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/null_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/random_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/separate_vector_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/string_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/time_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/vector_math_node.ts (100%) rename {base/sources/ts/nodes => paint/sources/brush_nodes}/vector_node.ts (100%) rename {base/sources/ts => paint/sources}/camera.ts (100%) rename {base/sources/ts => paint/sources}/compass.ts (100%) rename {base/sources/ts => paint/sources}/config.ts (100%) rename {base/sources/ts => paint/sources}/console.ts (100%) rename {base/sources/ts => paint/sources}/context.ts (95%) delete mode 100644 paint/sources/context_ext.ts rename {base/sources/ts => paint/sources}/enums.ts (100%) rename {base/sources/ts => paint/sources}/export_arm.ts (100%) rename {base/sources/ts => paint/sources}/export_mesh.ts (100%) rename {base/sources/ts => paint/sources}/export_obj.ts (100%) rename {base/sources/ts => paint/sources}/export_texture.ts (100%) rename {base/sources/ts => paint/sources}/file.ts (100%) rename {base/sources/ts => paint/sources}/geom.ts (100%) rename {base/sources/ts => paint/sources}/gizmo.ts (100%) rename {base/sources/ts => paint/sources}/history.ts (100%) rename {base/sources/ts => paint/sources}/import_arm.ts (100%) rename {base/sources/ts => paint/sources}/import_asset.ts (100%) rename {base/sources/ts => paint/sources}/import_blend_material.ts (100%) rename {base/sources/ts => paint/sources}/import_blend_mesh.ts (100%) rename {base/sources/ts => paint/sources}/import_envmap.ts (100%) rename {base/sources/ts => paint/sources}/import_folder.ts (100%) rename {base/sources/ts => paint/sources}/import_font.ts (100%) rename {base/sources/ts => paint/sources}/import_keymap.ts (100%) rename {base/sources/ts => paint/sources}/import_mesh.ts (100%) rename {base/sources/ts => paint/sources}/import_obj.ts (100%) rename {base/sources/ts => paint/sources}/import_plugin.ts (100%) rename {base/sources/ts => paint/sources}/import_texture.ts (100%) rename {base/sources/ts => paint/sources}/import_theme.ts (100%) rename {base/sources/ts => paint/sources}/keymap.ts (100%) rename {base/sources/ts => paint/sources}/layers.ts (80%) delete mode 100644 paint/sources/layers_ext.ts rename {base/sources/ts => paint/sources}/line_draw.ts (100%) rename {base/sources/ts => paint/sources}/logic_node.ts (100%) rename {base/sources/ts => paint/sources}/main.ts (100%) rename {base/sources/ts => paint/sources}/node_shader.ts (100%) rename {base/sources/ts => paint/sources}/node_shader_context.ts (100%) rename {base/sources/ts => paint/sources}/nodes_material.ts (100%) rename {base/sources/ts => paint/sources}/operator.ts (100%) rename {base/sources/ts => paint/sources}/parser_exr.ts (100%) rename {base/sources/ts => paint/sources}/parser_logic.ts (100%) rename {base/sources/ts => paint/sources}/parser_material.ts (100%) rename {base/sources/ts => paint/sources}/path.ts (100%) rename {base/sources/ts => paint/sources}/physics_body.ts (100%) rename {base/sources/ts => paint/sources}/physics_world.ts (100%) rename {base/sources/ts => paint/sources}/pipes.ts (100%) rename {base/sources/ts => paint/sources}/plugin.ts (100%) rename {base/sources/ts => paint/sources}/project.ts (100%) rename {base/sources/ts => paint/sources}/render_path_base.ts (100%) rename {base/sources/ts => paint/sources}/render_path_deferred.ts (100%) rename {base/sources/ts => paint/sources}/render_path_forward.ts (100%) rename {base/sources/ts => paint/sources}/render_path_preview.ts (100%) rename {base/sources/ts => paint/sources}/render_path_raytrace.ts (100%) rename {base/sources/ts => paint/sources}/render_path_raytrace_bake.ts (100%) rename {base/sources/ts => paint/sources}/resource.ts (100%) rename {base/sources/ts => paint/sources}/slot_brush.ts (100%) rename {base/sources/ts => paint/sources}/slot_font.ts (100%) rename {base/sources/ts => paint/sources}/slot_layer.ts (100%) rename {base/sources/ts => paint/sources}/slot_material.ts (100%) rename {base/sources/ts => paint/sources}/strings.ts (100%) rename {base/sources/ts => paint/sources}/tab_browser.ts (100%) rename {base/sources/ts => paint/sources}/tab_brushes.ts (100%) rename {base/sources/ts => paint/sources}/tab_console.ts (100%) rename {base/sources/ts => paint/sources}/tab_fonts.ts (100%) rename {base/sources/ts => paint/sources}/tab_history.ts (100%) rename {base/sources/ts => paint/sources}/tab_layers.ts (100%) rename {base/sources/ts => paint/sources}/tab_materials.ts (100%) rename {base/sources/ts => paint/sources}/tab_meshes.ts (100%) rename {base/sources/ts => paint/sources}/tab_plugins.ts (100%) rename {base/sources/ts => paint/sources}/tab_scripts.ts (100%) rename {base/sources/ts => paint/sources}/tab_swatches.ts (100%) rename {base/sources/ts => paint/sources}/tab_textures.ts (100%) rename {base/sources/ts => paint/sources}/translator.ts (100%) rename {base/sources/ts => paint/sources}/ui_base.ts (98%) delete mode 100644 paint/sources/ui_base_ext.ts rename {base/sources/ts => paint/sources}/ui_box.ts (100%) rename {base/sources/ts => paint/sources}/ui_files.ts (100%) rename paint/sources/{ui_header_ext.ts => ui_header.ts} (95%) rename {base/sources/ts => paint/sources}/ui_menu.ts (100%) rename {base/sources/ts => paint/sources}/ui_menubar.ts (100%) rename {base/sources/ts => paint/sources}/ui_nodes.ts (100%) rename {base/sources/ts => paint/sources}/ui_status.ts (100%) rename {base/sources/ts => paint/sources}/ui_toolbar.ts (88%) delete mode 100644 paint/sources/ui_toolbar_ext.ts rename {base/sources/ts => paint/sources}/ui_view2d.ts (100%) rename {base/sources/ts => paint/sources}/uniforms_ext.ts (100%) rename {base/sources/ts => paint/sources}/util_clone.ts (100%) rename {base/sources/ts => paint/sources}/util_encode.ts (100%) rename {base/sources/ts => paint/sources}/util_mesh.ts (100%) rename {base/sources/ts => paint/sources}/util_particle.ts (100%) rename {base/sources/ts => paint/sources}/util_render.ts (100%) rename {base/sources/ts => paint/sources}/util_uv.ts (100%) rename {base/sources/ts => paint/sources}/viewport.ts (100%) diff --git a/base/project.js b/base/project.js index 5d23549e..5882b099 100644 --- a/base/project.js +++ b/base/project.js @@ -56,14 +56,10 @@ if (!flags.lite) { } project.add_tsfiles("sources/ts"); - project.add_tsfiles("sources/ts/iron"); - project.add_tsfiles("sources/ts/nodes"); - project.add_shaders("shaders/*.kong"); project.add_shaders("shaders/draw/*.kong"); project.add_assets("assets/*", { destination: "data/{name}" }); project.add_assets("assets/locale/*", { destination: "data/locale/{name}" }); project.add_assets("assets/licenses/**", { destination: "data/licenses/{name}" }); - project.add_assets("assets/plugins/*", { destination: "data/plugins/{name}" }); project.add_assets("assets/themes/*.json", { destination: "data/themes/{name}" }); if (platform === "linux" && fs_exists(os_cwd() + "/icon.png")) { @@ -120,7 +116,7 @@ if (!flags.lite) { if (export_data_list) { let root = "../" + flags.name.substr(5).toLowerCase(); let data_list = { - "/data/plugins": fs_readdir("../base/assets/plugins").concat(fs_readdir(root + "/assets/plugins")).join(","), + "/data/plugins": fs_readdir(root + "/assets/plugins").join(","), "/data/export_presets": fs_readdir(root + "/assets/export_presets").join(","), "/data/keymap_presets": fs_readdir(root + "/assets/keymap_presets").join(","), "/data/locale": fs_readdir("../base/assets/locale").join(","), diff --git a/base/sources/ts/iron/anim.ts b/base/sources/ts/anim.ts similarity index 100% rename from base/sources/ts/iron/anim.ts rename to base/sources/ts/anim.ts diff --git a/base/sources/ts/iron/anim_object.ts b/base/sources/ts/anim_object.ts similarity index 100% rename from base/sources/ts/iron/anim_object.ts rename to base/sources/ts/anim_object.ts diff --git a/base/sources/ts/iron/camera_data.ts b/base/sources/ts/camera_data.ts similarity index 100% rename from base/sources/ts/iron/camera_data.ts rename to base/sources/ts/camera_data.ts diff --git a/base/sources/ts/iron/camera_object.ts b/base/sources/ts/camera_object.ts similarity index 100% rename from base/sources/ts/iron/camera_object.ts rename to base/sources/ts/camera_object.ts diff --git a/base/sources/ts/iron/const_data.ts b/base/sources/ts/const_data.ts similarity index 100% rename from base/sources/ts/iron/const_data.ts rename to base/sources/ts/const_data.ts diff --git a/base/sources/ts/iron/data.ts b/base/sources/ts/data.ts similarity index 100% rename from base/sources/ts/iron/data.ts rename to base/sources/ts/data.ts diff --git a/base/sources/ts/iron/input.ts b/base/sources/ts/input.ts similarity index 100% rename from base/sources/ts/iron/input.ts rename to base/sources/ts/input.ts diff --git a/base/sources/ts/iron/iron.ts b/base/sources/ts/iron.ts similarity index 100% rename from base/sources/ts/iron/iron.ts rename to base/sources/ts/iron.ts diff --git a/base/sources/ts/iron/lz4.ts b/base/sources/ts/lz4.ts similarity index 100% rename from base/sources/ts/iron/lz4.ts rename to base/sources/ts/lz4.ts diff --git a/base/sources/ts/iron/material_data.ts b/base/sources/ts/material_data.ts similarity index 100% rename from base/sources/ts/iron/material_data.ts rename to base/sources/ts/material_data.ts diff --git a/base/sources/ts/iron/mesh_data.ts b/base/sources/ts/mesh_data.ts similarity index 100% rename from base/sources/ts/iron/mesh_data.ts rename to base/sources/ts/mesh_data.ts diff --git a/base/sources/ts/iron/mesh_object.ts b/base/sources/ts/mesh_object.ts similarity index 100% rename from base/sources/ts/iron/mesh_object.ts rename to base/sources/ts/mesh_object.ts diff --git a/base/sources/ts/nodes/brush_output_node.ts b/base/sources/ts/nodes/brush_output_node.ts deleted file mode 100644 index e5891050..00000000 --- a/base/sources/ts/nodes/brush_output_node.ts +++ /dev/null @@ -1,11 +0,0 @@ - -function brush_output_node_create(raw: ui_node_t, args: f32_array_t): brush_output_node_t { - context_raw.run_brush = brush_output_node_run; - context_raw.parse_brush_inputs = brush_output_node_parse_inputs; - - let n: brush_output_node_t = {}; - n.base = logic_node_create(n); - n.raw = raw; - brush_output_node_create_ext(n); - return n; -} diff --git a/base/sources/ts/iron/object.ts b/base/sources/ts/object.ts similarity index 100% rename from base/sources/ts/iron/object.ts rename to base/sources/ts/object.ts diff --git a/base/sources/ts/iron/raycast.ts b/base/sources/ts/raycast.ts similarity index 100% rename from base/sources/ts/iron/raycast.ts rename to base/sources/ts/raycast.ts diff --git a/base/sources/ts/iron/render_path.ts b/base/sources/ts/render_path.ts similarity index 100% rename from base/sources/ts/iron/render_path.ts rename to base/sources/ts/render_path.ts diff --git a/base/sources/ts/iron/scene.ts b/base/sources/ts/scene.ts similarity index 100% rename from base/sources/ts/iron/scene.ts rename to base/sources/ts/scene.ts diff --git a/base/sources/ts/iron/shader_data.ts b/base/sources/ts/shader_data.ts similarity index 100% rename from base/sources/ts/iron/shader_data.ts rename to base/sources/ts/shader_data.ts diff --git a/base/sources/ts/iron/speaker_object.ts b/base/sources/ts/speaker_object.ts similarity index 100% rename from base/sources/ts/iron/speaker_object.ts rename to base/sources/ts/speaker_object.ts diff --git a/base/sources/ts/iron/sys.ts b/base/sources/ts/sys.ts similarity index 100% rename from base/sources/ts/iron/sys.ts rename to base/sources/ts/sys.ts diff --git a/base/sources/ts/iron/tilesheet.ts b/base/sources/ts/tilesheet.ts similarity index 100% rename from base/sources/ts/iron/tilesheet.ts rename to base/sources/ts/tilesheet.ts diff --git a/base/sources/ts/iron/transform.ts b/base/sources/ts/transform.ts similarity index 100% rename from base/sources/ts/iron/transform.ts rename to base/sources/ts/transform.ts diff --git a/base/sources/ts/iron/tween.ts b/base/sources/ts/tween.ts similarity index 100% rename from base/sources/ts/iron/tween.ts rename to base/sources/ts/tween.ts diff --git a/base/sources/ts/ui_header.ts b/base/sources/ts/ui_header.ts deleted file mode 100644 index 39e31542..00000000 --- a/base/sources/ts/ui_header.ts +++ /dev/null @@ -1,31 +0,0 @@ - -let ui_header_default_h: i32 = 28; -let ui_header_h: i32 = ui_header_default_h; -let ui_header_handle: ui_handle_t = ui_handle_create(); -let ui_header_worktab: ui_handle_t = ui_handle_create(); - -function ui_header_init() { - ui_header_handle.layout = ui_layout_t.HORIZONTAL; -} - -function ui_header_render_ui() { - if (config_raw.touch_ui) { - ui_header_h = ui_header_default_h + 6; - } - else { - ui_header_h = ui_header_default_h; - } - ui_header_h = math_floor(ui_header_h * UI_SCALE()); - - if (config_raw.layout[layout_size_t.HEADER] == 0) { - return; - } - - let nodesw: i32 = (ui_nodes_show || ui_view2d_show) ? config_raw.layout[layout_size_t.NODES_W] : 0; - let ww: i32 = iron_window_width() - ui_toolbar_w(true) - config_raw.layout[layout_size_t.SIDEBAR_W] - nodesw; - - if (ui_window(ui_header_handle, sys_x(), ui_header_h, ww, ui_header_h)) { - ui._y += 2; - ui_header_draw_tool_properties(); - } -} diff --git a/base/sources/ts/iron/uniforms.ts b/base/sources/ts/uniforms.ts similarity index 100% rename from base/sources/ts/iron/uniforms.ts rename to base/sources/ts/uniforms.ts diff --git a/base/sources/ts/iron/world_data.ts b/base/sources/ts/world_data.ts similarity index 100% rename from base/sources/ts/iron/world_data.ts rename to base/sources/ts/world_data.ts diff --git a/base/assets/Scene.arm b/paint/assets/Scene.arm similarity index 100% rename from base/assets/Scene.arm rename to paint/assets/Scene.arm diff --git a/base/assets/World_irradiance.arm b/paint/assets/World_irradiance.arm similarity index 100% rename from base/assets/World_irradiance.arm rename to paint/assets/World_irradiance.arm diff --git a/base/assets/World_radiance.hdr b/paint/assets/World_radiance.hdr similarity index 100% rename from base/assets/World_radiance.hdr rename to paint/assets/World_radiance.hdr diff --git a/base/assets/World_radiance_0.hdr b/paint/assets/World_radiance_0.hdr similarity index 100% rename from base/assets/World_radiance_0.hdr rename to paint/assets/World_radiance_0.hdr diff --git a/base/assets/World_radiance_1.hdr b/paint/assets/World_radiance_1.hdr similarity index 100% rename from base/assets/World_radiance_1.hdr rename to paint/assets/World_radiance_1.hdr diff --git a/base/assets/World_radiance_2.hdr b/paint/assets/World_radiance_2.hdr similarity index 100% rename from base/assets/World_radiance_2.hdr rename to paint/assets/World_radiance_2.hdr diff --git a/base/assets/World_radiance_3.hdr b/paint/assets/World_radiance_3.hdr similarity index 100% rename from base/assets/World_radiance_3.hdr rename to paint/assets/World_radiance_3.hdr diff --git a/base/assets/World_radiance_4.hdr b/paint/assets/World_radiance_4.hdr similarity index 100% rename from base/assets/World_radiance_4.hdr rename to paint/assets/World_radiance_4.hdr diff --git a/base/assets/plugins/autosave.js b/paint/assets/plugins/autosave.js similarity index 100% rename from base/assets/plugins/autosave.js rename to paint/assets/plugins/autosave.js diff --git a/base/assets/plugins/export_gpl.js b/paint/assets/plugins/export_gpl.js similarity index 100% rename from base/assets/plugins/export_gpl.js rename to paint/assets/plugins/export_gpl.js diff --git a/base/assets/plugins/import_gpl.js b/paint/assets/plugins/import_gpl.js similarity index 100% rename from base/assets/plugins/import_gpl.js rename to paint/assets/plugins/import_gpl.js diff --git a/base/assets/plugins/import_tiff.js b/paint/assets/plugins/import_tiff.js similarity index 100% rename from base/assets/plugins/import_tiff.js rename to paint/assets/plugins/import_tiff.js diff --git a/base/assets/plugins/import_txt.js b/paint/assets/plugins/import_txt.js similarity index 100% rename from base/assets/plugins/import_txt.js rename to paint/assets/plugins/import_txt.js diff --git a/base/assets/shader_datas.arm b/paint/assets/shader_datas.arm similarity index 100% rename from base/assets/shader_datas.arm rename to paint/assets/shader_datas.arm diff --git a/base/shaders/bloom_downsample_pass.kong b/paint/shaders/bloom_downsample_pass.kong similarity index 100% rename from base/shaders/bloom_downsample_pass.kong rename to paint/shaders/bloom_downsample_pass.kong diff --git a/base/shaders/bloom_upsample_pass.kong b/paint/shaders/bloom_upsample_pass.kong similarity index 100% rename from base/shaders/bloom_upsample_pass.kong rename to paint/shaders/bloom_upsample_pass.kong diff --git a/base/shaders/compositor_pass.kong b/paint/shaders/compositor_pass.kong similarity index 100% rename from base/shaders/compositor_pass.kong rename to paint/shaders/compositor_pass.kong diff --git a/base/shaders/copy_mrt3_pass.kong b/paint/shaders/copy_mrt3_pass.kong similarity index 100% rename from base/shaders/copy_mrt3_pass.kong rename to paint/shaders/copy_mrt3_pass.kong diff --git a/base/shaders/copy_pass.kong b/paint/shaders/copy_pass.kong similarity index 100% rename from base/shaders/copy_pass.kong rename to paint/shaders/copy_pass.kong diff --git a/base/shaders/cursor.kong b/paint/shaders/cursor.kong similarity index 100% rename from base/shaders/cursor.kong rename to paint/shaders/cursor.kong diff --git a/base/shaders/deferred_light.kong b/paint/shaders/deferred_light.kong similarity index 100% rename from base/shaders/deferred_light.kong rename to paint/shaders/deferred_light.kong diff --git a/base/shaders/histogram_pass.kong b/paint/shaders/histogram_pass.kong similarity index 100% rename from base/shaders/histogram_pass.kong rename to paint/shaders/histogram_pass.kong diff --git a/base/shaders/layer_copy.kong b/paint/shaders/layer_copy.kong similarity index 100% rename from base/shaders/layer_copy.kong rename to paint/shaders/layer_copy.kong diff --git a/base/shaders/layer_copy_bgra.kong b/paint/shaders/layer_copy_bgra.kong similarity index 100% rename from base/shaders/layer_copy_bgra.kong rename to paint/shaders/layer_copy_bgra.kong diff --git a/base/shaders/line.kong b/paint/shaders/line.kong similarity index 100% rename from base/shaders/line.kong rename to paint/shaders/line.kong diff --git a/base/shaders/line_overlay.kong b/paint/shaders/line_overlay.kong similarity index 100% rename from base/shaders/line_overlay.kong rename to paint/shaders/line_overlay.kong diff --git a/base/shaders/mask_apply.kong b/paint/shaders/mask_apply.kong similarity index 100% rename from base/shaders/mask_apply.kong rename to paint/shaders/mask_apply.kong diff --git a/base/shaders/mesh_poscol.kong b/paint/shaders/mesh_poscol.kong similarity index 100% rename from base/shaders/mesh_poscol.kong rename to paint/shaders/mesh_poscol.kong diff --git a/base/shaders/mesh_posnor.kong b/paint/shaders/mesh_posnor.kong similarity index 100% rename from base/shaders/mesh_posnor.kong rename to paint/shaders/mesh_posnor.kong diff --git a/base/shaders/mesh_posnortex.kong b/paint/shaders/mesh_posnortex.kong similarity index 100% rename from base/shaders/mesh_posnortex.kong rename to paint/shaders/mesh_posnortex.kong diff --git a/base/shaders/prefilter_envmap.kong b/paint/shaders/prefilter_envmap.kong similarity index 100% rename from base/shaders/prefilter_envmap.kong rename to paint/shaders/prefilter_envmap.kong diff --git a/base/shaders/ssao_blur_pass.kong b/paint/shaders/ssao_blur_pass.kong similarity index 100% rename from base/shaders/ssao_blur_pass.kong rename to paint/shaders/ssao_blur_pass.kong diff --git a/base/shaders/ssao_pass.kong b/paint/shaders/ssao_pass.kong similarity index 100% rename from base/shaders/ssao_pass.kong rename to paint/shaders/ssao_pass.kong diff --git a/base/shaders/supersample_resolve.kong b/paint/shaders/supersample_resolve.kong similarity index 100% rename from base/shaders/supersample_resolve.kong rename to paint/shaders/supersample_resolve.kong diff --git a/base/shaders/taa_pass.kong b/paint/shaders/taa_pass.kong similarity index 100% rename from base/shaders/taa_pass.kong rename to paint/shaders/taa_pass.kong diff --git a/base/shaders/world_pass.kong b/paint/shaders/world_pass.kong similarity index 100% rename from base/shaders/world_pass.kong rename to paint/shaders/world_pass.kong diff --git a/base/sources/ts/args.ts b/paint/sources/args.ts similarity index 100% rename from base/sources/ts/args.ts rename to paint/sources/args.ts diff --git a/base/sources/ts/base.ts b/paint/sources/base.ts similarity index 97% rename from base/sources/ts/base.ts rename to paint/sources/base.ts index 3e608438..8d47f1bc 100644 --- a/base/sources/ts/base.ts +++ b/paint/sources/base.ts @@ -783,3 +783,37 @@ function base_init_config() { base_ext_init_config(raw); } + + +function base_ext_init() { +} + +function base_ext_render() { + if (context_raw.frame == 2) { + util_render_make_material_preview(); + ui_base_hwnds[tab_area_t.SIDEBAR1].redraws = 2; + + base_init_undo_layers(); + } + + if (context_raw.tool == tool_type_t.GIZMO) { + sim_init(); + sim_update(); + } +} + +function base_ext_init_config(raw: config_t) { + +} + +function base_ext_update() { + if (context_raw.tool == tool_type_t.GIZMO) { + if (keyboard_down("control") && keyboard_started("d")) { + sim_duplicate(); + } + + if (keyboard_started("delete")) { + sim_delete(); + } + } +} diff --git a/paint/sources/base_ext.ts b/paint/sources/base_ext.ts deleted file mode 100644 index 4b75909c..00000000 --- a/paint/sources/base_ext.ts +++ /dev/null @@ -1,33 +0,0 @@ - -function base_ext_init() { -} - -function base_ext_render() { - if (context_raw.frame == 2) { - util_render_make_material_preview(); - ui_base_hwnds[tab_area_t.SIDEBAR1].redraws = 2; - - base_init_undo_layers(); - } - - if (context_raw.tool == tool_type_t.GIZMO) { - sim_init(); - sim_update(); - } -} - -function base_ext_init_config(raw: config_t) { - -} - -function base_ext_update() { - if (context_raw.tool == tool_type_t.GIZMO) { - if (keyboard_down("control") && keyboard_started("d")) { - sim_duplicate(); - } - - if (keyboard_started("delete")) { - sim_delete(); - } - } -} diff --git a/base/sources/ts/box_export.ts b/paint/sources/box_export.ts similarity index 100% rename from base/sources/ts/box_export.ts rename to paint/sources/box_export.ts diff --git a/base/sources/ts/box_preferences.ts b/paint/sources/box_preferences.ts similarity index 100% rename from base/sources/ts/box_preferences.ts rename to paint/sources/box_preferences.ts diff --git a/base/sources/ts/box_projects.ts b/paint/sources/box_projects.ts similarity index 100% rename from base/sources/ts/box_projects.ts rename to paint/sources/box_projects.ts diff --git a/base/sources/ts/nodes/boolean_node.ts b/paint/sources/brush_nodes/boolean_node.ts similarity index 100% rename from base/sources/ts/nodes/boolean_node.ts rename to paint/sources/brush_nodes/boolean_node.ts diff --git a/paint/sources/brush_nodes/brush_output_node_ext.ts b/paint/sources/brush_nodes/brush_output_node.ts similarity index 95% rename from paint/sources/brush_nodes/brush_output_node_ext.ts rename to paint/sources/brush_nodes/brush_output_node.ts index f16b3a85..a00ec8c4 100644 --- a/paint/sources/brush_nodes/brush_output_node_ext.ts +++ b/paint/sources/brush_nodes/brush_output_node.ts @@ -1,4 +1,16 @@ +function brush_output_node_create(raw: ui_node_t, args: f32_array_t): brush_output_node_t { + context_raw.run_brush = brush_output_node_run; + context_raw.parse_brush_inputs = brush_output_node_parse_inputs; + + let n: brush_output_node_t = {}; + n.base = logic_node_create(n); + n.raw = raw; + brush_output_node_create_ext(n); + return n; +} + + type brush_output_node_t = { base?: logic_node_t; raw?: ui_node_t; @@ -277,3 +289,4 @@ function brush_output_paint(self: brush_output_node_t) { // ], // width: 0 // }; + diff --git a/base/sources/ts/nodes/color_node.ts b/paint/sources/brush_nodes/color_node.ts similarity index 100% rename from base/sources/ts/nodes/color_node.ts rename to paint/sources/brush_nodes/color_node.ts diff --git a/base/sources/ts/nodes/float_node.ts b/paint/sources/brush_nodes/float_node.ts similarity index 100% rename from base/sources/ts/nodes/float_node.ts rename to paint/sources/brush_nodes/float_node.ts diff --git a/base/sources/ts/nodes/integer_node.ts b/paint/sources/brush_nodes/integer_node.ts similarity index 100% rename from base/sources/ts/nodes/integer_node.ts rename to paint/sources/brush_nodes/integer_node.ts diff --git a/base/sources/ts/nodes/math_node.ts b/paint/sources/brush_nodes/math_node.ts similarity index 100% rename from base/sources/ts/nodes/math_node.ts rename to paint/sources/brush_nodes/math_node.ts diff --git a/base/sources/ts/nodes/null_node.ts b/paint/sources/brush_nodes/null_node.ts similarity index 100% rename from base/sources/ts/nodes/null_node.ts rename to paint/sources/brush_nodes/null_node.ts diff --git a/base/sources/ts/nodes/random_node.ts b/paint/sources/brush_nodes/random_node.ts similarity index 100% rename from base/sources/ts/nodes/random_node.ts rename to paint/sources/brush_nodes/random_node.ts diff --git a/base/sources/ts/nodes/separate_vector_node.ts b/paint/sources/brush_nodes/separate_vector_node.ts similarity index 100% rename from base/sources/ts/nodes/separate_vector_node.ts rename to paint/sources/brush_nodes/separate_vector_node.ts diff --git a/base/sources/ts/nodes/string_node.ts b/paint/sources/brush_nodes/string_node.ts similarity index 100% rename from base/sources/ts/nodes/string_node.ts rename to paint/sources/brush_nodes/string_node.ts diff --git a/base/sources/ts/nodes/time_node.ts b/paint/sources/brush_nodes/time_node.ts similarity index 100% rename from base/sources/ts/nodes/time_node.ts rename to paint/sources/brush_nodes/time_node.ts diff --git a/base/sources/ts/nodes/vector_math_node.ts b/paint/sources/brush_nodes/vector_math_node.ts similarity index 100% rename from base/sources/ts/nodes/vector_math_node.ts rename to paint/sources/brush_nodes/vector_math_node.ts diff --git a/base/sources/ts/nodes/vector_node.ts b/paint/sources/brush_nodes/vector_node.ts similarity index 100% rename from base/sources/ts/nodes/vector_node.ts rename to paint/sources/brush_nodes/vector_node.ts diff --git a/base/sources/ts/camera.ts b/paint/sources/camera.ts similarity index 100% rename from base/sources/ts/camera.ts rename to paint/sources/camera.ts diff --git a/base/sources/ts/compass.ts b/paint/sources/compass.ts similarity index 100% rename from base/sources/ts/compass.ts rename to paint/sources/compass.ts diff --git a/base/sources/ts/config.ts b/paint/sources/config.ts similarity index 100% rename from base/sources/ts/config.ts rename to paint/sources/config.ts diff --git a/base/sources/ts/console.ts b/paint/sources/console.ts similarity index 100% rename from base/sources/ts/console.ts rename to paint/sources/console.ts diff --git a/base/sources/ts/context.ts b/paint/sources/context.ts similarity index 95% rename from base/sources/ts/context.ts rename to paint/sources/context.ts index 2a3870aa..34d73fc6 100644 --- a/base/sources/ts/context.ts +++ b/paint/sources/context.ts @@ -775,3 +775,39 @@ function context_enable_import_plugin(file: string): bool { function context_set_swatch(s: swatch_color_t) { context_raw.swatch = s; } + + +function context_ext_init(c: context_t) { + c.tool = tool_type_t.BRUSH; + c.color_picker_previous_tool = tool_type_t.BRUSH; + c.brush_radius = 0.5; + c.brush_radius_handle.value = 0.5; + c.brush_hardness = 0.8; +} + +function context_ext_select_paint_object(o: mesh_object_t) { + ui_header_handle.redraws = 2; + for (let i: i32 = 0; i < project_paint_objects.length; ++i) { + let p: mesh_object_t = project_paint_objects[i]; + p.skip_context = "paint"; + } + + ///if_forge + context_raw.paint_object.skip_context = ""; + ///end + + context_raw.paint_object = o; + + let mask: i32 = slot_layer_get_object_mask(context_raw.layer); + if (context_layer_filter_used()) { + mask = context_raw.layer_filter; + } + + if (context_raw.merged_object == null || mask > 0) { + context_raw.paint_object.skip_context = ""; + } + util_uv_uvmap_cached = false; + util_uv_trianglemap_cached = false; + util_uv_dilatemap_cached = false; +} + diff --git a/paint/sources/context_ext.ts b/paint/sources/context_ext.ts deleted file mode 100644 index 2b72ce84..00000000 --- a/paint/sources/context_ext.ts +++ /dev/null @@ -1,34 +0,0 @@ - -function context_ext_init(c: context_t) { - c.tool = tool_type_t.BRUSH; - c.color_picker_previous_tool = tool_type_t.BRUSH; - c.brush_radius = 0.5; - c.brush_radius_handle.value = 0.5; - c.brush_hardness = 0.8; -} - -function context_ext_select_paint_object(o: mesh_object_t) { - ui_header_handle.redraws = 2; - for (let i: i32 = 0; i < project_paint_objects.length; ++i) { - let p: mesh_object_t = project_paint_objects[i]; - p.skip_context = "paint"; - } - - ///if_forge - context_raw.paint_object.skip_context = ""; - ///end - - context_raw.paint_object = o; - - let mask: i32 = slot_layer_get_object_mask(context_raw.layer); - if (context_layer_filter_used()) { - mask = context_raw.layer_filter; - } - - if (context_raw.merged_object == null || mask > 0) { - context_raw.paint_object.skip_context = ""; - } - util_uv_uvmap_cached = false; - util_uv_trianglemap_cached = false; - util_uv_dilatemap_cached = false; -} diff --git a/base/sources/ts/enums.ts b/paint/sources/enums.ts similarity index 100% rename from base/sources/ts/enums.ts rename to paint/sources/enums.ts diff --git a/base/sources/ts/export_arm.ts b/paint/sources/export_arm.ts similarity index 100% rename from base/sources/ts/export_arm.ts rename to paint/sources/export_arm.ts diff --git a/base/sources/ts/export_mesh.ts b/paint/sources/export_mesh.ts similarity index 100% rename from base/sources/ts/export_mesh.ts rename to paint/sources/export_mesh.ts diff --git a/base/sources/ts/export_obj.ts b/paint/sources/export_obj.ts similarity index 100% rename from base/sources/ts/export_obj.ts rename to paint/sources/export_obj.ts diff --git a/base/sources/ts/export_texture.ts b/paint/sources/export_texture.ts similarity index 100% rename from base/sources/ts/export_texture.ts rename to paint/sources/export_texture.ts diff --git a/base/sources/ts/file.ts b/paint/sources/file.ts similarity index 100% rename from base/sources/ts/file.ts rename to paint/sources/file.ts diff --git a/base/sources/ts/geom.ts b/paint/sources/geom.ts similarity index 100% rename from base/sources/ts/geom.ts rename to paint/sources/geom.ts diff --git a/base/sources/ts/gizmo.ts b/paint/sources/gizmo.ts similarity index 100% rename from base/sources/ts/gizmo.ts rename to paint/sources/gizmo.ts diff --git a/base/sources/ts/history.ts b/paint/sources/history.ts similarity index 100% rename from base/sources/ts/history.ts rename to paint/sources/history.ts diff --git a/base/sources/ts/import_arm.ts b/paint/sources/import_arm.ts similarity index 100% rename from base/sources/ts/import_arm.ts rename to paint/sources/import_arm.ts diff --git a/base/sources/ts/import_asset.ts b/paint/sources/import_asset.ts similarity index 100% rename from base/sources/ts/import_asset.ts rename to paint/sources/import_asset.ts diff --git a/base/sources/ts/import_blend_material.ts b/paint/sources/import_blend_material.ts similarity index 100% rename from base/sources/ts/import_blend_material.ts rename to paint/sources/import_blend_material.ts diff --git a/base/sources/ts/import_blend_mesh.ts b/paint/sources/import_blend_mesh.ts similarity index 100% rename from base/sources/ts/import_blend_mesh.ts rename to paint/sources/import_blend_mesh.ts diff --git a/base/sources/ts/import_envmap.ts b/paint/sources/import_envmap.ts similarity index 100% rename from base/sources/ts/import_envmap.ts rename to paint/sources/import_envmap.ts diff --git a/base/sources/ts/import_folder.ts b/paint/sources/import_folder.ts similarity index 100% rename from base/sources/ts/import_folder.ts rename to paint/sources/import_folder.ts diff --git a/base/sources/ts/import_font.ts b/paint/sources/import_font.ts similarity index 100% rename from base/sources/ts/import_font.ts rename to paint/sources/import_font.ts diff --git a/base/sources/ts/import_keymap.ts b/paint/sources/import_keymap.ts similarity index 100% rename from base/sources/ts/import_keymap.ts rename to paint/sources/import_keymap.ts diff --git a/base/sources/ts/import_mesh.ts b/paint/sources/import_mesh.ts similarity index 100% rename from base/sources/ts/import_mesh.ts rename to paint/sources/import_mesh.ts diff --git a/base/sources/ts/import_obj.ts b/paint/sources/import_obj.ts similarity index 100% rename from base/sources/ts/import_obj.ts rename to paint/sources/import_obj.ts diff --git a/base/sources/ts/import_plugin.ts b/paint/sources/import_plugin.ts similarity index 100% rename from base/sources/ts/import_plugin.ts rename to paint/sources/import_plugin.ts diff --git a/base/sources/ts/import_texture.ts b/paint/sources/import_texture.ts similarity index 100% rename from base/sources/ts/import_texture.ts rename to paint/sources/import_texture.ts diff --git a/base/sources/ts/import_theme.ts b/paint/sources/import_theme.ts similarity index 100% rename from base/sources/ts/import_theme.ts rename to paint/sources/import_theme.ts diff --git a/base/sources/ts/keymap.ts b/paint/sources/keymap.ts similarity index 100% rename from base/sources/ts/keymap.ts rename to paint/sources/keymap.ts diff --git a/base/sources/ts/layers.ts b/paint/sources/layers.ts similarity index 80% rename from base/sources/ts/layers.ts rename to paint/sources/layers.ts index b8610700..1de05b8e 100644 --- a/base/sources/ts/layers.ts +++ b/paint/sources/layers.ts @@ -757,3 +757,187 @@ function layers_flatten(height_to_normal: bool = false, layers: slot_layer_t[] = function layers_on_resized() { layers_ext_on_resized(); } + + +function layers_ext_flatten(height_to_normal: bool = false, layers: slot_layer_t[] = null): slot_layer_t { + if (layers == null) { + layers = project_layers; + } + layers_make_temp_img(); + layers_make_export_img(); + + let empty_rt: render_target_t = map_get(render_path_render_targets, "empty_white"); + let empty: gpu_texture_t = empty_rt._image; + + // Clear export layer + _gpu_begin(layers_expa, null, null, clear_flag_t.COLOR, color_from_floats(0.0, 0.0, 0.0, 0.0)); + gpu_end(); + _gpu_begin(layers_expb, null, null, clear_flag_t.COLOR, color_from_floats(0.5, 0.5, 1.0, 0.0)); + gpu_end(); + _gpu_begin(layers_expc, null, null, clear_flag_t.COLOR, color_from_floats(1.0, 0.0, 0.0, 0.0)); + gpu_end(); + + // Flatten layers + for (let i: i32 = 0; i < layers.length; ++i) { + let l1: slot_layer_t = layers[i]; + if (!slot_layer_is_visible(l1)) { + continue; + } + if (!slot_layer_is_layer(l1)) { + continue; + } + + let mask: gpu_texture_t = empty; + let l1masks: slot_layer_t[] = slot_layer_get_masks(l1); + if (l1masks != null) { + if (l1masks.length > 1) { + layers_make_temp_mask_img(); + draw_begin(pipes_temp_mask_image, clear_flag_t.COLOR, 0x00000000); + draw_end(); + let l1: slot_layer_t = { texpaint: pipes_temp_mask_image }; + for (let i: i32 = 0; i < l1masks.length; ++i) { + layers_merge_layer(l1, l1masks[i]); + } + mask = pipes_temp_mask_image; + } + else { + mask = l1masks[0].texpaint; + } + } + + if (l1.paint_base) { + draw_begin(layers_temp_image); // Copy to temp + draw_set_pipeline(pipes_copy); + draw_image(layers_expa, 0, 0); + draw_set_pipeline(null); + draw_end(); + + if (context_raw.tool == tool_type_t.GIZMO) { + // Do not multiply basecol by alpha + draw_begin(layers_expa); // Copy to temp + draw_set_pipeline(pipes_copy); + draw_image(l1.texpaint, 0, 0); + draw_set_pipeline(null); + draw_end(); + } + else { + _gpu_begin(layers_expa); + gpu_set_pipeline(pipes_merge); + gpu_set_texture(pipes_tex0, l1.texpaint); + gpu_set_texture(pipes_tex1, empty); + gpu_set_texture(pipes_texmask, mask); + gpu_set_texture(pipes_texa, layers_temp_image); + gpu_set_float(pipes_opac, slot_layer_get_opacity(l1)); + gpu_set_float(pipes_tex1w, empty.width); + gpu_set_int(pipes_blending, layers.length > 1 ? l1.blending : 0); + gpu_set_vertex_buffer(const_data_screen_aligned_vb); + gpu_set_index_buffer(const_data_screen_aligned_ib); + gpu_draw(); + gpu_end(); + } + } + + if (l1.paint_nor) { + draw_begin(layers_temp_image); + draw_set_pipeline(pipes_copy); + draw_image(layers_expb, 0, 0); + draw_set_pipeline(null); + draw_end(); + + _gpu_begin(layers_expb); + gpu_set_pipeline(pipes_merge); + gpu_set_texture(pipes_tex0, l1.texpaint); + gpu_set_texture(pipes_tex1, l1.texpaint_nor); + gpu_set_texture(pipes_texmask, mask); + gpu_set_texture(pipes_texa, layers_temp_image); + gpu_set_float(pipes_opac, slot_layer_get_opacity(l1)); + gpu_set_float(pipes_tex1w, l1.texpaint_nor.width); + gpu_set_int(pipes_blending, l1.paint_nor_blend ? 102 : 101); + gpu_set_vertex_buffer(const_data_screen_aligned_vb); + gpu_set_index_buffer(const_data_screen_aligned_ib); + gpu_draw(); + gpu_end(); + } + + if (l1.paint_occ || l1.paint_rough || l1.paint_met || l1.paint_height) { + draw_begin(layers_temp_image); + draw_set_pipeline(pipes_copy); + draw_image(layers_expc, 0, 0); + draw_set_pipeline(null); + draw_end(); + + if (l1.paint_occ && l1.paint_rough && l1.paint_met && l1.paint_height) { + layers_commands_merge_pack(pipes_merge, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask, l1.paint_height_blend ? 103 : 101); + } + else { + if (l1.paint_occ) { + layers_commands_merge_pack(pipes_merge_r, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask); + } + if (l1.paint_rough) { + layers_commands_merge_pack(pipes_merge_g, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask); + } + if (l1.paint_met) { + layers_commands_merge_pack(pipes_merge_b, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask); + } + } + } + } + + let l0: slot_layer_t = { + texpaint: layers_expa, + texpaint_nor: layers_expb, + texpaint_pack: layers_expc + }; + + // Merge height map into normal map + if (height_to_normal && make_material_height_used) { + + draw_begin(layers_temp_image); + draw_set_pipeline(pipes_copy); + draw_image(l0.texpaint_nor, 0, 0); + draw_set_pipeline(null); + draw_end(); + + _gpu_begin(l0.texpaint_nor); + gpu_set_pipeline(pipes_merge); + gpu_set_texture(pipes_tex0, layers_temp_image); + gpu_set_texture(pipes_tex1, l0.texpaint_pack); + gpu_set_texture(pipes_texmask, empty); + gpu_set_texture(pipes_texa, empty); + gpu_set_float(pipes_opac, 1.0); + gpu_set_float(pipes_tex1w, l0.texpaint_pack.width); + gpu_set_int(pipes_blending, 104); + gpu_set_vertex_buffer(const_data_screen_aligned_vb); + gpu_set_index_buffer(const_data_screen_aligned_ib); + gpu_draw(); + gpu_end(); + } + + return l0; +} + +function layers_ext_on_resized() { + sys_notify_on_next_frame(function () { + layers_resize(); + let _layer: slot_layer_t = context_raw.layer; + let _material: slot_material_t = context_raw.material; + for (let i: i32 = 0; i < project_layers.length; ++i) { + let l: slot_layer_t = project_layers[i]; + if (l.fill_layer != null) { + context_raw.layer = l; + context_raw.material = l.fill_layer; + layers_update_fill_layer(); + } + } + context_raw.layer = _layer; + context_raw.material = _material; + make_material_parse_paint_material(); + }); + util_uv_uvmap = null; + util_uv_uvmap_cached = false; + util_uv_trianglemap = null; + util_uv_trianglemap_cached = false; + util_uv_dilatemap_cached = false; + render_path_raytrace_ready = false; +} + diff --git a/paint/sources/layers_ext.ts b/paint/sources/layers_ext.ts deleted file mode 100644 index 2206d4bb..00000000 --- a/paint/sources/layers_ext.ts +++ /dev/null @@ -1,182 +0,0 @@ - -function layers_ext_flatten(height_to_normal: bool = false, layers: slot_layer_t[] = null): slot_layer_t { - if (layers == null) { - layers = project_layers; - } - layers_make_temp_img(); - layers_make_export_img(); - - let empty_rt: render_target_t = map_get(render_path_render_targets, "empty_white"); - let empty: gpu_texture_t = empty_rt._image; - - // Clear export layer - _gpu_begin(layers_expa, null, null, clear_flag_t.COLOR, color_from_floats(0.0, 0.0, 0.0, 0.0)); - gpu_end(); - _gpu_begin(layers_expb, null, null, clear_flag_t.COLOR, color_from_floats(0.5, 0.5, 1.0, 0.0)); - gpu_end(); - _gpu_begin(layers_expc, null, null, clear_flag_t.COLOR, color_from_floats(1.0, 0.0, 0.0, 0.0)); - gpu_end(); - - // Flatten layers - for (let i: i32 = 0; i < layers.length; ++i) { - let l1: slot_layer_t = layers[i]; - if (!slot_layer_is_visible(l1)) { - continue; - } - if (!slot_layer_is_layer(l1)) { - continue; - } - - let mask: gpu_texture_t = empty; - let l1masks: slot_layer_t[] = slot_layer_get_masks(l1); - if (l1masks != null) { - if (l1masks.length > 1) { - layers_make_temp_mask_img(); - draw_begin(pipes_temp_mask_image, clear_flag_t.COLOR, 0x00000000); - draw_end(); - let l1: slot_layer_t = { texpaint: pipes_temp_mask_image }; - for (let i: i32 = 0; i < l1masks.length; ++i) { - layers_merge_layer(l1, l1masks[i]); - } - mask = pipes_temp_mask_image; - } - else { - mask = l1masks[0].texpaint; - } - } - - if (l1.paint_base) { - draw_begin(layers_temp_image); // Copy to temp - draw_set_pipeline(pipes_copy); - draw_image(layers_expa, 0, 0); - draw_set_pipeline(null); - draw_end(); - - if (context_raw.tool == tool_type_t.GIZMO) { - // Do not multiply basecol by alpha - draw_begin(layers_expa); // Copy to temp - draw_set_pipeline(pipes_copy); - draw_image(l1.texpaint, 0, 0); - draw_set_pipeline(null); - draw_end(); - } - else { - _gpu_begin(layers_expa); - gpu_set_pipeline(pipes_merge); - gpu_set_texture(pipes_tex0, l1.texpaint); - gpu_set_texture(pipes_tex1, empty); - gpu_set_texture(pipes_texmask, mask); - gpu_set_texture(pipes_texa, layers_temp_image); - gpu_set_float(pipes_opac, slot_layer_get_opacity(l1)); - gpu_set_float(pipes_tex1w, empty.width); - gpu_set_int(pipes_blending, layers.length > 1 ? l1.blending : 0); - gpu_set_vertex_buffer(const_data_screen_aligned_vb); - gpu_set_index_buffer(const_data_screen_aligned_ib); - gpu_draw(); - gpu_end(); - } - } - - if (l1.paint_nor) { - draw_begin(layers_temp_image); - draw_set_pipeline(pipes_copy); - draw_image(layers_expb, 0, 0); - draw_set_pipeline(null); - draw_end(); - - _gpu_begin(layers_expb); - gpu_set_pipeline(pipes_merge); - gpu_set_texture(pipes_tex0, l1.texpaint); - gpu_set_texture(pipes_tex1, l1.texpaint_nor); - gpu_set_texture(pipes_texmask, mask); - gpu_set_texture(pipes_texa, layers_temp_image); - gpu_set_float(pipes_opac, slot_layer_get_opacity(l1)); - gpu_set_float(pipes_tex1w, l1.texpaint_nor.width); - gpu_set_int(pipes_blending, l1.paint_nor_blend ? 102 : 101); - gpu_set_vertex_buffer(const_data_screen_aligned_vb); - gpu_set_index_buffer(const_data_screen_aligned_ib); - gpu_draw(); - gpu_end(); - } - - if (l1.paint_occ || l1.paint_rough || l1.paint_met || l1.paint_height) { - draw_begin(layers_temp_image); - draw_set_pipeline(pipes_copy); - draw_image(layers_expc, 0, 0); - draw_set_pipeline(null); - draw_end(); - - if (l1.paint_occ && l1.paint_rough && l1.paint_met && l1.paint_height) { - layers_commands_merge_pack(pipes_merge, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask, l1.paint_height_blend ? 103 : 101); - } - else { - if (l1.paint_occ) { - layers_commands_merge_pack(pipes_merge_r, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask); - } - if (l1.paint_rough) { - layers_commands_merge_pack(pipes_merge_g, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask); - } - if (l1.paint_met) { - layers_commands_merge_pack(pipes_merge_b, layers_expc, l1.texpaint, l1.texpaint_pack, slot_layer_get_opacity(l1), mask); - } - } - } - } - - let l0: slot_layer_t = { - texpaint: layers_expa, - texpaint_nor: layers_expb, - texpaint_pack: layers_expc - }; - - // Merge height map into normal map - if (height_to_normal && make_material_height_used) { - - draw_begin(layers_temp_image); - draw_set_pipeline(pipes_copy); - draw_image(l0.texpaint_nor, 0, 0); - draw_set_pipeline(null); - draw_end(); - - _gpu_begin(l0.texpaint_nor); - gpu_set_pipeline(pipes_merge); - gpu_set_texture(pipes_tex0, layers_temp_image); - gpu_set_texture(pipes_tex1, l0.texpaint_pack); - gpu_set_texture(pipes_texmask, empty); - gpu_set_texture(pipes_texa, empty); - gpu_set_float(pipes_opac, 1.0); - gpu_set_float(pipes_tex1w, l0.texpaint_pack.width); - gpu_set_int(pipes_blending, 104); - gpu_set_vertex_buffer(const_data_screen_aligned_vb); - gpu_set_index_buffer(const_data_screen_aligned_ib); - gpu_draw(); - gpu_end(); - } - - return l0; -} - -function layers_ext_on_resized() { - sys_notify_on_next_frame(function () { - layers_resize(); - let _layer: slot_layer_t = context_raw.layer; - let _material: slot_material_t = context_raw.material; - for (let i: i32 = 0; i < project_layers.length; ++i) { - let l: slot_layer_t = project_layers[i]; - if (l.fill_layer != null) { - context_raw.layer = l; - context_raw.material = l.fill_layer; - layers_update_fill_layer(); - } - } - context_raw.layer = _layer; - context_raw.material = _material; - make_material_parse_paint_material(); - }); - util_uv_uvmap = null; - util_uv_uvmap_cached = false; - util_uv_trianglemap = null; - util_uv_trianglemap_cached = false; - util_uv_dilatemap_cached = false; - render_path_raytrace_ready = false; -} diff --git a/base/sources/ts/line_draw.ts b/paint/sources/line_draw.ts similarity index 100% rename from base/sources/ts/line_draw.ts rename to paint/sources/line_draw.ts diff --git a/base/sources/ts/logic_node.ts b/paint/sources/logic_node.ts similarity index 100% rename from base/sources/ts/logic_node.ts rename to paint/sources/logic_node.ts diff --git a/base/sources/ts/main.ts b/paint/sources/main.ts similarity index 100% rename from base/sources/ts/main.ts rename to paint/sources/main.ts diff --git a/base/sources/ts/node_shader.ts b/paint/sources/node_shader.ts similarity index 100% rename from base/sources/ts/node_shader.ts rename to paint/sources/node_shader.ts diff --git a/base/sources/ts/node_shader_context.ts b/paint/sources/node_shader_context.ts similarity index 100% rename from base/sources/ts/node_shader_context.ts rename to paint/sources/node_shader_context.ts diff --git a/base/sources/ts/nodes_material.ts b/paint/sources/nodes_material.ts similarity index 100% rename from base/sources/ts/nodes_material.ts rename to paint/sources/nodes_material.ts diff --git a/base/sources/ts/operator.ts b/paint/sources/operator.ts similarity index 100% rename from base/sources/ts/operator.ts rename to paint/sources/operator.ts diff --git a/base/sources/ts/parser_exr.ts b/paint/sources/parser_exr.ts similarity index 100% rename from base/sources/ts/parser_exr.ts rename to paint/sources/parser_exr.ts diff --git a/base/sources/ts/parser_logic.ts b/paint/sources/parser_logic.ts similarity index 100% rename from base/sources/ts/parser_logic.ts rename to paint/sources/parser_logic.ts diff --git a/base/sources/ts/parser_material.ts b/paint/sources/parser_material.ts similarity index 100% rename from base/sources/ts/parser_material.ts rename to paint/sources/parser_material.ts diff --git a/base/sources/ts/path.ts b/paint/sources/path.ts similarity index 100% rename from base/sources/ts/path.ts rename to paint/sources/path.ts diff --git a/base/sources/ts/physics_body.ts b/paint/sources/physics_body.ts similarity index 100% rename from base/sources/ts/physics_body.ts rename to paint/sources/physics_body.ts diff --git a/base/sources/ts/physics_world.ts b/paint/sources/physics_world.ts similarity index 100% rename from base/sources/ts/physics_world.ts rename to paint/sources/physics_world.ts diff --git a/base/sources/ts/pipes.ts b/paint/sources/pipes.ts similarity index 100% rename from base/sources/ts/pipes.ts rename to paint/sources/pipes.ts diff --git a/base/sources/ts/plugin.ts b/paint/sources/plugin.ts similarity index 100% rename from base/sources/ts/plugin.ts rename to paint/sources/plugin.ts diff --git a/base/sources/ts/project.ts b/paint/sources/project.ts similarity index 100% rename from base/sources/ts/project.ts rename to paint/sources/project.ts diff --git a/base/sources/ts/render_path_base.ts b/paint/sources/render_path_base.ts similarity index 100% rename from base/sources/ts/render_path_base.ts rename to paint/sources/render_path_base.ts diff --git a/base/sources/ts/render_path_deferred.ts b/paint/sources/render_path_deferred.ts similarity index 100% rename from base/sources/ts/render_path_deferred.ts rename to paint/sources/render_path_deferred.ts diff --git a/base/sources/ts/render_path_forward.ts b/paint/sources/render_path_forward.ts similarity index 100% rename from base/sources/ts/render_path_forward.ts rename to paint/sources/render_path_forward.ts diff --git a/base/sources/ts/render_path_preview.ts b/paint/sources/render_path_preview.ts similarity index 100% rename from base/sources/ts/render_path_preview.ts rename to paint/sources/render_path_preview.ts diff --git a/base/sources/ts/render_path_raytrace.ts b/paint/sources/render_path_raytrace.ts similarity index 100% rename from base/sources/ts/render_path_raytrace.ts rename to paint/sources/render_path_raytrace.ts diff --git a/base/sources/ts/render_path_raytrace_bake.ts b/paint/sources/render_path_raytrace_bake.ts similarity index 100% rename from base/sources/ts/render_path_raytrace_bake.ts rename to paint/sources/render_path_raytrace_bake.ts diff --git a/base/sources/ts/resource.ts b/paint/sources/resource.ts similarity index 100% rename from base/sources/ts/resource.ts rename to paint/sources/resource.ts diff --git a/base/sources/ts/slot_brush.ts b/paint/sources/slot_brush.ts similarity index 100% rename from base/sources/ts/slot_brush.ts rename to paint/sources/slot_brush.ts diff --git a/base/sources/ts/slot_font.ts b/paint/sources/slot_font.ts similarity index 100% rename from base/sources/ts/slot_font.ts rename to paint/sources/slot_font.ts diff --git a/base/sources/ts/slot_layer.ts b/paint/sources/slot_layer.ts similarity index 100% rename from base/sources/ts/slot_layer.ts rename to paint/sources/slot_layer.ts diff --git a/base/sources/ts/slot_material.ts b/paint/sources/slot_material.ts similarity index 100% rename from base/sources/ts/slot_material.ts rename to paint/sources/slot_material.ts diff --git a/base/sources/ts/strings.ts b/paint/sources/strings.ts similarity index 100% rename from base/sources/ts/strings.ts rename to paint/sources/strings.ts diff --git a/base/sources/ts/tab_browser.ts b/paint/sources/tab_browser.ts similarity index 100% rename from base/sources/ts/tab_browser.ts rename to paint/sources/tab_browser.ts diff --git a/base/sources/ts/tab_brushes.ts b/paint/sources/tab_brushes.ts similarity index 100% rename from base/sources/ts/tab_brushes.ts rename to paint/sources/tab_brushes.ts diff --git a/base/sources/ts/tab_console.ts b/paint/sources/tab_console.ts similarity index 100% rename from base/sources/ts/tab_console.ts rename to paint/sources/tab_console.ts diff --git a/base/sources/ts/tab_fonts.ts b/paint/sources/tab_fonts.ts similarity index 100% rename from base/sources/ts/tab_fonts.ts rename to paint/sources/tab_fonts.ts diff --git a/base/sources/ts/tab_history.ts b/paint/sources/tab_history.ts similarity index 100% rename from base/sources/ts/tab_history.ts rename to paint/sources/tab_history.ts diff --git a/base/sources/ts/tab_layers.ts b/paint/sources/tab_layers.ts similarity index 100% rename from base/sources/ts/tab_layers.ts rename to paint/sources/tab_layers.ts diff --git a/base/sources/ts/tab_materials.ts b/paint/sources/tab_materials.ts similarity index 100% rename from base/sources/ts/tab_materials.ts rename to paint/sources/tab_materials.ts diff --git a/base/sources/ts/tab_meshes.ts b/paint/sources/tab_meshes.ts similarity index 100% rename from base/sources/ts/tab_meshes.ts rename to paint/sources/tab_meshes.ts diff --git a/base/sources/ts/tab_plugins.ts b/paint/sources/tab_plugins.ts similarity index 100% rename from base/sources/ts/tab_plugins.ts rename to paint/sources/tab_plugins.ts diff --git a/base/sources/ts/tab_scripts.ts b/paint/sources/tab_scripts.ts similarity index 100% rename from base/sources/ts/tab_scripts.ts rename to paint/sources/tab_scripts.ts diff --git a/base/sources/ts/tab_swatches.ts b/paint/sources/tab_swatches.ts similarity index 100% rename from base/sources/ts/tab_swatches.ts rename to paint/sources/tab_swatches.ts diff --git a/base/sources/ts/tab_textures.ts b/paint/sources/tab_textures.ts similarity index 100% rename from base/sources/ts/tab_textures.ts rename to paint/sources/tab_textures.ts diff --git a/base/sources/ts/translator.ts b/paint/sources/translator.ts similarity index 100% rename from base/sources/ts/translator.ts rename to paint/sources/translator.ts diff --git a/base/sources/ts/ui_base.ts b/paint/sources/ui_base.ts similarity index 98% rename from base/sources/ts/ui_base.ts rename to paint/sources/ui_base.ts index 2c064923..b956e8b3 100644 --- a/base/sources/ts/ui_base.ts +++ b/paint/sources/ui_base.ts @@ -1472,3 +1472,35 @@ function ui_base_set_viewport_col(col: i32) { scene_world._.envmap = context_raw.empty_envmap; } } + + +function ui_base_ext_init_hwnd_tabs(): tab_draw_array_t[] { + + let a0: tab_draw_array_t = [ + _draw_callback_create(tab_layers_draw), + _draw_callback_create(tab_history_draw), + _draw_callback_create(tab_plugins_draw) + ]; + let a1: tab_draw_array_t = [ + _draw_callback_create(tab_materials_draw), + _draw_callback_create(tab_brushes_draw), + _draw_callback_create(tab_scripts_draw) + + ]; + let a2: tab_draw_array_t = [ + _draw_callback_create(tab_browser_draw), + _draw_callback_create(tab_meshes_draw), + _draw_callback_create(tab_textures_draw), + _draw_callback_create(tab_fonts_draw), + _draw_callback_create(tab_swatches_draw), + _draw_callback_create(tab_console_draw), + _draw_callback_create(ui_status_draw_version_tab) + ]; + + let r: tab_draw_array_t[] = []; + array_push(r, a0); + array_push(r, a1); + array_push(r, a2); + return r; +} + diff --git a/paint/sources/ui_base_ext.ts b/paint/sources/ui_base_ext.ts deleted file mode 100644 index e5ea13af..00000000 --- a/paint/sources/ui_base_ext.ts +++ /dev/null @@ -1,30 +0,0 @@ - -function ui_base_ext_init_hwnd_tabs(): tab_draw_array_t[] { - - let a0: tab_draw_array_t = [ - _draw_callback_create(tab_layers_draw), - _draw_callback_create(tab_history_draw), - _draw_callback_create(tab_plugins_draw) - ]; - let a1: tab_draw_array_t = [ - _draw_callback_create(tab_materials_draw), - _draw_callback_create(tab_brushes_draw), - _draw_callback_create(tab_scripts_draw) - - ]; - let a2: tab_draw_array_t = [ - _draw_callback_create(tab_browser_draw), - _draw_callback_create(tab_meshes_draw), - _draw_callback_create(tab_textures_draw), - _draw_callback_create(tab_fonts_draw), - _draw_callback_create(tab_swatches_draw), - _draw_callback_create(tab_console_draw), - _draw_callback_create(ui_status_draw_version_tab) - ]; - - let r: tab_draw_array_t[] = []; - array_push(r, a0); - array_push(r, a1); - array_push(r, a2); - return r; -} diff --git a/base/sources/ts/ui_box.ts b/paint/sources/ui_box.ts similarity index 100% rename from base/sources/ts/ui_box.ts rename to paint/sources/ui_box.ts diff --git a/base/sources/ts/ui_files.ts b/paint/sources/ui_files.ts similarity index 100% rename from base/sources/ts/ui_files.ts rename to paint/sources/ui_files.ts diff --git a/paint/sources/ui_header_ext.ts b/paint/sources/ui_header.ts similarity index 95% rename from paint/sources/ui_header_ext.ts rename to paint/sources/ui_header.ts index 64f1073a..3ec0078b 100644 --- a/paint/sources/ui_header_ext.ts +++ b/paint/sources/ui_header.ts @@ -1,4 +1,36 @@ +let ui_header_default_h: i32 = 28; +let ui_header_h: i32 = ui_header_default_h; +let ui_header_handle: ui_handle_t = ui_handle_create(); +let ui_header_worktab: ui_handle_t = ui_handle_create(); + +function ui_header_init() { + ui_header_handle.layout = ui_layout_t.HORIZONTAL; +} + +function ui_header_render_ui() { + if (config_raw.touch_ui) { + ui_header_h = ui_header_default_h + 6; + } + else { + ui_header_h = ui_header_default_h; + } + ui_header_h = math_floor(ui_header_h * UI_SCALE()); + + if (config_raw.layout[layout_size_t.HEADER] == 0) { + return; + } + + let nodesw: i32 = (ui_nodes_show || ui_view2d_show) ? config_raw.layout[layout_size_t.NODES_W] : 0; + let ww: i32 = iron_window_width() - ui_toolbar_w(true) - config_raw.layout[layout_size_t.SIDEBAR_W] - nodesw; + + if (ui_window(ui_header_handle, sys_x(), ui_header_h, ww, ui_header_h)) { + ui._y += 2; + ui_header_draw_tool_properties(); + } +} + + let _ui_header_draw_tool_properties_h: ui_handle_t; function ui_header_draw_tool_properties() { @@ -526,3 +558,4 @@ function ui_header_draw_tool_properties() { sim_record = ui_check(h_record, tr("Record")); } } + diff --git a/base/sources/ts/ui_menu.ts b/paint/sources/ui_menu.ts similarity index 100% rename from base/sources/ts/ui_menu.ts rename to paint/sources/ui_menu.ts diff --git a/base/sources/ts/ui_menubar.ts b/paint/sources/ui_menubar.ts similarity index 100% rename from base/sources/ts/ui_menubar.ts rename to paint/sources/ui_menubar.ts diff --git a/base/sources/ts/ui_nodes.ts b/paint/sources/ui_nodes.ts similarity index 100% rename from base/sources/ts/ui_nodes.ts rename to paint/sources/ui_nodes.ts diff --git a/base/sources/ts/ui_status.ts b/paint/sources/ui_status.ts similarity index 100% rename from base/sources/ts/ui_status.ts rename to paint/sources/ui_status.ts diff --git a/base/sources/ts/ui_toolbar.ts b/paint/sources/ui_toolbar.ts similarity index 88% rename from base/sources/ts/ui_toolbar.ts rename to paint/sources/ui_toolbar.ts index b4dd745d..5a386698 100644 --- a/base/sources/ts/ui_toolbar.ts +++ b/paint/sources/ui_toolbar.ts @@ -242,3 +242,22 @@ function ui_toolbar_draw_highlight() { draw_set_color(ui.ops.theme.HIGHLIGHT_COL); ui_draw_rect(true, ui._x + -1, ui._y + 2, size + 2, size + 2); } + + +function ui_toolbar_ext_draw_tools(img: gpu_texture_t, icon_accent: i32, keys: string[]) { + ui_toolbar_draw_tool(tool_type_t.BRUSH, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.ERASER, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.FILL, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.DECAL, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.TEXT, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.CLONE, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.BLUR, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.SMUDGE, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.PARTICLE, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.COLORID, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.PICKER, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.BAKE, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.MATERIAL, img, icon_accent, keys); + ui_toolbar_draw_tool(tool_type_t.GIZMO, img, icon_accent, keys); +} + diff --git a/paint/sources/ui_toolbar_ext.ts b/paint/sources/ui_toolbar_ext.ts deleted file mode 100644 index cdd18562..00000000 --- a/paint/sources/ui_toolbar_ext.ts +++ /dev/null @@ -1,17 +0,0 @@ - -function ui_toolbar_ext_draw_tools(img: gpu_texture_t, icon_accent: i32, keys: string[]) { - ui_toolbar_draw_tool(tool_type_t.BRUSH, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.ERASER, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.FILL, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.DECAL, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.TEXT, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.CLONE, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.BLUR, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.SMUDGE, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.PARTICLE, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.COLORID, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.PICKER, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.BAKE, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.MATERIAL, img, icon_accent, keys); - ui_toolbar_draw_tool(tool_type_t.GIZMO, img, icon_accent, keys); -} diff --git a/base/sources/ts/ui_view2d.ts b/paint/sources/ui_view2d.ts similarity index 100% rename from base/sources/ts/ui_view2d.ts rename to paint/sources/ui_view2d.ts diff --git a/base/sources/ts/uniforms_ext.ts b/paint/sources/uniforms_ext.ts similarity index 100% rename from base/sources/ts/uniforms_ext.ts rename to paint/sources/uniforms_ext.ts diff --git a/base/sources/ts/util_clone.ts b/paint/sources/util_clone.ts similarity index 100% rename from base/sources/ts/util_clone.ts rename to paint/sources/util_clone.ts diff --git a/base/sources/ts/util_encode.ts b/paint/sources/util_encode.ts similarity index 100% rename from base/sources/ts/util_encode.ts rename to paint/sources/util_encode.ts diff --git a/base/sources/ts/util_mesh.ts b/paint/sources/util_mesh.ts similarity index 100% rename from base/sources/ts/util_mesh.ts rename to paint/sources/util_mesh.ts diff --git a/base/sources/ts/util_particle.ts b/paint/sources/util_particle.ts similarity index 100% rename from base/sources/ts/util_particle.ts rename to paint/sources/util_particle.ts diff --git a/base/sources/ts/util_render.ts b/paint/sources/util_render.ts similarity index 100% rename from base/sources/ts/util_render.ts rename to paint/sources/util_render.ts diff --git a/base/sources/ts/util_uv.ts b/paint/sources/util_uv.ts similarity index 100% rename from base/sources/ts/util_uv.ts rename to paint/sources/util_uv.ts diff --git a/base/sources/ts/viewport.ts b/paint/sources/viewport.ts similarity index 100% rename from base/sources/ts/viewport.ts rename to paint/sources/viewport.ts