From 114efb24584d83589adc012e860ef91e609d0435 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Thu, 4 Jun 2026 11:00:05 +0200 Subject: [PATCH] paint: cleanup --- base/tools/extract_locales.js | 2 +- paint/sources/functions.h | 6 + paint/sources/{ => io}/export_arm.c | 2 +- paint/sources/{ => io}/export_exr.c | 2 +- paint/sources/{ => io}/export_mesh.c | 2 +- paint/sources/{ => io}/export_obj.c | 2 +- paint/sources/{ => io}/export_player.c | 2 +- paint/sources/{ => io}/export_texture.c | 2 +- paint/sources/{ => io}/import_arm.c | 2 +- paint/sources/{ => io}/import_asset.c | 2 +- paint/sources/{ => io}/import_audio.c | 2 +- .../sources/{ => io}/import_blend_material.c | 2 +- paint/sources/{ => io}/import_blend_mesh.c | 2 +- paint/sources/{ => io}/import_envmap.c | 2 +- paint/sources/{ => io}/import_folder.c | 2 +- paint/sources/{ => io}/import_font.c | 2 +- paint/sources/{ => io}/import_keymap.c | 2 +- paint/sources/{ => io}/import_legacy.c | 2 +- paint/sources/{ => io}/import_lut.c | 2 +- paint/sources/{ => io}/import_mesh.c | 2 +- paint/sources/{ => io}/import_obj.c | 2 +- paint/sources/{ => io}/import_plugin.c | 2 +- paint/sources/{ => io}/import_texture.c | 2 +- paint/sources/{ => io}/import_theme.c | 2 +- paint/sources/kickstart.c | 367 --------- paint/sources/main.c | 724 +++++++++++++----- .../boolean_node.c | 0 .../brush_output_node.c | 0 .../{brush_nodes => nodes_brush}/color_node.c | 0 .../{brush_nodes => nodes_brush}/float_node.c | 0 .../{brush_nodes => nodes_brush}/input_node.c | 0 .../integer_node.c | 0 .../{brush_nodes => nodes_brush}/math_node.c | 0 .../{brush_nodes => nodes_brush}/null_node.c | 0 .../random_node.c | 0 .../separate_vector_node.c | 0 .../string_node.c | 0 .../tex_image_node.c | 0 .../{brush_nodes => nodes_brush}/time_node.c | 0 .../vector_math_node.c | 0 .../vector_node.c | 0 .../attribute_node.c | 0 .../bake_texture_node.c | 0 .../blur_node.c | 0 .../brick_texture_node.c | 0 .../brightness_contrast_node.c | 0 .../bump_node.c | 0 .../camera_texture_node.c | 0 .../checker_texture_node.c | 0 .../clamp_node.c | 0 .../color_mask_node.c | 0 .../color_ramp_node.c | 0 .../combine_color_node.c | 0 .../combine_xyz_node.c | 0 .../curvature_bake_node.c | 0 .../float_curve_node.c | 0 .../gabor_texture_node.c | 0 .../gamma_node.c | 0 .../geometry_node.c | 0 .../gradient_texture_node.c | 0 .../group_node.c | 0 .../hue_saturation_value_node.c | 0 .../image_texture_node.c | 0 .../invert_color_node.c | 0 .../layer_mask_node.c | 0 .../layer_node.c | 0 .../magic_texture_node.c | 0 .../map_range_node.c | 0 .../mapping_node.c | 0 .../material_node.c | 0 .../material_output_node.c | 0 .../math2_node.c | 0 .../mix_color_node.c | 0 .../mix_normal_map_node.c | 0 .../noise_texture_node.c | 0 .../normal_map_node.c | 0 .../normal_node.c | 0 .../object_info_node.c | 0 .../picker_node.c | 0 .../quantize_node.c | 0 .../readme.md | 0 .../replace_color_node.c | 0 .../rgb_curves_node.c | 0 .../rgb_node.c | 0 .../rgb_to_bw_node.c | 0 .../script_node.c | 0 .../separate_color_node.c | 0 .../separate_xyz_node.c | 0 .../shader_node.c | 0 .../text_texture_node.c | 0 .../texture_coordinate_node.c | 0 .../tilesheet_animation_node.c | 0 .../tilesheet_node.c | 0 .../uv_map_node.c | 0 .../value_node.c | 0 .../vector_curves_node.c | 0 .../vector_math2_node.c | 0 .../vector_rotate_node.c | 0 .../vector_transform_node.c | 0 .../voronoi_texture_node.c | 0 .../warp_node.c | 0 .../wave_texture_node.c | 0 .../wireframe_node.c | 0 .../edit_image_node.c | 0 .../image_to_3d_mesh_node.c | 0 .../image_to_depth_node.c | 0 .../image_to_normal_map_node.c | 0 .../image_to_pbr_node.c | 0 .../inpaint_image_node.c | 0 .../neural_node.c | 0 .../neural_node_models.c | 0 .../outpaint_image_node.c | 0 .../repeat_node.c | 0 .../save_image_node.c | 0 .../text_to_image_node.c | 0 .../text_to_text_node.c | 0 .../texture_mesh_node.c | 0 .../tile_image_node.c | 0 .../upscale_image_node.c | 0 .../vary_image_node.c | 0 paint/sources/{ => render}/make_bake.c | 2 +- paint/sources/{ => render}/make_blur.c | 2 +- paint/sources/{ => render}/make_brush.c | 2 +- paint/sources/{ => render}/make_clone.c | 2 +- paint/sources/{ => render}/make_depth.c | 2 +- paint/sources/{ => render}/make_discard.c | 2 +- paint/sources/{ => render}/make_material.c | 2 +- paint/sources/{ => render}/make_mesh.c | 2 +- .../sources/{ => render}/make_mesh_preview.c | 2 +- .../sources/{ => render}/make_node_preview.c | 2 +- paint/sources/{ => render}/make_paint.c | 2 +- paint/sources/{ => render}/make_particle.c | 2 +- paint/sources/{ => render}/make_picking.c | 2 +- paint/sources/{ => render}/make_sculpt.c | 2 +- paint/sources/{ => render}/make_texcoord.c | 2 +- paint/sources/{ => render}/render_compass.c | 2 +- paint/sources/{ => render}/render_envsphere.c | 2 +- paint/sources/{ => render}/render_gizmo.c | 2 +- paint/sources/{ => render}/render_path_base.c | 2 +- .../{ => render}/render_path_deferred.c | 2 +- .../{ => render}/render_path_forward.c | 2 +- .../sources/{ => render}/render_path_paint.c | 2 +- .../{ => render}/render_path_preview.c | 2 +- .../{ => render}/render_path_raytrace.c | 2 +- .../{ => render}/render_path_raytrace_bake.c | 2 +- .../sources/{ => render}/render_pathsphere.c | 2 +- paint/sources/{ => ui}/box_export.c | 2 +- paint/sources/{ => ui}/box_preferences.c | 2 +- paint/sources/{ => ui}/box_projects.c | 2 +- paint/sources/{ => ui}/tab_browser.c | 2 +- paint/sources/{ => ui}/tab_brushes.c | 2 +- paint/sources/{ => ui}/tab_console.c | 2 +- paint/sources/{ => ui}/tab_debug.c | 2 +- paint/sources/{ => ui}/tab_fonts.c | 2 +- paint/sources/{ => ui}/tab_layers.c | 2 +- paint/sources/{ => ui}/tab_materials.c | 2 +- paint/sources/{ => ui}/tab_meshes.c | 2 +- paint/sources/{ => ui}/tab_plugins.c | 2 +- paint/sources/{ => ui}/tab_scripts.c | 2 +- paint/sources/{ => ui}/tab_stages.c | 2 +- paint/sources/{ => ui}/tab_swatches.c | 2 +- paint/sources/{ => ui}/tab_textures.c | 2 +- paint/sources/{ => ui}/tab_timeline.c | 2 +- paint/sources/{ => ui}/ui_box.c | 2 +- paint/sources/{ => ui}/ui_files.c | 2 +- paint/sources/{ => ui}/ui_header.c | 2 +- paint/sources/{ => ui}/ui_menu.c | 2 +- paint/sources/{ => ui}/ui_menubar.c | 2 +- paint/sources/{ => ui}/ui_nodes.c | 2 +- paint/sources/{ => ui}/ui_sidebar.c | 2 +- paint/sources/{ => ui}/ui_statusbar.c | 2 +- paint/sources/{ => ui}/ui_toolbar.c | 2 +- paint/sources/{ => ui}/ui_view2d.c | 2 +- paint/sources/{ => util}/edit_uvmap.c | 2 +- paint/sources/{ => util}/geom.c | 2 +- paint/sources/{ => util}/util_clone.c | 2 +- paint/sources/{ => util}/util_encode.c | 2 +- paint/sources/{ => util}/util_layer.c | 2 +- paint/sources/{ => util}/util_mesh.c | 2 +- paint/sources/{ => util}/util_particle.c | 2 +- paint/sources/{ => util}/util_render.c | 2 +- paint/sources/{ => util}/util_texture.c | 2 +- paint/sources/{ => util}/util_uv.c | 2 +- 183 files changed, 637 insertions(+), 632 deletions(-) rename paint/sources/{ => io}/export_arm.c (99%) rename paint/sources/{ => io}/export_exr.c (99%) rename paint/sources/{ => io}/export_mesh.c (96%) rename paint/sources/{ => io}/export_obj.c (99%) rename paint/sources/{ => io}/export_player.c (99%) rename paint/sources/{ => io}/export_texture.c (99%) rename paint/sources/{ => io}/import_arm.c (99%) rename paint/sources/{ => io}/import_asset.c (99%) rename paint/sources/{ => io}/import_audio.c (93%) rename paint/sources/{ => io}/import_blend_material.c (99%) rename paint/sources/{ => io}/import_blend_mesh.c (98%) rename paint/sources/{ => io}/import_envmap.c (99%) rename paint/sources/{ => io}/import_folder.c (99%) rename paint/sources/{ => io}/import_font.c (98%) rename paint/sources/{ => io}/import_keymap.c (96%) rename paint/sources/{ => io}/import_legacy.c (99%) rename paint/sources/{ => io}/import_lut.c (99%) rename paint/sources/{ => io}/import_mesh.c (99%) rename paint/sources/{ => io}/import_obj.c (99%) rename paint/sources/{ => io}/import_plugin.c (95%) rename paint/sources/{ => io}/import_texture.c (99%) rename paint/sources/{ => io}/import_theme.c (96%) delete mode 100644 paint/sources/kickstart.c rename paint/sources/{brush_nodes => nodes_brush}/boolean_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/brush_output_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/color_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/float_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/input_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/integer_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/math_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/null_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/random_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/separate_vector_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/string_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/tex_image_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/time_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/vector_math_node.c (100%) rename paint/sources/{brush_nodes => nodes_brush}/vector_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/attribute_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/bake_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/blur_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/brick_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/brightness_contrast_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/bump_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/camera_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/checker_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/clamp_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/color_mask_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/color_ramp_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/combine_color_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/combine_xyz_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/curvature_bake_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/float_curve_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/gabor_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/gamma_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/geometry_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/gradient_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/group_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/hue_saturation_value_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/image_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/invert_color_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/layer_mask_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/layer_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/magic_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/map_range_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/mapping_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/material_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/material_output_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/math2_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/mix_color_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/mix_normal_map_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/noise_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/normal_map_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/normal_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/object_info_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/picker_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/quantize_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/readme.md (100%) rename paint/sources/{material_nodes => nodes_material}/replace_color_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/rgb_curves_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/rgb_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/rgb_to_bw_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/script_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/separate_color_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/separate_xyz_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/shader_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/text_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/texture_coordinate_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/tilesheet_animation_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/tilesheet_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/uv_map_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/value_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/vector_curves_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/vector_math2_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/vector_rotate_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/vector_transform_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/voronoi_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/warp_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/wave_texture_node.c (100%) rename paint/sources/{material_nodes => nodes_material}/wireframe_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/edit_image_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/image_to_3d_mesh_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/image_to_depth_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/image_to_normal_map_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/image_to_pbr_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/inpaint_image_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/neural_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/neural_node_models.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/outpaint_image_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/repeat_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/save_image_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/text_to_image_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/text_to_text_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/texture_mesh_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/tile_image_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/upscale_image_node.c (100%) rename paint/sources/{neural_nodes => nodes_neural}/vary_image_node.c (100%) rename paint/sources/{ => render}/make_bake.c (99%) rename paint/sources/{ => render}/make_blur.c (99%) rename paint/sources/{ => render}/make_brush.c (99%) rename paint/sources/{ => render}/make_clone.c (99%) rename paint/sources/{ => render}/make_depth.c (99%) rename paint/sources/{ => render}/make_discard.c (99%) rename paint/sources/{ => render}/make_material.c (99%) rename paint/sources/{ => render}/make_mesh.c (99%) rename paint/sources/{ => render}/make_mesh_preview.c (99%) rename paint/sources/{ => render}/make_node_preview.c (99%) rename paint/sources/{ => render}/make_paint.c (99%) rename paint/sources/{ => render}/make_particle.c (98%) rename paint/sources/{ => render}/make_picking.c (99%) rename paint/sources/{ => render}/make_sculpt.c (99%) rename paint/sources/{ => render}/make_texcoord.c (99%) rename paint/sources/{ => render}/render_compass.c (99%) rename paint/sources/{ => render}/render_envsphere.c (99%) rename paint/sources/{ => render}/render_gizmo.c (99%) rename paint/sources/{ => render}/render_path_base.c (99%) rename paint/sources/{ => render}/render_path_deferred.c (99%) rename paint/sources/{ => render}/render_path_forward.c (96%) rename paint/sources/{ => render}/render_path_paint.c (99%) rename paint/sources/{ => render}/render_path_preview.c (99%) rename paint/sources/{ => render}/render_path_raytrace.c (99%) rename paint/sources/{ => render}/render_path_raytrace_bake.c (99%) rename paint/sources/{ => render}/render_pathsphere.c (99%) rename paint/sources/{ => ui}/box_export.c (99%) rename paint/sources/{ => ui}/box_preferences.c (99%) rename paint/sources/{ => ui}/box_projects.c (99%) rename paint/sources/{ => ui}/tab_browser.c (99%) rename paint/sources/{ => ui}/tab_brushes.c (99%) rename paint/sources/{ => ui}/tab_console.c (99%) rename paint/sources/{ => ui}/tab_debug.c (99%) rename paint/sources/{ => ui}/tab_fonts.c (99%) rename paint/sources/{ => ui}/tab_layers.c (99%) rename paint/sources/{ => ui}/tab_materials.c (99%) rename paint/sources/{ => ui}/tab_meshes.c (99%) rename paint/sources/{ => ui}/tab_plugins.c (99%) rename paint/sources/{ => ui}/tab_scripts.c (99%) rename paint/sources/{ => ui}/tab_stages.c (99%) rename paint/sources/{ => ui}/tab_swatches.c (99%) rename paint/sources/{ => ui}/tab_textures.c (99%) rename paint/sources/{ => ui}/tab_timeline.c (99%) rename paint/sources/{ => ui}/ui_box.c (99%) rename paint/sources/{ => ui}/ui_files.c (99%) rename paint/sources/{ => ui}/ui_header.c (99%) rename paint/sources/{ => ui}/ui_menu.c (99%) rename paint/sources/{ => ui}/ui_menubar.c (99%) rename paint/sources/{ => ui}/ui_nodes.c (99%) rename paint/sources/{ => ui}/ui_sidebar.c (99%) rename paint/sources/{ => ui}/ui_statusbar.c (98%) rename paint/sources/{ => ui}/ui_toolbar.c (99%) rename paint/sources/{ => ui}/ui_view2d.c (99%) rename paint/sources/{ => util}/edit_uvmap.c (99%) rename paint/sources/{ => util}/geom.c (99%) rename paint/sources/{ => util}/util_clone.c (99%) rename paint/sources/{ => util}/util_encode.c (99%) rename paint/sources/{ => util}/util_layer.c (99%) rename paint/sources/{ => util}/util_mesh.c (99%) rename paint/sources/{ => util}/util_particle.c (95%) rename paint/sources/{ => util}/util_render.c (99%) rename paint/sources/{ => util}/util_texture.c (97%) rename paint/sources/{ => util}/util_uv.c (99%) diff --git a/base/tools/extract_locales.js b/base/tools/extract_locales.js index 797e3210..9c2d0f81 100644 --- a/base/tools/extract_locales.js +++ b/base/tools/extract_locales.js @@ -19,7 +19,7 @@ if (fs_exists(locale_path)) { old = JSON.parse(fs_readfile(locale_path).toString()); } -let source_paths = [ "paint/sources", "paint/sources/material_nodes", "paint/sources/brush_nodes", "paint/sources/neural_nodes" ]; +let source_paths = [ "paint/sources", "paint/sources/nodes_material", "paint/sources/nodes_brush", "paint/sources/nodes_neural", "paint/sources/io", "paint/sources/render", "paint/sources/ui", "paint/sources/util" ]; for (let path of source_paths) { if (!fs_exists(path)) { diff --git a/paint/sources/functions.h b/paint/sources/functions.h index 808a955c..74c933ac 100644 --- a/paint/sources/functions.h +++ b/paint/sources/functions.h @@ -77,6 +77,8 @@ slot_layer_t *layers_merge_group(slot_layer_t *l); void layers_merge_layer(slot_layer_t *l0, slot_layer_t *l1, bool use_mask); slot_layer_t *layers_flatten(bool height_to_normal, slot_layer_t_array_t *layers); void layers_on_resized(); +void layers_create_filter(); +void layers_create_image_layer(asset_t *asset); slot_font_t *slot_font_create(char *name, draw_font_t *font, char *file); scene_t *startup_get_scene(void); buffer_t *util_encode_scene(scene_t *raw); @@ -122,6 +124,8 @@ void box_export_show_mesh(); void box_export_show_material(); void box_export_show_brush(); void box_export_show_player(); +void box_export_fetch_presets(); +void box_export_parse_preset(); void import_blend_mesh_ui(); void import_blend_mesh_run(char *path, bool replace_existing); void tab_timeline_draw(ui_handle_t *htab); @@ -224,6 +228,7 @@ bool context_in_browser(); bool context_is_decal(); bool context_is_decal_mask(); bool context_is_decal_mask_paint(); +bool context_is_decal_camera_align(); bool context_is_floating_toolbar(); void context_set_viewport_mode(viewport_mode_t mode); void context_load_envmap(); @@ -742,4 +747,5 @@ float_node_t *float_node_create(ui_node_t *raw, f32_array_t *args); integer_node_t *integer_node_create(ui_node_t *raw, f32_array_t *args); separate_vector_node_t *separate_vector_node_create(ui_node_t *raw, f32_array_t *args); brush_output_node_t *brush_output_node_create(ui_node_t *raw, f32_array_t *args); +void brush_output_node_parse_inputs(); void edit_uvmap_update(); diff --git a/paint/sources/export_arm.c b/paint/sources/io/export_arm.c similarity index 99% rename from paint/sources/export_arm.c rename to paint/sources/io/export_arm.c index 06908bff..f3378104 100644 --- a/paint/sources/export_arm.c +++ b/paint/sources/io/export_arm.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void export_arm_run_mesh(char *path, mesh_object_t_array_t *paint_objects) { mesh_data_t_array_t *mesh_datas = any_array_create_from_raw((void *[]){}, 0); diff --git a/paint/sources/export_exr.c b/paint/sources/io/export_exr.c similarity index 99% rename from paint/sources/export_exr.c rename to paint/sources/io/export_exr.c index cf5c3a33..9f77f450 100644 --- a/paint/sources/export_exr.c +++ b/paint/sources/io/export_exr.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" // Based on miniexr.cpp - public domain - 2013 Aras Pranckevicius / Unity Technologies // https://github.com/aras-p/miniexr diff --git a/paint/sources/export_mesh.c b/paint/sources/io/export_mesh.c similarity index 96% rename from paint/sources/export_mesh.c rename to paint/sources/io/export_mesh.c index 769ca1c9..5271a3ba 100644 --- a/paint/sources/export_mesh.c +++ b/paint/sources/io/export_mesh.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" #ifdef WITH_PLUGINS void export_glb_run(char *path, mesh_object_t_array_t *paint_objects); diff --git a/paint/sources/export_obj.c b/paint/sources/io/export_obj.c similarity index 99% rename from paint/sources/export_obj.c rename to paint/sources/io/export_obj.c index 2b60c606..3a3573c6 100644 --- a/paint/sources/export_obj.c +++ b/paint/sources/io/export_obj.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void export_obj_write_string(u8_array_t *out, char *str) { for (i32 i = 0; i < string_length(str); ++i) { diff --git a/paint/sources/export_player.c b/paint/sources/io/export_player.c similarity index 99% rename from paint/sources/export_player.c rename to paint/sources/io/export_player.c index 840f8c1e..cf7885de 100644 --- a/paint/sources/export_player.c +++ b/paint/sources/io/export_player.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" typedef enum { PLAYER_TARGET_WEB = 0, diff --git a/paint/sources/export_texture.c b/paint/sources/io/export_texture.c similarity index 99% rename from paint/sources/export_texture.c rename to paint/sources/io/export_texture.c index b443e830..1f938fad 100644 --- a/paint/sources/export_texture.c +++ b/paint/sources/io/export_texture.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" f32 export_texture_gamma = 1.0 / 2.2; diff --git a/paint/sources/import_arm.c b/paint/sources/io/import_arm.c similarity index 99% rename from paint/sources/import_arm.c rename to paint/sources/io/import_arm.c index 82e541e1..10aa2bf1 100644 --- a/paint/sources/import_arm.c +++ b/paint/sources/io/import_arm.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" scene_t *scene_raw_gc; diff --git a/paint/sources/import_asset.c b/paint/sources/io/import_asset.c similarity index 99% rename from paint/sources/import_asset.c rename to paint/sources/io/import_asset.c index 63b2e21e..58ab1323 100644 --- a/paint/sources/import_asset.c +++ b/paint/sources/io/import_asset.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" f32 _import_asset_drop_x; f32 _import_asset_drop_y; diff --git a/paint/sources/import_audio.c b/paint/sources/io/import_audio.c similarity index 93% rename from paint/sources/import_audio.c rename to paint/sources/io/import_audio.c index d47f8461..9534c566 100644 --- a/paint/sources/import_audio.c +++ b/paint/sources/io/import_audio.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void import_audio_run(char *path) { diff --git a/paint/sources/import_blend_material.c b/paint/sources/io/import_blend_material.c similarity index 99% rename from paint/sources/import_blend_material.c rename to paint/sources/io/import_blend_material.c index 1b3caac5..e28f98cd 100644 --- a/paint/sources/import_blend_material.c +++ b/paint/sources/io/import_blend_material.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" char *_import_blend_material_path; diff --git a/paint/sources/import_blend_mesh.c b/paint/sources/io/import_blend_mesh.c similarity index 98% rename from paint/sources/import_blend_mesh.c rename to paint/sources/io/import_blend_mesh.c index 030f2f02..ff4496f1 100644 --- a/paint/sources/import_blend_mesh.c +++ b/paint/sources/io/import_blend_mesh.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void import_blend_mesh_ui_blender_folder_picked(char *path) { #ifdef IRON_WINDOWS diff --git a/paint/sources/import_envmap.c b/paint/sources/io/import_envmap.c similarity index 99% rename from paint/sources/import_envmap.c rename to paint/sources/io/import_envmap.c index 35c3bcaf..ce439dd6 100644 --- a/paint/sources/import_envmap.c +++ b/paint/sources/io/import_envmap.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" gpu_pipeline_t *import_envmap_pipeline = NULL; i32 import_envmap_params_loc; diff --git a/paint/sources/import_folder.c b/paint/sources/io/import_folder.c similarity index 99% rename from paint/sources/import_folder.c rename to paint/sources/io/import_folder.c index 13412d34..2425e214 100644 --- a/paint/sources/import_folder.c +++ b/paint/sources/io/import_folder.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void import_folder_place_image_node(ui_nodes_t *nodes, ui_node_canvas_t *canvas, char *asset, i32 ny, i32 to_id, i32 to_socket) { ui_node_t *n = nodes_material_create_node("TEX_IMAGE", NULL); diff --git a/paint/sources/import_font.c b/paint/sources/io/import_font.c similarity index 98% rename from paint/sources/import_font.c rename to paint/sources/io/import_font.c index 0f88a311..a4e0d37f 100644 --- a/paint/sources/import_font.c +++ b/paint/sources/io/import_font.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void import_font_run_on_next_frame(slot_font_t_array_t *font_slots) { for (i32 i = 0; i < font_slots->length; ++i) { diff --git a/paint/sources/import_keymap.c b/paint/sources/io/import_keymap.c similarity index 96% rename from paint/sources/import_keymap.c rename to paint/sources/io/import_keymap.c index c2e319c2..e14a2dee 100644 --- a/paint/sources/import_keymap.c +++ b/paint/sources/io/import_keymap.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void import_keymap_run(char *path) { if (!path_is_json(path)) { diff --git a/paint/sources/import_legacy.c b/paint/sources/io/import_legacy.c similarity index 99% rename from paint/sources/import_legacy.c rename to paint/sources/io/import_legacy.c index 6a84f443..5b45c01a 100644 --- a/paint/sources/import_legacy.c +++ b/paint/sources/io/import_legacy.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" ui_node_socket_t_array_t *import_arm_get_node_socket_array(any_map_t *old, char *key) { ui_node_socket_t_array_t *sockets = any_array_create_from_raw((void *[]){}, 0); diff --git a/paint/sources/import_lut.c b/paint/sources/io/import_lut.c similarity index 99% rename from paint/sources/import_lut.c rename to paint/sources/io/import_lut.c index 3bb6882f..e227aad8 100644 --- a/paint/sources/import_lut.c +++ b/paint/sources/io/import_lut.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" #include void import_lut_free(void) { diff --git a/paint/sources/import_mesh.c b/paint/sources/io/import_mesh.c similarity index 99% rename from paint/sources/import_mesh.c rename to paint/sources/io/import_mesh.c index 00f33cf9..012f3c17 100644 --- a/paint/sources/import_mesh.c +++ b/paint/sources/io/import_mesh.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool import_mesh_clear_layers = true; bool import_mesh_needs_unwrap = false; diff --git a/paint/sources/import_obj.c b/paint/sources/io/import_obj.c similarity index 99% rename from paint/sources/import_obj.c rename to paint/sources/io/import_obj.c index 231d928d..bdc02dd7 100644 --- a/paint/sources/import_obj.c +++ b/paint/sources/io/import_obj.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void import_obj_run(char *path, bool replace_existing) { split_type_t i = g_context->split_by; diff --git a/paint/sources/import_plugin.c b/paint/sources/io/import_plugin.c similarity index 95% rename from paint/sources/import_plugin.c rename to paint/sources/io/import_plugin.c index 2747d169..3f29cd25 100644 --- a/paint/sources/import_plugin.c +++ b/paint/sources/io/import_plugin.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void import_plugin_run(char *path) { if (!path_is_plugin(path)) { diff --git a/paint/sources/import_texture.c b/paint/sources/io/import_texture.c similarity index 99% rename from paint/sources/import_texture.c rename to paint/sources/io/import_texture.c index e8bfe587..4c6b04ac 100644 --- a/paint/sources/import_texture.c +++ b/paint/sources/io/import_texture.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" typedef struct import_texture_data { char *path; diff --git a/paint/sources/import_theme.c b/paint/sources/io/import_theme.c similarity index 96% rename from paint/sources/import_theme.c rename to paint/sources/io/import_theme.c index 670f72d6..68c1b5e1 100644 --- a/paint/sources/import_theme.c +++ b/paint/sources/io/import_theme.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void import_theme_run(char *path) { if (!path_is_json(path)) { diff --git a/paint/sources/kickstart.c b/paint/sources/kickstart.c deleted file mode 100644 index fde56880..00000000 --- a/paint/sources/kickstart.c +++ /dev/null @@ -1,367 +0,0 @@ - - -#include "global.h" - -#ifdef WITH_PLUGINS -void plugins_init(); -#endif - -void _kickstart() { - _render_path_cached_shader_contexts = any_map_create(); - gc_root(_render_path_cached_shader_contexts); - - ui_children = any_map_create(); - gc_root(ui_children); - - ui_nodes_custom_buttons = any_map_create(); - gc_root(ui_nodes_custom_buttons); - - operator_ops = any_map_create(); - gc_root(operator_ops); - - physics_body_object_map = any_imap_create(); - gc_root(physics_body_object_map); - - box_export_htab = ui_handle_create(); - gc_root(box_export_htab); - - box_export_mesh_handle = ui_handle_create(); - gc_root(box_export_mesh_handle); - - box_export_hpreset = ui_handle_create(); - gc_root(box_export_hpreset); - - box_export_channels = any_array_create_from_raw( - (void *[]){ - "base_r", "base_g", "base_b", "height", "metal", "nor_r", "nor_g", "nor_g_directx", "nor_b", "occ", "opac", "rough", - "smooth", "emis", "subs", "diff_r", "diff_g", "diff_b", "spec_r", "spec_g", "spec_b", "0.0", "1.0", - }, - 23); - gc_root(box_export_channels); - - box_export_color_spaces = any_array_create_from_raw( - (void *[]){ - "linear", - "srgb", - }, - 2); - gc_root(box_export_color_spaces); - - box_export_h_export_player_target = ui_handle_create(); - gc_root(box_export_h_export_player_target); - - import_texture_importers = any_map_create(); - gc_root(import_texture_importers); - - ui_files_path = ui_files_default_path; - gc_root(ui_files_path); - - base_res_handle = ui_handle_create(); - gc_root(base_res_handle); - - base_bits_handle = ui_handle_create(); - gc_root(base_bits_handle); - - base_drop_paths = any_array_create_from_raw((void *[]){}, 0); - gc_root(base_drop_paths); - - ui_base_hwnds = ui_base_init_hwnds(); - gc_root(ui_base_hwnds); - - ui_base_htabs = ui_base_init_htabs(); - gc_root(ui_base_htabs); - - ui_base_hwnd_tabs = ui_base_init_hwnd_tabs(); - gc_root(ui_base_hwnd_tabs); - - ui_toolbar_handle = ui_handle_create(); - gc_root(ui_toolbar_handle); - - ui_toolbar_tool_names = any_array_create_from_raw( - (void *[]){ - _tr("Brush"), - _tr("Eraser"), - _tr("Fill"), - _tr("Decal"), - _tr("Text"), - _tr("Clone"), - _tr("Blur"), - _tr("Particle"), - _tr("ColorID"), - _tr("Picker"), - _tr("Material"), - _tr("Cursor"), - }, - 12); - gc_root(ui_toolbar_tool_names); - - ui_toolbar_tooltip_extras = any_array_create_from_raw( - (void *[]){ - _tr("Hold {action_paint} to paint\nHold {brush_ruler} and press {action_paint} to paint a straight line (ruler mode)"), - _tr("Hold {action_paint} to erase\nHold {brush_ruler} and press {action_paint} to erase a straight line (ruler mode)"), - "", - _tr("Hold {decal_mask} to paint on a decal mask"), - _tr("Hold {decal_mask} to use the text as a mask"), - _tr("Hold {set_clone_source} to set source"), - "", - "", - "", - "", - "", - "", - }, - 12); - gc_root(ui_toolbar_tooltip_extras); - uniforms_ext_ortho_p = mat4_ortho(-0.5, 0.5, -0.5, 0.5, -0.5, 0.5); - - box_projects_htab = ui_handle_create(); - gc_root(box_projects_htab); - - box_projects_hsearch = ui_handle_create(); - gc_root(box_projects_hsearch); - - tab_scripts_hscript = ui_handle_create(); - gc_root(tab_scripts_hscript); - - import_mesh_importers = any_map_create(); - gc_root(import_mesh_importers); - - ui_menubar_hwnd = ui_handle_create(); - gc_root(ui_menubar_hwnd); - - ui_menubar_menu_handle = ui_handle_create(); - gc_root(ui_menubar_menu_handle); - - ui_menubar_tab = ui_handle_create(); - gc_root(ui_menubar_tab); - ui_menubar_w = ui_menubar_default_w; - - translator_translations = any_map_create(); - gc_root(translator_translations); - - g_project = GC_ALLOC_INIT(project_t, {0}); - gc_root(g_project); - - project_assets = any_array_create_from_raw((void *[]){}, 0); - gc_root(project_assets); - - project_asset_names = any_array_create_from_raw((void *[]){}, 0); - gc_root(project_asset_names); - - project_mesh_assets = any_array_create_from_raw((void *[]){}, 0); - gc_root(project_mesh_assets); - - project_material_groups = any_array_create_from_raw((void *[]){}, 0); - gc_root(project_material_groups); - - project_asset_map = any_imap_create(); - gc_root(project_asset_map); - - project_materials = any_array_create_from_raw((void *[]){}, 0); - gc_root(project_materials); - - project_brushes = any_array_create_from_raw((void *[]){}, 0); - gc_root(project_brushes); - - project_layers = any_array_create_from_raw((void *[]){}, 0); - gc_root(project_layers); - - project_fonts = any_array_create_from_raw((void *[]){}, 0); - gc_root(project_fonts); - - ui_view2d_hwnd = ui_handle_create(); - gc_root(ui_view2d_hwnd); - - ui_view2d_htab = ui_handle_create(); - gc_root(ui_view2d_htab); - - sim_object_script_map = any_map_create(); - gc_root(sim_object_script_map); - - parser_material_node_values = any_map_create(); - gc_root(parser_material_node_values); - - parser_material_node_vectors = any_map_create(); - gc_root(parser_material_node_vectors); - - parser_material_custom_nodes = any_map_create(); - gc_root(parser_material_custom_nodes); - - parser_material_parsed_map = any_map_create(); - gc_root(parser_material_parsed_map); - - parser_material_texture_map = any_map_create(); - gc_root(parser_material_texture_map); - - tab_browser_hpath = ui_handle_create(); - gc_root(tab_browser_hpath); - - tab_browser_hsearch = ui_handle_create(); - gc_root(tab_browser_hsearch); - - util_mesh_unwrappers = any_map_create(); - gc_root(util_mesh_unwrappers); - - ui_header_h = ui_header_default_h; - - ui_header_handle = ui_handle_create(); - gc_root(ui_header_handle); - - plugin_map = any_map_create(); - gc_root(plugin_map); - - parser_logic_custom_nodes = any_map_create(); - gc_root(parser_logic_custom_nodes); - - resource_bundled = any_map_create(); - gc_root(resource_bundled); - - ui_nodes_hwnd = ui_handle_create(); - gc_root(ui_nodes_hwnd); - - ui_nodes_group_stack = any_array_create_from_raw((void *[]){}, 0); - gc_root(ui_nodes_group_stack); - - ui_nodes_htab = ui_handle_create(); - gc_root(ui_nodes_htab); - - _ui_nodes_htype = ui_handle_create(); - gc_root(_ui_nodes_htype); - - _ui_nodes_hname = ui_handle_create(); - gc_root(_ui_nodes_hname); - - _ui_nodes_hmin = ui_handle_create(); - gc_root(_ui_nodes_hmin); - - _ui_nodes_hmax = ui_handle_create(); - gc_root(_ui_nodes_hmax); - - _ui_nodes_hval0 = ui_handle_create(); - gc_root(_ui_nodes_hval0); - - _ui_nodes_hval1 = ui_handle_create(); - gc_root(_ui_nodes_hval1); - - _ui_nodes_hval2 = ui_handle_create(); - gc_root(_ui_nodes_hval2); - - _ui_nodes_hval3 = ui_handle_create(); - gc_root(_ui_nodes_hval3); - - nodes_brush_categories = any_array_create_from_raw( - (void *[]){ - _tr("Nodes"), - }, - 1); - gc_root(nodes_brush_categories); - -#if defined(IRON_WINDOWS) || defined(IRON_LINUX) || defined(IRON_MACOS) - nodes_material_categories = any_array_create_from_raw( - (void *[]){ - _tr("Input"), - _tr("Texture"), - _tr("Color"), - _tr("Utilities"), - _tr("Neural"), - _tr("Group"), - }, - 6); -#else - nodes_material_categories = any_array_create_from_raw( - (void *[]){ - _tr("Input"), - _tr("Texture"), - _tr("Color"), - _tr("Utilities"), - _tr("Group"), - }, - 5); -#endif - gc_root(nodes_material_categories); - -#if defined(IRON_ANDROID) || defined(IRON_IOS) - ui_sidebar_default_w = ui_sidebar_default_w_mini; -#else - ui_sidebar_default_w = ui_sidebar_default_w_full; -#endif - - ui_sidebar_hminimized = ui_handle_create(); - gc_root(ui_sidebar_hminimized); - ui_sidebar_w_mini = ui_sidebar_default_w_mini; - - console_last_traces = any_array_create(0); - gc_root(console_last_traces); - - box_preferences_htab = ui_handle_create(); - gc_root(box_preferences_htab); - - ui_box_hwnd = ui_handle_create(); - gc_root(ui_box_hwnd); - - tab_layers_layer_name_handle = ui_handle_create(); - gc_root(tab_layers_layer_name_handle); - - render_path_raytrace_f32a = f32_array_create(24); - gc_root(render_path_raytrace_f32a); - render_path_raytrace_help_mat = mat4_identity(); - - neural_node_results = any_imap_create(); - gc_root(neural_node_results); - - sys_on_resize = base_on_resize; - sys_on_w = base_w; - sys_on_h = base_h; - sys_on_x = base_x; - sys_on_y = base_y; - - iron_set_app_name(manifest_title); // Used to locate external application data folder - config_load(); - config_init(); - context_init(); - sys_start(config_get_options()); - -#ifdef is_debug - double t_start = iron_time(); -#endif - - if (g_config->layout == NULL) { - config_init_layout(); - } - iron_set_app_name(manifest_title); - - data_cached_scene_raws = any_map_create(); - gc_root(data_cached_scene_raws); - any_map_set(data_cached_scene_raws, "Scene", startup_get_scene()); - scene_set_active("Scene"); - - uniforms_ext_init(); - render_path_base_init(); - render_path_deferred_init(); // Allocate gbuffer - if (g_config->render_mode == RENDER_MODE_FORWARD) { - render_path_forward_init(); - render_path_commands = render_path_forward_commands; - gc_root(render_path_commands); - } - else { - - render_path_commands = render_path_deferred_commands; - gc_root(render_path_commands); - } - -#ifdef WITH_PLUGINS - plugins_init(); -#endif - - if (!string_equals(g_config->lut_path, "") && iron_file_exists(g_config->lut_path)) { - import_lut_run(g_config->lut_path); - } - - base_init(); - -#ifdef is_debug - iron_log("Started in %fs\n", iron_time() - t_start); -#endif - - iron_start(); -} diff --git a/paint/sources/main.c b/paint/sources/main.c index 34d1e867..9d41435d 100644 --- a/paint/sources/main.c +++ b/paint/sources/main.c @@ -1,153 +1,200 @@ #include "global.h" -#include "brush_nodes/boolean_node.c" -#include "brush_nodes/brush_output_node.c" -#include "brush_nodes/color_node.c" -#include "brush_nodes/float_node.c" -#include "brush_nodes/input_node.c" -#include "brush_nodes/integer_node.c" -#include "brush_nodes/math_node.c" -#include "brush_nodes/null_node.c" -#include "brush_nodes/random_node.c" -#include "brush_nodes/separate_vector_node.c" -#include "brush_nodes/string_node.c" -#include "brush_nodes/tex_image_node.c" -#include "brush_nodes/time_node.c" -#include "brush_nodes/vector_math_node.c" -#include "brush_nodes/vector_node.c" +#include "io/export_arm.c" +#include "io/export_exr.c" +#include "io/export_mesh.c" +#include "io/export_obj.c" +#include "io/export_player.c" +#include "io/export_texture.c" +#include "io/import_arm.c" +#include "io/import_asset.c" +#include "io/import_audio.c" +#include "io/import_blend_material.c" +#include "io/import_blend_mesh.c" +#include "io/import_envmap.c" +#include "io/import_folder.c" +#include "io/import_font.c" +#include "io/import_keymap.c" +#include "io/import_legacy.c" +#include "io/import_lut.c" +#include "io/import_mesh.c" +#include "io/import_obj.c" +#include "io/import_plugin.c" +#include "io/import_texture.c" +#include "io/import_theme.c" -#include "material_nodes/attribute_node.c" -#include "material_nodes/bake_texture_node.c" -#include "material_nodes/blur_node.c" -#include "material_nodes/brick_texture_node.c" -#include "material_nodes/brightness_contrast_node.c" -#include "material_nodes/bump_node.c" -#include "material_nodes/camera_texture_node.c" -#include "material_nodes/checker_texture_node.c" -#include "material_nodes/clamp_node.c" -#include "material_nodes/color_mask_node.c" -#include "material_nodes/color_ramp_node.c" -#include "material_nodes/combine_color_node.c" -#include "material_nodes/combine_xyz_node.c" -#include "material_nodes/curvature_bake_node.c" -#include "material_nodes/float_curve_node.c" -#include "material_nodes/gabor_texture_node.c" -#include "material_nodes/gamma_node.c" -#include "material_nodes/geometry_node.c" -#include "material_nodes/gradient_texture_node.c" -#include "material_nodes/group_node.c" -#include "material_nodes/hue_saturation_value_node.c" -#include "material_nodes/image_texture_node.c" -#include "material_nodes/invert_color_node.c" -#include "material_nodes/layer_mask_node.c" -#include "material_nodes/layer_node.c" -#include "material_nodes/magic_texture_node.c" -#include "material_nodes/map_range_node.c" -#include "material_nodes/mapping_node.c" -#include "material_nodes/material_node.c" -#include "material_nodes/material_output_node.c" -#include "material_nodes/math2_node.c" -#include "material_nodes/mix_color_node.c" -#include "material_nodes/mix_normal_map_node.c" -#include "material_nodes/noise_texture_node.c" -#include "material_nodes/normal_map_node.c" -#include "material_nodes/normal_node.c" -#include "material_nodes/object_info_node.c" -#include "material_nodes/picker_node.c" -#include "material_nodes/quantize_node.c" -#include "material_nodes/replace_color_node.c" -#include "material_nodes/rgb_curves_node.c" -#include "material_nodes/rgb_node.c" -#include "material_nodes/rgb_to_bw_node.c" -#include "material_nodes/script_node.c" -#include "material_nodes/separate_color_node.c" -#include "material_nodes/separate_xyz_node.c" -#include "material_nodes/shader_node.c" -#include "material_nodes/text_texture_node.c" -#include "material_nodes/texture_coordinate_node.c" -#include "material_nodes/tilesheet_animation_node.c" -#include "material_nodes/tilesheet_node.c" -#include "material_nodes/uv_map_node.c" -#include "material_nodes/value_node.c" -#include "material_nodes/vector_curves_node.c" -#include "material_nodes/vector_math2_node.c" -#include "material_nodes/vector_rotate_node.c" -#include "material_nodes/vector_transform_node.c" -#include "material_nodes/voronoi_texture_node.c" -#include "material_nodes/warp_node.c" -#include "material_nodes/wave_texture_node.c" -#include "material_nodes/wireframe_node.c" +#include "nodes_brush/boolean_node.c" +#include "nodes_brush/brush_output_node.c" +#include "nodes_brush/color_node.c" +#include "nodes_brush/float_node.c" +#include "nodes_brush/input_node.c" +#include "nodes_brush/integer_node.c" +#include "nodes_brush/math_node.c" +#include "nodes_brush/null_node.c" +#include "nodes_brush/random_node.c" +#include "nodes_brush/separate_vector_node.c" +#include "nodes_brush/string_node.c" +#include "nodes_brush/tex_image_node.c" +#include "nodes_brush/time_node.c" +#include "nodes_brush/vector_math_node.c" +#include "nodes_brush/vector_node.c" -#include "neural_nodes/edit_image_node.c" -#include "neural_nodes/image_to_3d_mesh_node.c" -#include "neural_nodes/image_to_depth_node.c" -#include "neural_nodes/image_to_normal_map_node.c" -#include "neural_nodes/image_to_pbr_node.c" -#include "neural_nodes/inpaint_image_node.c" -#include "neural_nodes/neural_node.c" -#include "neural_nodes/neural_node_models.c" -#include "neural_nodes/outpaint_image_node.c" -#include "neural_nodes/repeat_node.c" -#include "neural_nodes/save_image_node.c" -#include "neural_nodes/text_to_image_node.c" -#include "neural_nodes/text_to_text_node.c" -#include "neural_nodes/texture_mesh_node.c" -#include "neural_nodes/tile_image_node.c" -#include "neural_nodes/upscale_image_node.c" -#include "neural_nodes/vary_image_node.c" +#include "nodes_material/attribute_node.c" +#include "nodes_material/bake_texture_node.c" +#include "nodes_material/blur_node.c" +#include "nodes_material/brick_texture_node.c" +#include "nodes_material/brightness_contrast_node.c" +#include "nodes_material/bump_node.c" +#include "nodes_material/camera_texture_node.c" +#include "nodes_material/checker_texture_node.c" +#include "nodes_material/clamp_node.c" +#include "nodes_material/color_mask_node.c" +#include "nodes_material/color_ramp_node.c" +#include "nodes_material/combine_color_node.c" +#include "nodes_material/combine_xyz_node.c" +#include "nodes_material/curvature_bake_node.c" +#include "nodes_material/float_curve_node.c" +#include "nodes_material/gabor_texture_node.c" +#include "nodes_material/gamma_node.c" +#include "nodes_material/geometry_node.c" +#include "nodes_material/gradient_texture_node.c" +#include "nodes_material/group_node.c" +#include "nodes_material/hue_saturation_value_node.c" +#include "nodes_material/image_texture_node.c" +#include "nodes_material/invert_color_node.c" +#include "nodes_material/layer_mask_node.c" +#include "nodes_material/layer_node.c" +#include "nodes_material/magic_texture_node.c" +#include "nodes_material/map_range_node.c" +#include "nodes_material/mapping_node.c" +#include "nodes_material/material_node.c" +#include "nodes_material/material_output_node.c" +#include "nodes_material/math2_node.c" +#include "nodes_material/mix_color_node.c" +#include "nodes_material/mix_normal_map_node.c" +#include "nodes_material/noise_texture_node.c" +#include "nodes_material/normal_map_node.c" +#include "nodes_material/normal_node.c" +#include "nodes_material/object_info_node.c" +#include "nodes_material/picker_node.c" +#include "nodes_material/quantize_node.c" +#include "nodes_material/replace_color_node.c" +#include "nodes_material/rgb_curves_node.c" +#include "nodes_material/rgb_node.c" +#include "nodes_material/rgb_to_bw_node.c" +#include "nodes_material/script_node.c" +#include "nodes_material/separate_color_node.c" +#include "nodes_material/separate_xyz_node.c" +#include "nodes_material/shader_node.c" +#include "nodes_material/text_texture_node.c" +#include "nodes_material/texture_coordinate_node.c" +#include "nodes_material/tilesheet_animation_node.c" +#include "nodes_material/tilesheet_node.c" +#include "nodes_material/uv_map_node.c" +#include "nodes_material/value_node.c" +#include "nodes_material/vector_curves_node.c" +#include "nodes_material/vector_math2_node.c" +#include "nodes_material/vector_rotate_node.c" +#include "nodes_material/vector_transform_node.c" +#include "nodes_material/voronoi_texture_node.c" +#include "nodes_material/warp_node.c" +#include "nodes_material/wave_texture_node.c" +#include "nodes_material/wireframe_node.c" + +#include "nodes_neural/edit_image_node.c" +#include "nodes_neural/image_to_3d_mesh_node.c" +#include "nodes_neural/image_to_depth_node.c" +#include "nodes_neural/image_to_normal_map_node.c" +#include "nodes_neural/image_to_pbr_node.c" +#include "nodes_neural/inpaint_image_node.c" +#include "nodes_neural/neural_node.c" +#include "nodes_neural/neural_node_models.c" +#include "nodes_neural/outpaint_image_node.c" +#include "nodes_neural/repeat_node.c" +#include "nodes_neural/save_image_node.c" +#include "nodes_neural/text_to_image_node.c" +#include "nodes_neural/text_to_text_node.c" +#include "nodes_neural/texture_mesh_node.c" +#include "nodes_neural/tile_image_node.c" +#include "nodes_neural/upscale_image_node.c" +#include "nodes_neural/vary_image_node.c" + +#include "render/make_bake.c" +#include "render/make_blur.c" +#include "render/make_brush.c" +#include "render/make_clone.c" +#include "render/make_depth.c" +#include "render/make_discard.c" +#include "render/make_material.c" +#include "render/make_mesh.c" +#include "render/make_mesh_preview.c" +#include "render/make_node_preview.c" +#include "render/make_paint.c" +#include "render/make_particle.c" +#include "render/make_picking.c" +#include "render/make_sculpt.c" +#include "render/make_texcoord.c" +#include "render/render_compass.c" +#include "render/render_envsphere.c" +#include "render/render_gizmo.c" +#include "render/render_path_base.c" +#include "render/render_path_deferred.c" +#include "render/render_path_forward.c" +#include "render/render_path_paint.c" +#include "render/render_path_preview.c" +#include "render/render_path_raytrace.c" +#include "render/render_path_raytrace_bake.c" +#include "render/render_pathsphere.c" + +#include "ui/box_export.c" +#include "ui/box_preferences.c" +#include "ui/box_projects.c" +#include "ui/tab_browser.c" +#include "ui/tab_brushes.c" +#include "ui/tab_console.c" +#include "ui/tab_debug.c" +#include "ui/tab_fonts.c" +#include "ui/tab_layers.c" +#include "ui/tab_materials.c" +#include "ui/tab_meshes.c" +#include "ui/tab_plugins.c" +#include "ui/tab_scripts.c" +#include "ui/tab_stages.c" +#include "ui/tab_swatches.c" +#include "ui/tab_textures.c" +#include "ui/tab_timeline.c" +#include "ui/ui_box.c" +#include "ui/ui_files.c" +#include "ui/ui_header.c" +#include "ui/ui_menu.c" +#include "ui/ui_menubar.c" +#include "ui/ui_nodes.c" +#include "ui/ui_sidebar.c" +#include "ui/ui_statusbar.c" +#include "ui/ui_toolbar.c" +#include "ui/ui_view2d.c" + +#include "util/edit_uvmap.c" +#include "util/geom.c" +#include "util/util_clone.c" +#include "util/util_encode.c" +#include "util/util_layer.c" +#include "util/util_mesh.c" +#include "util/util_particle.c" +#include "util/util_render.c" +#include "util/util_texture.c" +#include "util/util_uv.c" #include "args.c" #include "base.c" -#include "box_export.c" -#include "box_preferences.c" -#include "box_projects.c" #include "camera.c" #include "config.c" #include "console.c" #include "context.c" -#include "edit_uvmap.c" -#include "export_arm.c" -#include "export_exr.c" -#include "export_mesh.c" -#include "export_obj.c" -#include "export_player.c" -#include "export_texture.c" -#include "geom.c" #include "history.c" -#include "import_arm.c" -#include "import_asset.c" -#include "import_audio.c" -#include "import_blend_material.c" -#include "import_blend_mesh.c" -#include "import_envmap.c" -#include "import_folder.c" -#include "import_font.c" -#include "import_keymap.c" -#include "import_legacy.c" -#include "import_lut.c" -#include "import_mesh.c" -#include "import_obj.c" -#include "import_plugin.c" -#include "import_texture.c" -#include "import_theme.c" #include "keymap.c" #include "logic_node.c" -#include "make_bake.c" -#include "make_blur.c" -#include "make_brush.c" -#include "make_clone.c" -#include "make_depth.c" -#include "make_discard.c" -#include "make_material.c" -#include "make_mesh.c" -#include "make_mesh_preview.c" -#include "make_node_preview.c" -#include "make_paint.c" -#include "make_particle.c" -#include "make_picking.c" -#include "make_sculpt.c" -#include "make_texcoord.c" #include "node_shader.c" #include "nodes_brush.c" #include "nodes_material.c" @@ -161,57 +208,376 @@ #include "player.c" #include "plugin.c" #include "project.c" -#include "render_compass.c" -#include "render_envsphere.c" -#include "render_gizmo.c" -#include "render_path_base.c" -#include "render_path_deferred.c" -#include "render_path_forward.c" -#include "render_path_paint.c" -#include "render_path_preview.c" -#include "render_path_raytrace.c" -#include "render_path_raytrace_bake.c" -#include "render_pathsphere.c" #include "resource.c" #include "slot_brush.c" #include "slot_font.c" #include "slot_layer.c" #include "slot_material.c" #include "strings.c" -#include "tab_browser.c" -#include "tab_brushes.c" -#include "tab_console.c" -#include "tab_debug.c" -#include "tab_fonts.c" -#include "tab_layers.c" -#include "tab_materials.c" -#include "tab_meshes.c" -#include "tab_plugins.c" -#include "tab_scripts.c" -#include "tab_stages.c" -#include "tab_swatches.c" -#include "tab_textures.c" -#include "tab_timeline.c" #include "translator.c" -#include "ui_box.c" -#include "ui_files.c" -#include "ui_header.c" -#include "ui_menu.c" -#include "ui_menubar.c" -#include "ui_nodes.c" -#include "ui_sidebar.c" -#include "ui_statusbar.c" -#include "ui_toolbar.c" -#include "ui_view2d.c" #include "uniforms.c" -#include "util_clone.c" -#include "util_encode.c" -#include "util_layer.c" -#include "util_mesh.c" -#include "util_particle.c" -#include "util_render.c" -#include "util_texture.c" -#include "util_uv.c" #include "viewport.c" -#include "kickstart.c" +#ifdef WITH_PLUGINS +void plugins_init(); +#endif + +void _kickstart() { + _render_path_cached_shader_contexts = any_map_create(); + gc_root(_render_path_cached_shader_contexts); + + ui_children = any_map_create(); + gc_root(ui_children); + + ui_nodes_custom_buttons = any_map_create(); + gc_root(ui_nodes_custom_buttons); + + operator_ops = any_map_create(); + gc_root(operator_ops); + + physics_body_object_map = any_imap_create(); + gc_root(physics_body_object_map); + + box_export_htab = ui_handle_create(); + gc_root(box_export_htab); + + box_export_mesh_handle = ui_handle_create(); + gc_root(box_export_mesh_handle); + + box_export_hpreset = ui_handle_create(); + gc_root(box_export_hpreset); + + box_export_channels = any_array_create_from_raw( + (void *[]){ + "base_r", "base_g", "base_b", "height", "metal", "nor_r", "nor_g", "nor_g_directx", "nor_b", "occ", "opac", "rough", + "smooth", "emis", "subs", "diff_r", "diff_g", "diff_b", "spec_r", "spec_g", "spec_b", "0.0", "1.0", + }, + 23); + gc_root(box_export_channels); + + box_export_color_spaces = any_array_create_from_raw( + (void *[]){ + "linear", + "srgb", + }, + 2); + gc_root(box_export_color_spaces); + + box_export_h_export_player_target = ui_handle_create(); + gc_root(box_export_h_export_player_target); + + import_texture_importers = any_map_create(); + gc_root(import_texture_importers); + + ui_files_path = ui_files_default_path; + gc_root(ui_files_path); + + base_res_handle = ui_handle_create(); + gc_root(base_res_handle); + + base_bits_handle = ui_handle_create(); + gc_root(base_bits_handle); + + base_drop_paths = any_array_create_from_raw((void *[]){}, 0); + gc_root(base_drop_paths); + + ui_base_hwnds = ui_base_init_hwnds(); + gc_root(ui_base_hwnds); + + ui_base_htabs = ui_base_init_htabs(); + gc_root(ui_base_htabs); + + ui_base_hwnd_tabs = ui_base_init_hwnd_tabs(); + gc_root(ui_base_hwnd_tabs); + + ui_toolbar_handle = ui_handle_create(); + gc_root(ui_toolbar_handle); + + ui_toolbar_tool_names = any_array_create_from_raw( + (void *[]){ + _tr("Brush"), + _tr("Eraser"), + _tr("Fill"), + _tr("Decal"), + _tr("Text"), + _tr("Clone"), + _tr("Blur"), + _tr("Particle"), + _tr("ColorID"), + _tr("Picker"), + _tr("Material"), + _tr("Cursor"), + }, + 12); + gc_root(ui_toolbar_tool_names); + + ui_toolbar_tooltip_extras = any_array_create_from_raw( + (void *[]){ + _tr("Hold {action_paint} to paint\nHold {brush_ruler} and press {action_paint} to paint a straight line (ruler mode)"), + _tr("Hold {action_paint} to erase\nHold {brush_ruler} and press {action_paint} to erase a straight line (ruler mode)"), + "", + _tr("Hold {decal_mask} to paint on a decal mask"), + _tr("Hold {decal_mask} to use the text as a mask"), + _tr("Hold {set_clone_source} to set source"), + "", + "", + "", + "", + "", + "", + }, + 12); + gc_root(ui_toolbar_tooltip_extras); + uniforms_ext_ortho_p = mat4_ortho(-0.5, 0.5, -0.5, 0.5, -0.5, 0.5); + + box_projects_htab = ui_handle_create(); + gc_root(box_projects_htab); + + box_projects_hsearch = ui_handle_create(); + gc_root(box_projects_hsearch); + + tab_scripts_hscript = ui_handle_create(); + gc_root(tab_scripts_hscript); + + import_mesh_importers = any_map_create(); + gc_root(import_mesh_importers); + + ui_menubar_hwnd = ui_handle_create(); + gc_root(ui_menubar_hwnd); + + ui_menubar_menu_handle = ui_handle_create(); + gc_root(ui_menubar_menu_handle); + + ui_menubar_tab = ui_handle_create(); + gc_root(ui_menubar_tab); + ui_menubar_w = ui_menubar_default_w; + + translator_translations = any_map_create(); + gc_root(translator_translations); + + g_project = GC_ALLOC_INIT(project_t, {0}); + gc_root(g_project); + + project_assets = any_array_create_from_raw((void *[]){}, 0); + gc_root(project_assets); + + project_asset_names = any_array_create_from_raw((void *[]){}, 0); + gc_root(project_asset_names); + + project_mesh_assets = any_array_create_from_raw((void *[]){}, 0); + gc_root(project_mesh_assets); + + project_material_groups = any_array_create_from_raw((void *[]){}, 0); + gc_root(project_material_groups); + + project_asset_map = any_imap_create(); + gc_root(project_asset_map); + + project_materials = any_array_create_from_raw((void *[]){}, 0); + gc_root(project_materials); + + project_brushes = any_array_create_from_raw((void *[]){}, 0); + gc_root(project_brushes); + + project_layers = any_array_create_from_raw((void *[]){}, 0); + gc_root(project_layers); + + project_fonts = any_array_create_from_raw((void *[]){}, 0); + gc_root(project_fonts); + + ui_view2d_hwnd = ui_handle_create(); + gc_root(ui_view2d_hwnd); + + ui_view2d_htab = ui_handle_create(); + gc_root(ui_view2d_htab); + + sim_object_script_map = any_map_create(); + gc_root(sim_object_script_map); + + parser_material_node_values = any_map_create(); + gc_root(parser_material_node_values); + + parser_material_node_vectors = any_map_create(); + gc_root(parser_material_node_vectors); + + parser_material_custom_nodes = any_map_create(); + gc_root(parser_material_custom_nodes); + + parser_material_parsed_map = any_map_create(); + gc_root(parser_material_parsed_map); + + parser_material_texture_map = any_map_create(); + gc_root(parser_material_texture_map); + + tab_browser_hpath = ui_handle_create(); + gc_root(tab_browser_hpath); + + tab_browser_hsearch = ui_handle_create(); + gc_root(tab_browser_hsearch); + + util_mesh_unwrappers = any_map_create(); + gc_root(util_mesh_unwrappers); + + ui_header_h = ui_header_default_h; + + ui_header_handle = ui_handle_create(); + gc_root(ui_header_handle); + + plugin_map = any_map_create(); + gc_root(plugin_map); + + parser_logic_custom_nodes = any_map_create(); + gc_root(parser_logic_custom_nodes); + + resource_bundled = any_map_create(); + gc_root(resource_bundled); + + ui_nodes_hwnd = ui_handle_create(); + gc_root(ui_nodes_hwnd); + + ui_nodes_group_stack = any_array_create_from_raw((void *[]){}, 0); + gc_root(ui_nodes_group_stack); + + ui_nodes_htab = ui_handle_create(); + gc_root(ui_nodes_htab); + + _ui_nodes_htype = ui_handle_create(); + gc_root(_ui_nodes_htype); + + _ui_nodes_hname = ui_handle_create(); + gc_root(_ui_nodes_hname); + + _ui_nodes_hmin = ui_handle_create(); + gc_root(_ui_nodes_hmin); + + _ui_nodes_hmax = ui_handle_create(); + gc_root(_ui_nodes_hmax); + + _ui_nodes_hval0 = ui_handle_create(); + gc_root(_ui_nodes_hval0); + + _ui_nodes_hval1 = ui_handle_create(); + gc_root(_ui_nodes_hval1); + + _ui_nodes_hval2 = ui_handle_create(); + gc_root(_ui_nodes_hval2); + + _ui_nodes_hval3 = ui_handle_create(); + gc_root(_ui_nodes_hval3); + + nodes_brush_categories = any_array_create_from_raw( + (void *[]){ + _tr("Nodes"), + }, + 1); + gc_root(nodes_brush_categories); + +#if defined(IRON_WINDOWS) || defined(IRON_LINUX) || defined(IRON_MACOS) + nodes_material_categories = any_array_create_from_raw( + (void *[]){ + _tr("Input"), + _tr("Texture"), + _tr("Color"), + _tr("Utilities"), + _tr("Neural"), + _tr("Group"), + }, + 6); +#else + nodes_material_categories = any_array_create_from_raw( + (void *[]){ + _tr("Input"), + _tr("Texture"), + _tr("Color"), + _tr("Utilities"), + _tr("Group"), + }, + 5); +#endif + gc_root(nodes_material_categories); + +#if defined(IRON_ANDROID) || defined(IRON_IOS) + ui_sidebar_default_w = ui_sidebar_default_w_mini; +#else + ui_sidebar_default_w = ui_sidebar_default_w_full; +#endif + + ui_sidebar_hminimized = ui_handle_create(); + gc_root(ui_sidebar_hminimized); + ui_sidebar_w_mini = ui_sidebar_default_w_mini; + + console_last_traces = any_array_create(0); + gc_root(console_last_traces); + + box_preferences_htab = ui_handle_create(); + gc_root(box_preferences_htab); + + ui_box_hwnd = ui_handle_create(); + gc_root(ui_box_hwnd); + + tab_layers_layer_name_handle = ui_handle_create(); + gc_root(tab_layers_layer_name_handle); + + render_path_raytrace_f32a = f32_array_create(24); + gc_root(render_path_raytrace_f32a); + render_path_raytrace_help_mat = mat4_identity(); + + neural_node_results = any_imap_create(); + gc_root(neural_node_results); + + sys_on_resize = base_on_resize; + sys_on_w = base_w; + sys_on_h = base_h; + sys_on_x = base_x; + sys_on_y = base_y; + + iron_set_app_name(manifest_title); // Used to locate external application data folder + config_load(); + config_init(); + context_init(); + sys_start(config_get_options()); + +#ifdef is_debug + double t_start = iron_time(); +#endif + + if (g_config->layout == NULL) { + config_init_layout(); + } + iron_set_app_name(manifest_title); + + data_cached_scene_raws = any_map_create(); + gc_root(data_cached_scene_raws); + any_map_set(data_cached_scene_raws, "Scene", startup_get_scene()); + scene_set_active("Scene"); + + uniforms_ext_init(); + render_path_base_init(); + render_path_deferred_init(); // Allocate gbuffer + if (g_config->render_mode == RENDER_MODE_FORWARD) { + render_path_forward_init(); + render_path_commands = render_path_forward_commands; + gc_root(render_path_commands); + } + else { + + render_path_commands = render_path_deferred_commands; + gc_root(render_path_commands); + } + +#ifdef WITH_PLUGINS + plugins_init(); +#endif + + if (!string_equals(g_config->lut_path, "") && iron_file_exists(g_config->lut_path)) { + import_lut_run(g_config->lut_path); + } + + base_init(); + +#ifdef is_debug + iron_log("Started in %fs\n", iron_time() - t_start); +#endif + + iron_start(); +} diff --git a/paint/sources/brush_nodes/boolean_node.c b/paint/sources/nodes_brush/boolean_node.c similarity index 100% rename from paint/sources/brush_nodes/boolean_node.c rename to paint/sources/nodes_brush/boolean_node.c diff --git a/paint/sources/brush_nodes/brush_output_node.c b/paint/sources/nodes_brush/brush_output_node.c similarity index 100% rename from paint/sources/brush_nodes/brush_output_node.c rename to paint/sources/nodes_brush/brush_output_node.c diff --git a/paint/sources/brush_nodes/color_node.c b/paint/sources/nodes_brush/color_node.c similarity index 100% rename from paint/sources/brush_nodes/color_node.c rename to paint/sources/nodes_brush/color_node.c diff --git a/paint/sources/brush_nodes/float_node.c b/paint/sources/nodes_brush/float_node.c similarity index 100% rename from paint/sources/brush_nodes/float_node.c rename to paint/sources/nodes_brush/float_node.c diff --git a/paint/sources/brush_nodes/input_node.c b/paint/sources/nodes_brush/input_node.c similarity index 100% rename from paint/sources/brush_nodes/input_node.c rename to paint/sources/nodes_brush/input_node.c diff --git a/paint/sources/brush_nodes/integer_node.c b/paint/sources/nodes_brush/integer_node.c similarity index 100% rename from paint/sources/brush_nodes/integer_node.c rename to paint/sources/nodes_brush/integer_node.c diff --git a/paint/sources/brush_nodes/math_node.c b/paint/sources/nodes_brush/math_node.c similarity index 100% rename from paint/sources/brush_nodes/math_node.c rename to paint/sources/nodes_brush/math_node.c diff --git a/paint/sources/brush_nodes/null_node.c b/paint/sources/nodes_brush/null_node.c similarity index 100% rename from paint/sources/brush_nodes/null_node.c rename to paint/sources/nodes_brush/null_node.c diff --git a/paint/sources/brush_nodes/random_node.c b/paint/sources/nodes_brush/random_node.c similarity index 100% rename from paint/sources/brush_nodes/random_node.c rename to paint/sources/nodes_brush/random_node.c diff --git a/paint/sources/brush_nodes/separate_vector_node.c b/paint/sources/nodes_brush/separate_vector_node.c similarity index 100% rename from paint/sources/brush_nodes/separate_vector_node.c rename to paint/sources/nodes_brush/separate_vector_node.c diff --git a/paint/sources/brush_nodes/string_node.c b/paint/sources/nodes_brush/string_node.c similarity index 100% rename from paint/sources/brush_nodes/string_node.c rename to paint/sources/nodes_brush/string_node.c diff --git a/paint/sources/brush_nodes/tex_image_node.c b/paint/sources/nodes_brush/tex_image_node.c similarity index 100% rename from paint/sources/brush_nodes/tex_image_node.c rename to paint/sources/nodes_brush/tex_image_node.c diff --git a/paint/sources/brush_nodes/time_node.c b/paint/sources/nodes_brush/time_node.c similarity index 100% rename from paint/sources/brush_nodes/time_node.c rename to paint/sources/nodes_brush/time_node.c diff --git a/paint/sources/brush_nodes/vector_math_node.c b/paint/sources/nodes_brush/vector_math_node.c similarity index 100% rename from paint/sources/brush_nodes/vector_math_node.c rename to paint/sources/nodes_brush/vector_math_node.c diff --git a/paint/sources/brush_nodes/vector_node.c b/paint/sources/nodes_brush/vector_node.c similarity index 100% rename from paint/sources/brush_nodes/vector_node.c rename to paint/sources/nodes_brush/vector_node.c diff --git a/paint/sources/material_nodes/attribute_node.c b/paint/sources/nodes_material/attribute_node.c similarity index 100% rename from paint/sources/material_nodes/attribute_node.c rename to paint/sources/nodes_material/attribute_node.c diff --git a/paint/sources/material_nodes/bake_texture_node.c b/paint/sources/nodes_material/bake_texture_node.c similarity index 100% rename from paint/sources/material_nodes/bake_texture_node.c rename to paint/sources/nodes_material/bake_texture_node.c diff --git a/paint/sources/material_nodes/blur_node.c b/paint/sources/nodes_material/blur_node.c similarity index 100% rename from paint/sources/material_nodes/blur_node.c rename to paint/sources/nodes_material/blur_node.c diff --git a/paint/sources/material_nodes/brick_texture_node.c b/paint/sources/nodes_material/brick_texture_node.c similarity index 100% rename from paint/sources/material_nodes/brick_texture_node.c rename to paint/sources/nodes_material/brick_texture_node.c diff --git a/paint/sources/material_nodes/brightness_contrast_node.c b/paint/sources/nodes_material/brightness_contrast_node.c similarity index 100% rename from paint/sources/material_nodes/brightness_contrast_node.c rename to paint/sources/nodes_material/brightness_contrast_node.c diff --git a/paint/sources/material_nodes/bump_node.c b/paint/sources/nodes_material/bump_node.c similarity index 100% rename from paint/sources/material_nodes/bump_node.c rename to paint/sources/nodes_material/bump_node.c diff --git a/paint/sources/material_nodes/camera_texture_node.c b/paint/sources/nodes_material/camera_texture_node.c similarity index 100% rename from paint/sources/material_nodes/camera_texture_node.c rename to paint/sources/nodes_material/camera_texture_node.c diff --git a/paint/sources/material_nodes/checker_texture_node.c b/paint/sources/nodes_material/checker_texture_node.c similarity index 100% rename from paint/sources/material_nodes/checker_texture_node.c rename to paint/sources/nodes_material/checker_texture_node.c diff --git a/paint/sources/material_nodes/clamp_node.c b/paint/sources/nodes_material/clamp_node.c similarity index 100% rename from paint/sources/material_nodes/clamp_node.c rename to paint/sources/nodes_material/clamp_node.c diff --git a/paint/sources/material_nodes/color_mask_node.c b/paint/sources/nodes_material/color_mask_node.c similarity index 100% rename from paint/sources/material_nodes/color_mask_node.c rename to paint/sources/nodes_material/color_mask_node.c diff --git a/paint/sources/material_nodes/color_ramp_node.c b/paint/sources/nodes_material/color_ramp_node.c similarity index 100% rename from paint/sources/material_nodes/color_ramp_node.c rename to paint/sources/nodes_material/color_ramp_node.c diff --git a/paint/sources/material_nodes/combine_color_node.c b/paint/sources/nodes_material/combine_color_node.c similarity index 100% rename from paint/sources/material_nodes/combine_color_node.c rename to paint/sources/nodes_material/combine_color_node.c diff --git a/paint/sources/material_nodes/combine_xyz_node.c b/paint/sources/nodes_material/combine_xyz_node.c similarity index 100% rename from paint/sources/material_nodes/combine_xyz_node.c rename to paint/sources/nodes_material/combine_xyz_node.c diff --git a/paint/sources/material_nodes/curvature_bake_node.c b/paint/sources/nodes_material/curvature_bake_node.c similarity index 100% rename from paint/sources/material_nodes/curvature_bake_node.c rename to paint/sources/nodes_material/curvature_bake_node.c diff --git a/paint/sources/material_nodes/float_curve_node.c b/paint/sources/nodes_material/float_curve_node.c similarity index 100% rename from paint/sources/material_nodes/float_curve_node.c rename to paint/sources/nodes_material/float_curve_node.c diff --git a/paint/sources/material_nodes/gabor_texture_node.c b/paint/sources/nodes_material/gabor_texture_node.c similarity index 100% rename from paint/sources/material_nodes/gabor_texture_node.c rename to paint/sources/nodes_material/gabor_texture_node.c diff --git a/paint/sources/material_nodes/gamma_node.c b/paint/sources/nodes_material/gamma_node.c similarity index 100% rename from paint/sources/material_nodes/gamma_node.c rename to paint/sources/nodes_material/gamma_node.c diff --git a/paint/sources/material_nodes/geometry_node.c b/paint/sources/nodes_material/geometry_node.c similarity index 100% rename from paint/sources/material_nodes/geometry_node.c rename to paint/sources/nodes_material/geometry_node.c diff --git a/paint/sources/material_nodes/gradient_texture_node.c b/paint/sources/nodes_material/gradient_texture_node.c similarity index 100% rename from paint/sources/material_nodes/gradient_texture_node.c rename to paint/sources/nodes_material/gradient_texture_node.c diff --git a/paint/sources/material_nodes/group_node.c b/paint/sources/nodes_material/group_node.c similarity index 100% rename from paint/sources/material_nodes/group_node.c rename to paint/sources/nodes_material/group_node.c diff --git a/paint/sources/material_nodes/hue_saturation_value_node.c b/paint/sources/nodes_material/hue_saturation_value_node.c similarity index 100% rename from paint/sources/material_nodes/hue_saturation_value_node.c rename to paint/sources/nodes_material/hue_saturation_value_node.c diff --git a/paint/sources/material_nodes/image_texture_node.c b/paint/sources/nodes_material/image_texture_node.c similarity index 100% rename from paint/sources/material_nodes/image_texture_node.c rename to paint/sources/nodes_material/image_texture_node.c diff --git a/paint/sources/material_nodes/invert_color_node.c b/paint/sources/nodes_material/invert_color_node.c similarity index 100% rename from paint/sources/material_nodes/invert_color_node.c rename to paint/sources/nodes_material/invert_color_node.c diff --git a/paint/sources/material_nodes/layer_mask_node.c b/paint/sources/nodes_material/layer_mask_node.c similarity index 100% rename from paint/sources/material_nodes/layer_mask_node.c rename to paint/sources/nodes_material/layer_mask_node.c diff --git a/paint/sources/material_nodes/layer_node.c b/paint/sources/nodes_material/layer_node.c similarity index 100% rename from paint/sources/material_nodes/layer_node.c rename to paint/sources/nodes_material/layer_node.c diff --git a/paint/sources/material_nodes/magic_texture_node.c b/paint/sources/nodes_material/magic_texture_node.c similarity index 100% rename from paint/sources/material_nodes/magic_texture_node.c rename to paint/sources/nodes_material/magic_texture_node.c diff --git a/paint/sources/material_nodes/map_range_node.c b/paint/sources/nodes_material/map_range_node.c similarity index 100% rename from paint/sources/material_nodes/map_range_node.c rename to paint/sources/nodes_material/map_range_node.c diff --git a/paint/sources/material_nodes/mapping_node.c b/paint/sources/nodes_material/mapping_node.c similarity index 100% rename from paint/sources/material_nodes/mapping_node.c rename to paint/sources/nodes_material/mapping_node.c diff --git a/paint/sources/material_nodes/material_node.c b/paint/sources/nodes_material/material_node.c similarity index 100% rename from paint/sources/material_nodes/material_node.c rename to paint/sources/nodes_material/material_node.c diff --git a/paint/sources/material_nodes/material_output_node.c b/paint/sources/nodes_material/material_output_node.c similarity index 100% rename from paint/sources/material_nodes/material_output_node.c rename to paint/sources/nodes_material/material_output_node.c diff --git a/paint/sources/material_nodes/math2_node.c b/paint/sources/nodes_material/math2_node.c similarity index 100% rename from paint/sources/material_nodes/math2_node.c rename to paint/sources/nodes_material/math2_node.c diff --git a/paint/sources/material_nodes/mix_color_node.c b/paint/sources/nodes_material/mix_color_node.c similarity index 100% rename from paint/sources/material_nodes/mix_color_node.c rename to paint/sources/nodes_material/mix_color_node.c diff --git a/paint/sources/material_nodes/mix_normal_map_node.c b/paint/sources/nodes_material/mix_normal_map_node.c similarity index 100% rename from paint/sources/material_nodes/mix_normal_map_node.c rename to paint/sources/nodes_material/mix_normal_map_node.c diff --git a/paint/sources/material_nodes/noise_texture_node.c b/paint/sources/nodes_material/noise_texture_node.c similarity index 100% rename from paint/sources/material_nodes/noise_texture_node.c rename to paint/sources/nodes_material/noise_texture_node.c diff --git a/paint/sources/material_nodes/normal_map_node.c b/paint/sources/nodes_material/normal_map_node.c similarity index 100% rename from paint/sources/material_nodes/normal_map_node.c rename to paint/sources/nodes_material/normal_map_node.c diff --git a/paint/sources/material_nodes/normal_node.c b/paint/sources/nodes_material/normal_node.c similarity index 100% rename from paint/sources/material_nodes/normal_node.c rename to paint/sources/nodes_material/normal_node.c diff --git a/paint/sources/material_nodes/object_info_node.c b/paint/sources/nodes_material/object_info_node.c similarity index 100% rename from paint/sources/material_nodes/object_info_node.c rename to paint/sources/nodes_material/object_info_node.c diff --git a/paint/sources/material_nodes/picker_node.c b/paint/sources/nodes_material/picker_node.c similarity index 100% rename from paint/sources/material_nodes/picker_node.c rename to paint/sources/nodes_material/picker_node.c diff --git a/paint/sources/material_nodes/quantize_node.c b/paint/sources/nodes_material/quantize_node.c similarity index 100% rename from paint/sources/material_nodes/quantize_node.c rename to paint/sources/nodes_material/quantize_node.c diff --git a/paint/sources/material_nodes/readme.md b/paint/sources/nodes_material/readme.md similarity index 100% rename from paint/sources/material_nodes/readme.md rename to paint/sources/nodes_material/readme.md diff --git a/paint/sources/material_nodes/replace_color_node.c b/paint/sources/nodes_material/replace_color_node.c similarity index 100% rename from paint/sources/material_nodes/replace_color_node.c rename to paint/sources/nodes_material/replace_color_node.c diff --git a/paint/sources/material_nodes/rgb_curves_node.c b/paint/sources/nodes_material/rgb_curves_node.c similarity index 100% rename from paint/sources/material_nodes/rgb_curves_node.c rename to paint/sources/nodes_material/rgb_curves_node.c diff --git a/paint/sources/material_nodes/rgb_node.c b/paint/sources/nodes_material/rgb_node.c similarity index 100% rename from paint/sources/material_nodes/rgb_node.c rename to paint/sources/nodes_material/rgb_node.c diff --git a/paint/sources/material_nodes/rgb_to_bw_node.c b/paint/sources/nodes_material/rgb_to_bw_node.c similarity index 100% rename from paint/sources/material_nodes/rgb_to_bw_node.c rename to paint/sources/nodes_material/rgb_to_bw_node.c diff --git a/paint/sources/material_nodes/script_node.c b/paint/sources/nodes_material/script_node.c similarity index 100% rename from paint/sources/material_nodes/script_node.c rename to paint/sources/nodes_material/script_node.c diff --git a/paint/sources/material_nodes/separate_color_node.c b/paint/sources/nodes_material/separate_color_node.c similarity index 100% rename from paint/sources/material_nodes/separate_color_node.c rename to paint/sources/nodes_material/separate_color_node.c diff --git a/paint/sources/material_nodes/separate_xyz_node.c b/paint/sources/nodes_material/separate_xyz_node.c similarity index 100% rename from paint/sources/material_nodes/separate_xyz_node.c rename to paint/sources/nodes_material/separate_xyz_node.c diff --git a/paint/sources/material_nodes/shader_node.c b/paint/sources/nodes_material/shader_node.c similarity index 100% rename from paint/sources/material_nodes/shader_node.c rename to paint/sources/nodes_material/shader_node.c diff --git a/paint/sources/material_nodes/text_texture_node.c b/paint/sources/nodes_material/text_texture_node.c similarity index 100% rename from paint/sources/material_nodes/text_texture_node.c rename to paint/sources/nodes_material/text_texture_node.c diff --git a/paint/sources/material_nodes/texture_coordinate_node.c b/paint/sources/nodes_material/texture_coordinate_node.c similarity index 100% rename from paint/sources/material_nodes/texture_coordinate_node.c rename to paint/sources/nodes_material/texture_coordinate_node.c diff --git a/paint/sources/material_nodes/tilesheet_animation_node.c b/paint/sources/nodes_material/tilesheet_animation_node.c similarity index 100% rename from paint/sources/material_nodes/tilesheet_animation_node.c rename to paint/sources/nodes_material/tilesheet_animation_node.c diff --git a/paint/sources/material_nodes/tilesheet_node.c b/paint/sources/nodes_material/tilesheet_node.c similarity index 100% rename from paint/sources/material_nodes/tilesheet_node.c rename to paint/sources/nodes_material/tilesheet_node.c diff --git a/paint/sources/material_nodes/uv_map_node.c b/paint/sources/nodes_material/uv_map_node.c similarity index 100% rename from paint/sources/material_nodes/uv_map_node.c rename to paint/sources/nodes_material/uv_map_node.c diff --git a/paint/sources/material_nodes/value_node.c b/paint/sources/nodes_material/value_node.c similarity index 100% rename from paint/sources/material_nodes/value_node.c rename to paint/sources/nodes_material/value_node.c diff --git a/paint/sources/material_nodes/vector_curves_node.c b/paint/sources/nodes_material/vector_curves_node.c similarity index 100% rename from paint/sources/material_nodes/vector_curves_node.c rename to paint/sources/nodes_material/vector_curves_node.c diff --git a/paint/sources/material_nodes/vector_math2_node.c b/paint/sources/nodes_material/vector_math2_node.c similarity index 100% rename from paint/sources/material_nodes/vector_math2_node.c rename to paint/sources/nodes_material/vector_math2_node.c diff --git a/paint/sources/material_nodes/vector_rotate_node.c b/paint/sources/nodes_material/vector_rotate_node.c similarity index 100% rename from paint/sources/material_nodes/vector_rotate_node.c rename to paint/sources/nodes_material/vector_rotate_node.c diff --git a/paint/sources/material_nodes/vector_transform_node.c b/paint/sources/nodes_material/vector_transform_node.c similarity index 100% rename from paint/sources/material_nodes/vector_transform_node.c rename to paint/sources/nodes_material/vector_transform_node.c diff --git a/paint/sources/material_nodes/voronoi_texture_node.c b/paint/sources/nodes_material/voronoi_texture_node.c similarity index 100% rename from paint/sources/material_nodes/voronoi_texture_node.c rename to paint/sources/nodes_material/voronoi_texture_node.c diff --git a/paint/sources/material_nodes/warp_node.c b/paint/sources/nodes_material/warp_node.c similarity index 100% rename from paint/sources/material_nodes/warp_node.c rename to paint/sources/nodes_material/warp_node.c diff --git a/paint/sources/material_nodes/wave_texture_node.c b/paint/sources/nodes_material/wave_texture_node.c similarity index 100% rename from paint/sources/material_nodes/wave_texture_node.c rename to paint/sources/nodes_material/wave_texture_node.c diff --git a/paint/sources/material_nodes/wireframe_node.c b/paint/sources/nodes_material/wireframe_node.c similarity index 100% rename from paint/sources/material_nodes/wireframe_node.c rename to paint/sources/nodes_material/wireframe_node.c diff --git a/paint/sources/neural_nodes/edit_image_node.c b/paint/sources/nodes_neural/edit_image_node.c similarity index 100% rename from paint/sources/neural_nodes/edit_image_node.c rename to paint/sources/nodes_neural/edit_image_node.c diff --git a/paint/sources/neural_nodes/image_to_3d_mesh_node.c b/paint/sources/nodes_neural/image_to_3d_mesh_node.c similarity index 100% rename from paint/sources/neural_nodes/image_to_3d_mesh_node.c rename to paint/sources/nodes_neural/image_to_3d_mesh_node.c diff --git a/paint/sources/neural_nodes/image_to_depth_node.c b/paint/sources/nodes_neural/image_to_depth_node.c similarity index 100% rename from paint/sources/neural_nodes/image_to_depth_node.c rename to paint/sources/nodes_neural/image_to_depth_node.c diff --git a/paint/sources/neural_nodes/image_to_normal_map_node.c b/paint/sources/nodes_neural/image_to_normal_map_node.c similarity index 100% rename from paint/sources/neural_nodes/image_to_normal_map_node.c rename to paint/sources/nodes_neural/image_to_normal_map_node.c diff --git a/paint/sources/neural_nodes/image_to_pbr_node.c b/paint/sources/nodes_neural/image_to_pbr_node.c similarity index 100% rename from paint/sources/neural_nodes/image_to_pbr_node.c rename to paint/sources/nodes_neural/image_to_pbr_node.c diff --git a/paint/sources/neural_nodes/inpaint_image_node.c b/paint/sources/nodes_neural/inpaint_image_node.c similarity index 100% rename from paint/sources/neural_nodes/inpaint_image_node.c rename to paint/sources/nodes_neural/inpaint_image_node.c diff --git a/paint/sources/neural_nodes/neural_node.c b/paint/sources/nodes_neural/neural_node.c similarity index 100% rename from paint/sources/neural_nodes/neural_node.c rename to paint/sources/nodes_neural/neural_node.c diff --git a/paint/sources/neural_nodes/neural_node_models.c b/paint/sources/nodes_neural/neural_node_models.c similarity index 100% rename from paint/sources/neural_nodes/neural_node_models.c rename to paint/sources/nodes_neural/neural_node_models.c diff --git a/paint/sources/neural_nodes/outpaint_image_node.c b/paint/sources/nodes_neural/outpaint_image_node.c similarity index 100% rename from paint/sources/neural_nodes/outpaint_image_node.c rename to paint/sources/nodes_neural/outpaint_image_node.c diff --git a/paint/sources/neural_nodes/repeat_node.c b/paint/sources/nodes_neural/repeat_node.c similarity index 100% rename from paint/sources/neural_nodes/repeat_node.c rename to paint/sources/nodes_neural/repeat_node.c diff --git a/paint/sources/neural_nodes/save_image_node.c b/paint/sources/nodes_neural/save_image_node.c similarity index 100% rename from paint/sources/neural_nodes/save_image_node.c rename to paint/sources/nodes_neural/save_image_node.c diff --git a/paint/sources/neural_nodes/text_to_image_node.c b/paint/sources/nodes_neural/text_to_image_node.c similarity index 100% rename from paint/sources/neural_nodes/text_to_image_node.c rename to paint/sources/nodes_neural/text_to_image_node.c diff --git a/paint/sources/neural_nodes/text_to_text_node.c b/paint/sources/nodes_neural/text_to_text_node.c similarity index 100% rename from paint/sources/neural_nodes/text_to_text_node.c rename to paint/sources/nodes_neural/text_to_text_node.c diff --git a/paint/sources/neural_nodes/texture_mesh_node.c b/paint/sources/nodes_neural/texture_mesh_node.c similarity index 100% rename from paint/sources/neural_nodes/texture_mesh_node.c rename to paint/sources/nodes_neural/texture_mesh_node.c diff --git a/paint/sources/neural_nodes/tile_image_node.c b/paint/sources/nodes_neural/tile_image_node.c similarity index 100% rename from paint/sources/neural_nodes/tile_image_node.c rename to paint/sources/nodes_neural/tile_image_node.c diff --git a/paint/sources/neural_nodes/upscale_image_node.c b/paint/sources/nodes_neural/upscale_image_node.c similarity index 100% rename from paint/sources/neural_nodes/upscale_image_node.c rename to paint/sources/nodes_neural/upscale_image_node.c diff --git a/paint/sources/neural_nodes/vary_image_node.c b/paint/sources/nodes_neural/vary_image_node.c similarity index 100% rename from paint/sources/neural_nodes/vary_image_node.c rename to paint/sources/nodes_neural/vary_image_node.c diff --git a/paint/sources/make_bake.c b/paint/sources/render/make_bake.c similarity index 99% rename from paint/sources/make_bake.c rename to paint/sources/render/make_bake.c index 503c415d..5f502bd6 100644 --- a/paint/sources/make_bake.c +++ b/paint/sources/render/make_bake.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" char *make_bake_axis_string(i32 i) { return i == BAKE_AXIS_X ? "float3(1,0,0)" diff --git a/paint/sources/make_blur.c b/paint/sources/render/make_blur.c similarity index 99% rename from paint/sources/make_blur.c rename to paint/sources/render/make_blur.c index 10d594f6..68688ddc 100644 --- a/paint/sources/make_blur.c +++ b/paint/sources/render/make_blur.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" char *str_get_smudge_tool_weight = "\ fun get_smudge_tool_weight(i: int): float { \ diff --git a/paint/sources/make_brush.c b/paint/sources/render/make_brush.c similarity index 99% rename from paint/sources/make_brush.c rename to paint/sources/render/make_brush.c index 4d0d6aaa..2b8232cc 100644 --- a/paint/sources/make_brush.c +++ b/paint/sources/render/make_brush.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void make_brush_run(node_shader_t *kong) { diff --git a/paint/sources/make_clone.c b/paint/sources/render/make_clone.c similarity index 99% rename from paint/sources/make_clone.c rename to paint/sources/render/make_clone.c index 08016b0f..af144dd6 100644 --- a/paint/sources/make_clone.c +++ b/paint/sources/render/make_clone.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void make_clone_run(node_shader_t *kong) { node_shader_add_constant(kong, "clone_delta: float2", "_clone_delta"); diff --git a/paint/sources/make_depth.c b/paint/sources/render/make_depth.c similarity index 99% rename from paint/sources/make_depth.c rename to paint/sources/render/make_depth.c index 03c5829b..052ab264 100644 --- a/paint/sources/make_depth.c +++ b/paint/sources/render/make_depth.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" node_shader_context_t *make_depth_run(material_t *data, material_context_t *matcon) { shader_context_t *props = GC_ALLOC_INIT(shader_context_t, {.name = "depth", diff --git a/paint/sources/make_discard.c b/paint/sources/render/make_discard.c similarity index 99% rename from paint/sources/make_discard.c rename to paint/sources/render/make_discard.c index c9ed5767..b7faf38a 100644 --- a/paint/sources/make_discard.c +++ b/paint/sources/render/make_discard.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void make_discard_color_id(node_shader_t *kong, char *tex_coord) { node_shader_add_texture(kong, "texpaint_colorid", NULL); // 1x1 picker diff --git a/paint/sources/make_material.c b/paint/sources/render/make_material.c similarity index 99% rename from paint/sources/make_material.c rename to paint/sources/render/make_material.c index d8c8f9bc..e7100783 100644 --- a/paint/sources/make_material.c +++ b/paint/sources/render/make_material.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" shader_context_t *make_material_default_scon = NULL; material_context_t *make_material_default_mcon = NULL; diff --git a/paint/sources/make_mesh.c b/paint/sources/render/make_mesh.c similarity index 99% rename from paint/sources/make_mesh.c rename to paint/sources/render/make_mesh.c index 867ed83a..90be650e 100644 --- a/paint/sources/make_mesh.c +++ b/paint/sources/render/make_mesh.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" char *str_sh_irradiance = "\ fun sh_irradiance(nor: float3): float3 { \ diff --git a/paint/sources/make_mesh_preview.c b/paint/sources/render/make_mesh_preview.c similarity index 99% rename from paint/sources/make_mesh_preview.c rename to paint/sources/render/make_mesh_preview.c index 7005c4a7..db929979 100644 --- a/paint/sources/make_mesh_preview.c +++ b/paint/sources/render/make_mesh_preview.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" node_shader_context_t *make_mesh_preview_run(material_t *data, material_context_t *matcon) { char *context_id = "mesh"; diff --git a/paint/sources/make_node_preview.c b/paint/sources/render/make_node_preview.c similarity index 99% rename from paint/sources/make_node_preview.c rename to paint/sources/render/make_node_preview.c index 974a93d8..4b638fbf 100644 --- a/paint/sources/make_node_preview.c +++ b/paint/sources/render/make_node_preview.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" node_shader_context_t *make_node_preview_run(material_t *data, material_context_t *matcon, ui_node_t *node, ui_node_canvas_t *group, ui_node_t_array_t *parents) { diff --git a/paint/sources/make_paint.c b/paint/sources/render/make_paint.c similarity index 99% rename from paint/sources/make_paint.c rename to paint/sources/render/make_paint.c index ebfacc69..25402ab1 100644 --- a/paint/sources/make_paint.c +++ b/paint/sources/render/make_paint.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool make_paint_is_raytraced_bake() { return g_context->bake_type == BAKE_TYPE_INIT; diff --git a/paint/sources/make_particle.c b/paint/sources/render/make_particle.c similarity index 98% rename from paint/sources/make_particle.c rename to paint/sources/render/make_particle.c index 477f0441..d32ed881 100644 --- a/paint/sources/make_particle.c +++ b/paint/sources/render/make_particle.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void make_particle_mask(node_shader_t *kong) { node_shader_add_out(kong, "wpos: float4"); diff --git a/paint/sources/make_picking.c b/paint/sources/render/make_picking.c similarity index 99% rename from paint/sources/make_picking.c rename to paint/sources/render/make_picking.c index 06a9c596..d423c158 100644 --- a/paint/sources/make_picking.c +++ b/paint/sources/render/make_picking.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" char *str_get_pos_nor_from_depth = "\ fun get_pos_from_depth(uv: float2, invVP: float4x4): float3 { \ diff --git a/paint/sources/make_sculpt.c b/paint/sources/render/make_sculpt.c similarity index 99% rename from paint/sources/make_sculpt.c rename to paint/sources/render/make_sculpt.c index 2feb8e3b..d6dcfc10 100644 --- a/paint/sources/make_sculpt.c +++ b/paint/sources/render/make_sculpt.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void sculpt_import_mesh_pack_to_texture(mesh_data_t *mesh, gpu_texture_t *target) { buffer_t *b = buffer_create(config_get_texture_res_x() * config_get_texture_res_y() * 4 * 4); diff --git a/paint/sources/make_texcoord.c b/paint/sources/render/make_texcoord.c similarity index 99% rename from paint/sources/make_texcoord.c rename to paint/sources/render/make_texcoord.c index 46d6ddbc..684772f4 100644 --- a/paint/sources/make_texcoord.c +++ b/paint/sources/render/make_texcoord.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void make_texcoord_run(node_shader_t *kong) { diff --git a/paint/sources/render_compass.c b/paint/sources/render/render_compass.c similarity index 99% rename from paint/sources/render_compass.c rename to paint/sources/render/render_compass.c index ee2ae704..76d9a65e 100644 --- a/paint/sources/render_compass.c +++ b/paint/sources/render/render_compass.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" static object_t *_compass_hitbox_x; static object_t *_compass_hitbox_y; diff --git a/paint/sources/render_envsphere.c b/paint/sources/render/render_envsphere.c similarity index 99% rename from paint/sources/render_envsphere.c rename to paint/sources/render/render_envsphere.c index 2179729a..c83f04bb 100644 --- a/paint/sources/render_envsphere.c +++ b/paint/sources/render/render_envsphere.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" extern char *str_sh_irradiance; extern char *str_envmap_equirect; diff --git a/paint/sources/render_gizmo.c b/paint/sources/render/render_gizmo.c similarity index 99% rename from paint/sources/render_gizmo.c rename to paint/sources/render/render_gizmo.c index 60f36d85..ec8c257a 100644 --- a/paint/sources/render_gizmo.c +++ b/paint/sources/render/render_gizmo.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" static vec4_t gizmo_v = (vec4_t){0.0, 0.0, 0.0, 1.0}; static vec4_t gizmo_v0 = (vec4_t){0.0, 0.0, 0.0, 1.0}; diff --git a/paint/sources/render_path_base.c b/paint/sources/render/render_path_base.c similarity index 99% rename from paint/sources/render_path_base.c rename to paint/sources/render/render_path_base.c index e83104a6..8fc7d63b 100644 --- a/paint/sources/render_path_base.c +++ b/paint/sources/render/render_path_base.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" f32 render_path_base_super_sample = 1.0; f32 render_path_base_last_x = -1.0; diff --git a/paint/sources/render_path_deferred.c b/paint/sources/render/render_path_deferred.c similarity index 99% rename from paint/sources/render_path_deferred.c rename to paint/sources/render/render_path_deferred.c index 26cc2580..2359bbcb 100644 --- a/paint/sources/render_path_deferred.c +++ b/paint/sources/render/render_path_deferred.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void render_path_deferred_init() { diff --git a/paint/sources/render_path_forward.c b/paint/sources/render/render_path_forward.c similarity index 96% rename from paint/sources/render_path_forward.c rename to paint/sources/render/render_path_forward.c index a236b954..af654ac0 100644 --- a/paint/sources/render_path_forward.c +++ b/paint/sources/render/render_path_forward.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void render_path_forward_init() {} diff --git a/paint/sources/render_path_paint.c b/paint/sources/render/render_path_paint.c similarity index 99% rename from paint/sources/render_path_paint.c rename to paint/sources/render/render_path_paint.c index 5e891f6f..1cb6777b 100644 --- a/paint/sources/render_path_paint.c +++ b/paint/sources/render/render_path_paint.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool render_path_paint_dilated = true; mesh_object_t *render_path_paint_painto = NULL; diff --git a/paint/sources/render_path_preview.c b/paint/sources/render/render_path_preview.c similarity index 99% rename from paint/sources/render_path_preview.c rename to paint/sources/render/render_path_preview.c index d0a60b31..fd313408 100644 --- a/paint/sources/render_path_preview.c +++ b/paint/sources/render/render_path_preview.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void render_path_preview_init() { diff --git a/paint/sources/render_path_raytrace.c b/paint/sources/render/render_path_raytrace.c similarity index 99% rename from paint/sources/render_path_raytrace.c rename to paint/sources/render/render_path_raytrace.c index 5c4b9d9c..3e6fe93e 100644 --- a/paint/sources/render_path_raytrace.c +++ b/paint/sources/render/render_path_raytrace.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" f32 render_path_raytrace_uv_scale = 1.0; mat4_t render_path_raytrace_transform; diff --git a/paint/sources/render_path_raytrace_bake.c b/paint/sources/render/render_path_raytrace_bake.c similarity index 99% rename from paint/sources/render_path_raytrace_bake.c rename to paint/sources/render/render_path_raytrace_bake.c index 4e3ad923..7f2e8ee2 100644 --- a/paint/sources/render_path_raytrace_bake.c +++ b/paint/sources/render/render_path_raytrace_bake.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" f32 render_path_raytrace_bake_rays_timer = 0.0; i32 render_path_raytrace_bake_rays_counter = 0; diff --git a/paint/sources/render_pathsphere.c b/paint/sources/render/render_pathsphere.c similarity index 99% rename from paint/sources/render_pathsphere.c rename to paint/sources/render/render_pathsphere.c index 535a5384..e0d5b9ff 100644 --- a/paint/sources/render_pathsphere.c +++ b/paint/sources/render/render_pathsphere.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" extern char *str_sh_irradiance; extern char *str_envmap_equirect; diff --git a/paint/sources/box_export.c b/paint/sources/ui/box_export.c similarity index 99% rename from paint/sources/box_export.c rename to paint/sources/ui/box_export.c index b032f579..5d5c4112 100644 --- a/paint/sources/box_export.c +++ b/paint/sources/ui/box_export.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool _box_export_bake_material; export_preset_texture_t *_box_export_t; diff --git a/paint/sources/box_preferences.c b/paint/sources/ui/box_preferences.c similarity index 99% rename from paint/sources/box_preferences.c rename to paint/sources/ui/box_preferences.c index 1394246c..1cecc615 100644 --- a/paint/sources/box_preferences.c +++ b/paint/sources/ui/box_preferences.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" string_array_t *box_preferences_files_keymap = NULL; string_array_t *box_preferences_locales = NULL; diff --git a/paint/sources/box_projects.c b/paint/sources/ui/box_projects.c similarity index 99% rename from paint/sources/box_projects.c rename to paint/sources/ui/box_projects.c index d7a2a32e..806456c8 100644 --- a/paint/sources/box_projects.c +++ b/paint/sources/ui/box_projects.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" any_map_t *box_projects_icon_map = NULL; char *_box_projects_path; diff --git a/paint/sources/tab_browser.c b/paint/sources/ui/tab_browser.c similarity index 99% rename from paint/sources/tab_browser.c rename to paint/sources/ui/tab_browser.c index 84d362d1..fb9a07c5 100644 --- a/paint/sources/tab_browser.c +++ b/paint/sources/ui/tab_browser.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool tab_browser_known = false; char *tab_browser_last_path = ""; diff --git a/paint/sources/tab_brushes.c b/paint/sources/ui/tab_brushes.c similarity index 99% rename from paint/sources/tab_brushes.c rename to paint/sources/ui/tab_brushes.c index c4326af1..5e9f9e55 100644 --- a/paint/sources/tab_brushes.c +++ b/paint/sources/ui/tab_brushes.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i32 _tab_brushes_draw_i; i32 tab_brushes_drag_pos = -1; diff --git a/paint/sources/tab_console.c b/paint/sources/ui/tab_console.c similarity index 99% rename from paint/sources/tab_console.c rename to paint/sources/ui/tab_console.c index d287d4b4..d385b630 100644 --- a/paint/sources/tab_console.c +++ b/paint/sources/ui/tab_console.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool tab_console_prompt_entered = false; diff --git a/paint/sources/tab_debug.c b/paint/sources/ui/tab_debug.c similarity index 99% rename from paint/sources/tab_debug.c rename to paint/sources/ui/tab_debug.c index 4cfeafe1..6bf3c68b 100644 --- a/paint/sources/tab_debug.c +++ b/paint/sources/ui/tab_debug.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i32 tab_debug_line_counter = 0; diff --git a/paint/sources/tab_fonts.c b/paint/sources/ui/tab_fonts.c similarity index 99% rename from paint/sources/tab_fonts.c rename to paint/sources/ui/tab_fonts.c index a4c3bd57..59bd6b1a 100644 --- a/paint/sources/tab_fonts.c +++ b/paint/sources/ui/tab_fonts.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i32 _tab_fonts_draw_i; i32 tab_fonts_drag_pos = -1; diff --git a/paint/sources/tab_layers.c b/paint/sources/ui/tab_layers.c similarity index 99% rename from paint/sources/tab_layers.c rename to paint/sources/ui/tab_layers.c index 7e4cdb16..03ec0056 100644 --- a/paint/sources/tab_layers.c +++ b/paint/sources/ui/tab_layers.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i32 tab_layers_layer_name_edit = -1; bool tab_layers_show_context_menu = false; diff --git a/paint/sources/tab_materials.c b/paint/sources/ui/tab_materials.c similarity index 99% rename from paint/sources/tab_materials.c rename to paint/sources/ui/tab_materials.c index 980fb7c3..43c135c9 100644 --- a/paint/sources/tab_materials.c +++ b/paint/sources/ui/tab_materials.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i32 _tab_materials_draw_slots; i32 tab_materials_drag_pos = -1; diff --git a/paint/sources/tab_meshes.c b/paint/sources/ui/tab_meshes.c similarity index 99% rename from paint/sources/tab_meshes.c rename to paint/sources/ui/tab_meshes.c index f20913f9..f51b360c 100644 --- a/paint/sources/tab_meshes.c +++ b/paint/sources/ui/tab_meshes.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" extern buffer_t *slot_material_default_canvas; diff --git a/paint/sources/tab_plugins.c b/paint/sources/ui/tab_plugins.c similarity index 99% rename from paint/sources/tab_plugins.c rename to paint/sources/ui/tab_plugins.c index e0712a35..673a7a40 100644 --- a/paint/sources/tab_plugins.c +++ b/paint/sources/ui/tab_plugins.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void tab_plugins_draw(ui_handle_t *htab) { if (ui_tab(htab, tr("Plugins"), false, -1, false)) { diff --git a/paint/sources/tab_scripts.c b/paint/sources/ui/tab_scripts.c similarity index 99% rename from paint/sources/tab_scripts.c rename to paint/sources/ui/tab_scripts.c index 744bcfba..4bb2307a 100644 --- a/paint/sources/tab_scripts.c +++ b/paint/sources/ui/tab_scripts.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" ui_text_coloring_t *tab_scripts_text_coloring = NULL; i32 tab_scripts_selected = 0; diff --git a/paint/sources/tab_stages.c b/paint/sources/ui/tab_stages.c similarity index 99% rename from paint/sources/tab_stages.c rename to paint/sources/ui/tab_stages.c index 1e4fb727..1bc60395 100644 --- a/paint/sources/tab_stages.c +++ b/paint/sources/ui/tab_stages.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" typedef struct slot_stage { char *name; diff --git a/paint/sources/tab_swatches.c b/paint/sources/ui/tab_swatches.c similarity index 99% rename from paint/sources/tab_swatches.c rename to paint/sources/ui/tab_swatches.c index 22639672..b78073db 100644 --- a/paint/sources/tab_swatches.c +++ b/paint/sources/ui/tab_swatches.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" gpu_texture_t *_tab_swatches_empty; i32 tab_swatches_drag_pos = -1; diff --git a/paint/sources/tab_textures.c b/paint/sources/ui/tab_textures.c similarity index 99% rename from paint/sources/tab_textures.c rename to paint/sources/ui/tab_textures.c index e31bd016..d8eb9916 100644 --- a/paint/sources/tab_textures.c +++ b/paint/sources/ui/tab_textures.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" gpu_texture_t *_tab_textures_draw_img; char *_tab_textures_draw_path; diff --git a/paint/sources/tab_timeline.c b/paint/sources/ui/tab_timeline.c similarity index 99% rename from paint/sources/tab_timeline.c rename to paint/sources/ui/tab_timeline.c index 41f65b97..09f5b42e 100644 --- a/paint/sources/tab_timeline.c +++ b/paint/sources/ui/tab_timeline.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" typedef struct { i32 frame; diff --git a/paint/sources/ui_box.c b/paint/sources/ui/ui_box.c similarity index 99% rename from paint/sources/ui_box.c rename to paint/sources/ui/ui_box.c index aadfd4b1..3b4576da 100644 --- a/paint/sources/ui_box.c +++ b/paint/sources/ui/ui_box.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool ui_box_draggable = true; char *ui_box_title = ""; diff --git a/paint/sources/ui_files.c b/paint/sources/ui/ui_files.c similarity index 99% rename from paint/sources/ui_files.c rename to paint/sources/ui/ui_files.c index 9325e0db..ecd9a01a 100644 --- a/paint/sources/ui_files.c +++ b/paint/sources/ui/ui_files.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" typedef struct draw_cloud_icon_data { char *f; diff --git a/paint/sources/ui_header.c b/paint/sources/ui/ui_header.c similarity index 99% rename from paint/sources/ui_header.c rename to paint/sources/ui/ui_header.c index 65f560e0..f80930be 100644 --- a/paint/sources/ui_header.c +++ b/paint/sources/ui/ui_header.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" ui_handle_t *_ui_header_draw_tool_properties_h; diff --git a/paint/sources/ui_menu.c b/paint/sources/ui/ui_menu.c similarity index 99% rename from paint/sources/ui_menu.c rename to paint/sources/ui/ui_menu.c index e2b37403..26391717 100644 --- a/paint/sources/ui_menu.c +++ b/paint/sources/ui/ui_menu.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool ui_menu_hide_flag = false; i32 ui_menu_sub_x = 0; diff --git a/paint/sources/ui_menubar.c b/paint/sources/ui/ui_menubar.c similarity index 99% rename from paint/sources/ui_menubar.c rename to paint/sources/ui/ui_menubar.c index 0f6bf0ed..1ff98d84 100644 --- a/paint/sources/ui_menubar.c +++ b/paint/sources/ui/ui_menubar.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" typedef enum { MENUBAR_CATEGORY_FILE = 0, diff --git a/paint/sources/ui_nodes.c b/paint/sources/ui/ui_nodes.c similarity index 99% rename from paint/sources/ui_nodes.c rename to paint/sources/ui/ui_nodes.c index 1b5dd1d8..f56e7214 100644 --- a/paint/sources/ui_nodes.c +++ b/paint/sources/ui/ui_nodes.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool ui_nodes_show_menu = false; bool ui_nodes_show_menu_first = true; diff --git a/paint/sources/ui_sidebar.c b/paint/sources/ui/ui_sidebar.c similarity index 99% rename from paint/sources/ui_sidebar.c rename to paint/sources/ui/ui_sidebar.c index 5083d833..b7d51bab 100644 --- a/paint/sources/ui_sidebar.c +++ b/paint/sources/ui/ui_sidebar.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i32 ui_sidebar_tabx = 0; i32 ui_sidebar_last_tab = 0; diff --git a/paint/sources/ui_statusbar.c b/paint/sources/ui/ui_statusbar.c similarity index 98% rename from paint/sources/ui_statusbar.c rename to paint/sources/ui/ui_statusbar.c index 35811abe..579c55c5 100644 --- a/paint/sources/ui_statusbar.c +++ b/paint/sources/ui/ui_statusbar.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i32 ui_statusbar_last_tab = 0; diff --git a/paint/sources/ui_toolbar.c b/paint/sources/ui/ui_toolbar.c similarity index 99% rename from paint/sources/ui_toolbar.c rename to paint/sources/ui/ui_toolbar.c index 602b68b6..3917ddf2 100644 --- a/paint/sources/ui_toolbar.c +++ b/paint/sources/ui/ui_toolbar.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i32 ui_toolbar_last_tool = 0; i32 _ui_toolbar_i; diff --git a/paint/sources/ui_view2d.c b/paint/sources/ui/ui_view2d.c similarity index 99% rename from paint/sources/ui_view2d.c rename to paint/sources/ui/ui_view2d.c index 28ce98e1..cf2bf407 100644 --- a/paint/sources/ui_view2d.c +++ b/paint/sources/ui/ui_view2d.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" bool ui_view2d_text_input_hover = false; bool ui_view2d_uvmap_show = false; diff --git a/paint/sources/edit_uvmap.c b/paint/sources/util/edit_uvmap.c similarity index 99% rename from paint/sources/edit_uvmap.c rename to paint/sources/util/edit_uvmap.c index 7352ede7..4d4ff6cf 100644 --- a/paint/sources/edit_uvmap.c +++ b/paint/sources/util/edit_uvmap.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" static i32_array_t *_selected_verts = NULL; static bool _is_dragging = false; diff --git a/paint/sources/geom.c b/paint/sources/util/geom.c similarity index 99% rename from paint/sources/geom.c rename to paint/sources/util/geom.c index 62edc529..048d87d6 100644 --- a/paint/sources/geom.c +++ b/paint/sources/util/geom.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" raw_mesh_t *geom_make_plane(f32 size_x, f32 size_y, i32 verts_x, i32 verts_y, f32 uv_scale) { diff --git a/paint/sources/util_clone.c b/paint/sources/util/util_clone.c similarity index 99% rename from paint/sources/util_clone.c rename to paint/sources/util/util_clone.c index 9ad3d99a..7ccfe0cd 100644 --- a/paint/sources/util_clone.c +++ b/paint/sources/util/util_clone.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" f32_array_t *util_clone_f32_array(f32_array_t *f32a) { if (f32a == NULL) { diff --git a/paint/sources/util_encode.c b/paint/sources/util/util_encode.c similarity index 99% rename from paint/sources/util_encode.c rename to paint/sources/util/util_encode.c index a54f9040..567023ee 100644 --- a/paint/sources/util_encode.c +++ b/paint/sources/util/util_encode.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i32 util_encode_mesh_data_size(mesh_data_t_array_t *datas) { if (datas == NULL) { diff --git a/paint/sources/util_layer.c b/paint/sources/util/util_layer.c similarity index 99% rename from paint/sources/util_layer.c rename to paint/sources/util/util_layer.c index 76769eb3..4e778bae 100644 --- a/paint/sources/util_layer.c +++ b/paint/sources/util/util_layer.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" static slot_layer_t *path_layer_current = NULL; static object_t **path_point_spheres = NULL; diff --git a/paint/sources/util_mesh.c b/paint/sources/util/util_mesh.c similarity index 99% rename from paint/sources/util_mesh.c rename to paint/sources/util/util_mesh.c index 5b890f32..ea94b297 100644 --- a/paint/sources/util_mesh.c +++ b/paint/sources/util/util_mesh.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" i16_array_t *util_mesh_va0; i32_array_t *util_mesh_quantized; diff --git a/paint/sources/util_particle.c b/paint/sources/util/util_particle.c similarity index 95% rename from paint/sources/util_particle.c rename to paint/sources/util/util_particle.c index 6e77cfbc..1e213463 100644 --- a/paint/sources/util_particle.c +++ b/paint/sources/util/util_particle.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void util_particle_init_mesh() { if (g_context->paint_body != NULL) { diff --git a/paint/sources/util_render.c b/paint/sources/util/util_render.c similarity index 99% rename from paint/sources/util_render.c rename to paint/sources/util/util_render.c index 2fca407f..824accc0 100644 --- a/paint/sources/util_render.c +++ b/paint/sources/util/util_render.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" gpu_buffer_t *util_render_screen_aligned_full_vb = NULL; gpu_buffer_t *util_render_screen_aligned_full_ib = NULL; diff --git a/paint/sources/util_texture.c b/paint/sources/util/util_texture.c similarity index 97% rename from paint/sources/util_texture.c rename to paint/sources/util/util_texture.c index a1719d60..2b9081f1 100644 --- a/paint/sources/util_texture.c +++ b/paint/sources/util/util_texture.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" void util_texture_capture_output(gpu_texture_t *img, char *basename) { if (img == NULL) { diff --git a/paint/sources/util_uv.c b/paint/sources/util/util_uv.c similarity index 99% rename from paint/sources/util_uv.c rename to paint/sources/util/util_uv.c index 97fca963..be4b4310 100644 --- a/paint/sources/util_uv.c +++ b/paint/sources/util/util_uv.c @@ -1,5 +1,5 @@ -#include "global.h" +#include "../global.h" buffer_t *util_uv_dilate_bytes = NULL; gpu_pipeline_t *util_uv_pipe_dilate = NULL;