From fda78f086c193a0db8739c549075f5fe5c33753a Mon Sep 17 00:00:00 2001 From: luboslenco Date: Tue, 21 Apr 2026 10:52:27 +0200 Subject: [PATCH] paint: cleanup --- paint/sources/args.c | 4 +- paint/sources/box_export.c | 10 +- paint/sources/box_preferences.c | 2 +- paint/sources/brush_nodes/math_node.c | 6 +- paint/sources/brush_nodes/string_node.c | 2 +- paint/sources/brush_nodes/tex_image_node.c | 4 +- paint/sources/brush_nodes/vector_math_node.c | 10 +- paint/sources/context.c | 9 +- paint/sources/export_arm.c | 20 +-- paint/sources/export_player.c | 12 +- paint/sources/geom.c | 32 ++--- paint/sources/global.h | 5 +- paint/sources/history.c | 124 +++++++++++------- paint/sources/import_asset.c | 2 +- paint/sources/import_blend_mesh.c | 4 +- paint/sources/import_font.c | 6 +- paint/sources/import_legacy.c | 18 +-- paint/sources/import_mesh.c | 8 +- paint/sources/import_obj.c | 6 +- paint/sources/import_theme.c | 2 +- paint/sources/keymap.c | 4 +- paint/sources/kickstart.c | 25 +--- paint/sources/logic_node.c | 4 +- paint/sources/main.c | 2 +- paint/sources/make_blur.c | 4 +- paint/sources/make_colorid_picker.c | 2 +- paint/sources/make_mesh_preview.c | 3 +- paint/sources/material_nodes/group_node.c | 86 ++++++------ .../material_nodes/text_texture_node.c | 4 +- paint/sources/node_shader.c | 4 +- paint/sources/nodes_material.c | 14 +- paint/sources/physics_body.c | 24 ++-- paint/sources/physics_world.c | 2 +- paint/sources/project.c | 40 +++--- paint/sources/render_path_base.c | 7 +- paint/sources/render_path_preview.c | 4 +- paint/sources/render_path_raytrace_bake.c | 4 +- paint/sources/resource.c | 2 +- paint/sources/slot_brush.c | 2 +- paint/sources/slot_layer.c | 6 +- paint/sources/strings.c | 10 +- paint/sources/tab_brushes.c | 10 +- paint/sources/tab_fonts.c | 10 +- paint/sources/tab_materials.c | 22 ++-- paint/sources/tab_scripts.c | 2 +- paint/sources/tab_textures.c | 10 +- paint/sources/translator.c | 4 +- paint/sources/ui_header.c | 71 +++++----- paint/sources/ui_menubar.c | 8 +- paint/sources/ui_sidebar.c | 2 +- paint/sources/ui_statusbar.c | 2 +- paint/sources/uniforms_ext.c | 10 +- paint/sources/util_mesh.c | 8 +- paint/sources/util_particle.c | 10 +- paint/sources/viewport.c | 12 +- 55 files changed, 364 insertions(+), 356 deletions(-) diff --git a/paint/sources/args.c b/paint/sources/args.c index 71955316..f25ebbef 100644 --- a/paint/sources/args.c +++ b/paint/sources/args.c @@ -119,11 +119,11 @@ void args_run_on_next_frame(void *_) { } if (string_equals(args_export_textures_type, "png")) { - base_bits_handle->i = TEXTURE_BITS_BITS8; + base_bits_handle->i = TEXTURE_BITS_BITS8; g_context->format_type = TEXTURE_LDR_FORMAT_PNG; } else if (string_equals(args_export_textures_type, "jpg")) { - base_bits_handle->i = TEXTURE_BITS_BITS8; + base_bits_handle->i = TEXTURE_BITS_BITS8; g_context->format_type = TEXTURE_LDR_FORMAT_JPG; } else if (string_equals(args_export_textures_type, "exr16")) { diff --git a/paint/sources/box_export.c b/paint/sources/box_export.c index 9ca07ee3..b032f579 100644 --- a/paint/sources/box_export.c +++ b/paint/sources/box_export.c @@ -9,14 +9,14 @@ bool _box_export_merge_vertices; void box_export_tab_export_textures_run(void *_) { if (g_context->export_padding) { - i32 _dilate_radius = g_config->dilate_radius; + i32 _dilate_radius = g_config->dilate_radius; g_config->dilate_radius = 256; - slot_layer_t *_layer = g_context->layer; + slot_layer_t *_layer = g_context->layer; for (i32 i = 0; i < project_layers->length; ++i) { g_context->layer = project_layers->buffer[i]; render_path_paint_dilate(true, true); } - g_context->layer = _layer; + g_context->layer = _layer; g_config->dilate_radius = _dilate_radius; } @@ -164,8 +164,8 @@ void box_export_tab_export_textures(char *title, bool bake_material) { 2); g_context->layers_destination = ui_combo(layers_destination_handle, layers_destination_combo, tr("Destination"), true, UI_ALIGN_LEFT, true); - ui_handle_t *h_padding = ui_handle(__ID__); - h_padding->b = g_context->export_padding; + ui_handle_t *h_padding = ui_handle(__ID__); + h_padding->b = g_context->export_padding; g_context->export_padding = ui_check(h_padding, tr("Padding"), ""); ui_row2(); diff --git a/paint/sources/box_preferences.c b/paint/sources/box_preferences.c index 2545864f..bdb052d3 100644 --- a/paint/sources/box_preferences.c +++ b/paint/sources/box_preferences.c @@ -1057,7 +1057,7 @@ void box_preferences_plugins_tab() { ui_handle_t *box_preferences_plugins_hsearch = ui_handle(__ID__); if (!string_equals(box_preferences_plugins_hsearch->text, "")) { - ui_row(f32_array_create_from_raw((f32[]){ 0.85, 0.15 }, 2)); + ui_row(f32_array_create_from_raw((f32[]){0.85, 0.15}, 2)); } box_preferences_plugins_hsearch->text = string_copy(ui_text_input(box_preferences_plugins_hsearch, tr("Search"), UI_ALIGN_LEFT, true, true)); if (!string_equals(box_preferences_plugins_hsearch->text, "") && (ui_button(tr("X"), UI_ALIGN_CENTER, "") || ui->is_escape_down)) { diff --git a/paint/sources/brush_nodes/math_node.c b/paint/sources/brush_nodes/math_node.c index 26d2e637..24ef415b 100644 --- a/paint/sources/brush_nodes/math_node.c +++ b/paint/sources/brush_nodes/math_node.c @@ -2,9 +2,9 @@ #include "../global.h" logic_node_value_t *math_node_get(math_node_t *self, i32 from) { - f32 v1 = logic_node_input_get(self->base->inputs->buffer[0])->_f32; - f32 v2 = logic_node_input_get(self->base->inputs->buffer[1])->_f32; - f32 f = 0.0; + f32 v1 = logic_node_input_get(self->base->inputs->buffer[0])->_f32; + f32 v2 = logic_node_input_get(self->base->inputs->buffer[1])->_f32; + f32 f = 0.0; char *op = self->operation; if (string_equals(op, "Add")) { f = v1 + v2; diff --git a/paint/sources/brush_nodes/string_node.c b/paint/sources/brush_nodes/string_node.c index aba15b60..ab17f25c 100644 --- a/paint/sources/brush_nodes/string_node.c +++ b/paint/sources/brush_nodes/string_node.c @@ -11,7 +11,7 @@ logic_node_value_t *string_node_get(string_node_t *self, i32 from) { } } -void string_node_set(string_node_t *self, void * value) { +void string_node_set(string_node_t *self, void *value) { if (self->base->inputs->length > 0) { logic_node_input_set(self->base->inputs->buffer[0], value); } diff --git a/paint/sources/brush_nodes/tex_image_node.c b/paint/sources/brush_nodes/tex_image_node.c index fb90f497..0d815072 100644 --- a/paint/sources/brush_nodes/tex_image_node.c +++ b/paint/sources/brush_nodes/tex_image_node.c @@ -3,8 +3,8 @@ logic_node_value_t *tex_image_node_get(tex_image_node_t *self, i32 from) { string_array_t *ar = ui_nodes_enum_texts(self->raw->type); - i32 i = self->raw->buttons->buffer[0]->default_value->buffer[0]; - char *file = ar->buffer[i]; + i32 i = self->raw->buttons->buffer[0]->default_value->buffer[0]; + char *file = ar->buffer[i]; if (from == 0) { logic_node_value_t *v = GC_ALLOC_INIT(logic_node_value_t, {._str = string("%s.rgb", file)}); diff --git a/paint/sources/brush_nodes/vector_math_node.c b/paint/sources/brush_nodes/vector_math_node.c index 4fcc52c6..a0c66dc4 100644 --- a/paint/sources/brush_nodes/vector_math_node.c +++ b/paint/sources/brush_nodes/vector_math_node.c @@ -2,11 +2,11 @@ #include "../global.h" logic_node_value_t *vector_math_node_get(vector_math_node_t *self, i32 from) { - vec4_t v1 = logic_node_input_get(self->base->inputs->buffer[0])->_vec4; - vec4_t v2 = logic_node_input_get(self->base->inputs->buffer[1])->_vec4; - self->v = v1; - f32 f = 0.0; - char *op = self->operation; + vec4_t v1 = logic_node_input_get(self->base->inputs->buffer[0])->_vec4; + vec4_t v2 = logic_node_input_get(self->base->inputs->buffer[1])->_vec4; + self->v = v1; + f32 f = 0.0; + char *op = self->operation; if (string_equals(op, "Add")) { self->v = vec4_add(self->v, v2); } diff --git a/paint/sources/context.c b/paint/sources/context.c index 035a4554..68cd0266 100644 --- a/paint/sources/context.c +++ b/paint/sources/context.c @@ -181,8 +181,7 @@ void context_init() { bool context_use_deferred() { return g_config->render_mode != RENDER_MODE_FORWARD && - (g_context->viewport_mode == VIEWPORT_MODE_LIT || g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE) && - g_context->tool != TOOL_TYPE_COLORID; + (g_context->viewport_mode == VIEWPORT_MODE_LIT || g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE) && g_context->tool != TOOL_TYPE_COLORID; } void context_select_material(i32 i) { @@ -261,7 +260,7 @@ void context_set_layer(slot_layer_t *l) { if (l == g_context->layer) { return; } - g_context->layer = l; + g_context->layer = l; ui_header_handle->redraws = 2; gpu_texture_t *current = _draw_current; @@ -284,9 +283,9 @@ void context_select_tool(i32 i) { g_context->tool = i; make_material_parse_paint_material(true); make_material_parse_mesh_material(); - g_context->ddirty = 3; + g_context->ddirty = 3; viewport_mode_t _viewport_mode = g_context->viewport_mode; - g_context->viewport_mode = VIEWPORT_MODE_MINUS_ONE; + g_context->viewport_mode = VIEWPORT_MODE_MINUS_ONE; context_set_viewport_mode(_viewport_mode); context_init_tool(); diff --git a/paint/sources/export_arm.c b/paint/sources/export_arm.c index f1cb98c1..2c88a17a 100644 --- a/paint/sources/export_arm.c +++ b/paint/sources/export_arm.c @@ -336,7 +336,7 @@ void export_arm_run_material(char *path) { } any_array_push(mnodes, c); - string_array_t *texture_files = export_arm_assets_to_files(path, assets); + string_array_t *texture_files = export_arm_assets_to_files(path, assets); packed_asset_t_array_t *packed_assets = NULL; if (!g_context->pack_assets_on_export) { packed_assets = export_arm_get_packed_assets(path, texture_files); @@ -348,10 +348,10 @@ void export_arm_run_material(char *path) { buffer_t *buf = lz4_encode(gpu_get_texture_pixels(m->image)); #endif buffer_t_array_t *micons = any_array_create_from_raw( - (void *[]){ - buf, - }, - 1); + (void *[]){ + buf, + }, + 1); project_t *raw = GC_ALLOC_INIT(project_t, {.version = manifest_version_project, .material_nodes = mnodes, @@ -411,7 +411,7 @@ void export_arm_run_brush(char *path) { } any_array_push(bnodes, c); - string_array_t *texture_files = export_arm_assets_to_files(path, assets); + string_array_t *texture_files = export_arm_assets_to_files(path, assets); packed_asset_t_array_t *packed_assets = NULL; if (!g_context->pack_assets_on_export) { packed_assets = export_arm_get_packed_assets(path, texture_files); @@ -423,10 +423,10 @@ void export_arm_run_brush(char *path) { buffer_t *buf = lz4_encode(gpu_get_texture_pixels(b->image)); #endif buffer_t_array_t *bicons = any_array_create_from_raw( - (void *[]){ - buf, - }, - 1); + (void *[]){ + buf, + }, + 1); project_t *raw = GC_ALLOC_INIT( project_t, diff --git a/paint/sources/export_player.c b/paint/sources/export_player.c index 074455c9..d87f6665 100644 --- a/paint/sources/export_player.c +++ b/paint/sources/export_player.c @@ -111,13 +111,13 @@ static void export_player_run_on_download(char *url, buffer_t *ab) {} void export_player_run(char *path) { char *path_base = path_base_dir(path); - char *_project_filepath = string_copy(project_filepath); - project_filepath = string("%s/%s", path_base, "start.arm"); - bool _pack_assets_on_save = g_context->pack_assets_on_save; + char *_project_filepath = string_copy(project_filepath); + project_filepath = string("%s/%s", path_base, "start.arm"); + bool _pack_assets_on_save = g_context->pack_assets_on_save; g_context->pack_assets_on_save = true; export_arm_run_project(); g_context->pack_assets_on_save = _pack_assets_on_save; - project_filepath = _project_filepath; + project_filepath = _project_filepath; if (box_export_h_export_player_target->i == PLAYER_TARGET_WEB) { char *start_js = string("%s/start.js", path_base); @@ -134,12 +134,12 @@ void export_player_run(char *path) { } else if (box_export_h_export_player_target->i == PLAYER_TARGET_WINDOWS) { char *player_bin_src = string("%s%s%s", iron_internal_files_location(), PATH_SEP, "ArmorPaint.exe"); - char *player_bin_to = string("%s/player.exe", path_base); + char *player_bin_to = string("%s/player.exe", path_base); file_copy(player_bin_src, player_bin_to); } else if (box_export_h_export_player_target->i == PLAYER_TARGET_LINUX) { char *player_bin_src = string("%s%s%s", iron_internal_files_location(), PATH_SEP, "ArmorPaint"); - char *player_bin_to = string("%s/player", path_base); + char *player_bin_to = string("%s/player", path_base); file_copy(player_bin_src, player_bin_to); } else if (box_export_h_export_player_target->i == PLAYER_TARGET_MACOS) { diff --git a/paint/sources/geom.c b/paint/sources/geom.c index 996063ec..62edc529 100644 --- a/paint/sources/geom.c +++ b/paint/sources/geom.c @@ -10,17 +10,17 @@ raw_mesh_t *geom_make_plane(f32 size_x, f32 size_y, i32 verts_x, i32 verts_y, f3 mesh->has_next = false; // Pack positions to (-1, 1) range - f32 half_x = size_x / 2.0; - f32 half_y = size_y / 2.0; - mesh->scale_pos = math_max(size_x, size_y); - f32 inv = (1 / (float)mesh->scale_pos) * 32767; + f32 half_x = size_x / 2.0; + f32 half_y = size_y / 2.0; + mesh->scale_pos = math_max(size_x, size_y); + f32 inv = (1 / (float)mesh->scale_pos) * 32767; - mesh->posa = i16_array_create(verts_x * verts_y * 4); - mesh->nora = i16_array_create(verts_x * verts_y * 2); - mesh->texa = i16_array_create(verts_x * verts_y * 2); - mesh->inda = u32_array_create((verts_x - 1) * (verts_y - 1) * 6); - f32 step_x = size_x / (float)(verts_x - 1); - f32 step_y = size_y / (float)(verts_y - 1); + mesh->posa = i16_array_create(verts_x * verts_y * 4); + mesh->nora = i16_array_create(verts_x * verts_y * 2); + mesh->texa = i16_array_create(verts_x * verts_y * 2); + mesh->inda = u32_array_create((verts_x - 1) * (verts_y - 1) * 6); + f32 step_x = size_x / (float)(verts_x - 1); + f32 step_y = size_y / (float)(verts_y - 1); for (i32 i = 0; i < verts_x * verts_y; ++i) { f32 x = (i % verts_x) * step_x - half_x; f32 y = math_floor(i / (float)verts_x) * step_y - half_y; @@ -58,10 +58,10 @@ raw_mesh_t *geom_make_uv_sphere(f32 radius, i32 width_segments, i32 height_segme mesh->has_next = false; // Pack positions to (-1, 1) range - mesh->scale_pos = radius; - mesh->scale_tex = uv_scale; - f32 inv = (1 / (float)mesh->scale_pos) * 32767; - f32 pi2 = math_pi() * 2; + mesh->scale_pos = radius; + mesh->scale_tex = uv_scale; + f32 inv = (1 / (float)mesh->scale_pos) * 32767; + f32 pi2 = math_pi() * 2; i32 width_verts = width_segments + 1; i32 height_verts = height_segments + 1; @@ -70,8 +70,8 @@ raw_mesh_t *geom_make_uv_sphere(f32 radius, i32 width_segments, i32 height_segme mesh->texa = i16_array_create(width_verts * height_verts * 2); mesh->inda = u32_array_create(width_segments * height_segments * 6 - width_segments * 6); - vec4_t nor = (vec4_t){0.0, 0.0, 0.0, 1.0}; - i32 pos = 0; + vec4_t nor = (vec4_t){0.0, 0.0, 0.0, 1.0}; + i32 pos = 0; for (i32 y = 0; y < height_verts; ++y) { f32 v = y / (float)height_segments; f32 v_flip = 1.0 - v; diff --git a/paint/sources/global.h b/paint/sources/global.h index 69df32e0..5db2599e 100644 --- a/paint/sources/global.h +++ b/paint/sources/global.h @@ -2,7 +2,8 @@ #pragma once #include + #include "enums.h" -#include "types.h" -#include "globals.h" #include "functions.h" +#include "globals.h" +#include "types.h" diff --git a/paint/sources/history.c b/paint/sources/history.c index 76029d1c..883d2173 100644 --- a/paint/sources/history.c +++ b/paint/sources/history.c @@ -3,31 +3,56 @@ char *history_action_to_string(history_action_t action) { switch (action) { - case HISTORY_ACTION_PAINT: return tr("Paint"); - case HISTORY_ACTION_EDIT_NODES: return tr("Edit Nodes"); - case HISTORY_ACTION_NEW_LAYER: return tr("New Layer"); - case HISTORY_ACTION_NEW_BLACK_MASK: return tr("New Black Mask"); - case HISTORY_ACTION_NEW_WHITE_MASK: return tr("New White Mask"); - case HISTORY_ACTION_NEW_FILL_MASK: return tr("New Fill Mask"); - case HISTORY_ACTION_NEW_GROUP: return tr("New Group"); - case HISTORY_ACTION_DELETE_LAYER: return tr("Delete Layer"); - case HISTORY_ACTION_CLEAR_LAYER: return tr("Clear Layer"); - case HISTORY_ACTION_DUPLICATE_LAYER: return tr("Duplicate Layer"); - case HISTORY_ACTION_ORDER_LAYERS: return tr("Order Layers"); - case HISTORY_ACTION_MERGE_LAYERS: return tr("Merge Layers"); - case HISTORY_ACTION_APPLY_MASK: return tr("Apply Mask"); - case HISTORY_ACTION_INVERT_MASK: return tr("Invert Mask"); - case HISTORY_ACTION_APPLY_FILTER: return tr("Apply Filter"); - case HISTORY_ACTION_TO_FILL_LAYER: return tr("To Fill Layer"); - case HISTORY_ACTION_TO_FILL_MASK: return tr("To Fill Mask"); - case HISTORY_ACTION_TO_PAINT_LAYER: return tr("To Paint Layer"); - case HISTORY_ACTION_TO_PAINT_MASK: return tr("To Paint Mask"); - case HISTORY_ACTION_LAYER_OPACITY: return tr("Layer Opacity"); - case HISTORY_ACTION_LAYER_BLENDING: return tr("Layer Blending"); - case HISTORY_ACTION_DELETE_NODE_GROUP: return tr("Delete Node Group"); - case HISTORY_ACTION_NEW_MATERIAL: return tr("New Material"); - case HISTORY_ACTION_DELETE_MATERIAL: return tr("Delete Material"); - case HISTORY_ACTION_DUPLICATE_MATERIAL: return tr("Duplicate Material"); + case HISTORY_ACTION_PAINT: + return tr("Paint"); + case HISTORY_ACTION_EDIT_NODES: + return tr("Edit Nodes"); + case HISTORY_ACTION_NEW_LAYER: + return tr("New Layer"); + case HISTORY_ACTION_NEW_BLACK_MASK: + return tr("New Black Mask"); + case HISTORY_ACTION_NEW_WHITE_MASK: + return tr("New White Mask"); + case HISTORY_ACTION_NEW_FILL_MASK: + return tr("New Fill Mask"); + case HISTORY_ACTION_NEW_GROUP: + return tr("New Group"); + case HISTORY_ACTION_DELETE_LAYER: + return tr("Delete Layer"); + case HISTORY_ACTION_CLEAR_LAYER: + return tr("Clear Layer"); + case HISTORY_ACTION_DUPLICATE_LAYER: + return tr("Duplicate Layer"); + case HISTORY_ACTION_ORDER_LAYERS: + return tr("Order Layers"); + case HISTORY_ACTION_MERGE_LAYERS: + return tr("Merge Layers"); + case HISTORY_ACTION_APPLY_MASK: + return tr("Apply Mask"); + case HISTORY_ACTION_INVERT_MASK: + return tr("Invert Mask"); + case HISTORY_ACTION_APPLY_FILTER: + return tr("Apply Filter"); + case HISTORY_ACTION_TO_FILL_LAYER: + return tr("To Fill Layer"); + case HISTORY_ACTION_TO_FILL_MASK: + return tr("To Fill Mask"); + case HISTORY_ACTION_TO_PAINT_LAYER: + return tr("To Paint Layer"); + case HISTORY_ACTION_TO_PAINT_MASK: + return tr("To Paint Mask"); + case HISTORY_ACTION_LAYER_OPACITY: + return tr("Layer Opacity"); + case HISTORY_ACTION_LAYER_BLENDING: + return tr("Layer Blending"); + case HISTORY_ACTION_DELETE_NODE_GROUP: + return tr("Delete Node Group"); + case HISTORY_ACTION_NEW_MATERIAL: + return tr("New Material"); + case HISTORY_ACTION_DELETE_MATERIAL: + return tr("Delete Material"); + case HISTORY_ACTION_DUPLICATE_MATERIAL: + return tr("Duplicate Material"); } return tr("Paint"); } @@ -71,14 +96,14 @@ void history_swap_canvas(history_step_t *step) { if (step->canvas_type == 0) { ui_node_canvas_t *_canvas = history_get_canvas(step); history_set_canvas(step, step->canvas); - step->canvas = _canvas; + step->canvas = _canvas; g_context->material = project_materials->buffer[step->material]; } else { ui_node_canvas_t *_canvas = project_brushes->buffer[step->brush]->canvas; project_brushes->buffer[step->brush]->canvas = step->canvas; step->canvas = _canvas; - g_context->brush = project_brushes->buffer[step->brush]; + g_context->brush = project_brushes->buffer[step->brush]; } ui_nodes_t *nodes = ui_nodes_get_nodes(); @@ -96,8 +121,8 @@ void history_undo() { if (step->action == HISTORY_ACTION_EDIT_NODES) { history_swap_canvas(step); } - else if (step->action == HISTORY_ACTION_NEW_LAYER || step->action == HISTORY_ACTION_NEW_BLACK_MASK || - step->action == HISTORY_ACTION_NEW_WHITE_MASK || step->action == HISTORY_ACTION_NEW_FILL_MASK) { + else if (step->action == HISTORY_ACTION_NEW_LAYER || step->action == HISTORY_ACTION_NEW_BLACK_MASK || step->action == HISTORY_ACTION_NEW_WHITE_MASK || + step->action == HISTORY_ACTION_NEW_FILL_MASK) { g_context->layer = project_layers->buffer[step->layer]; slot_layer_delete(g_context->layer); g_context->layer = project_layers->buffer[step->layer > 0 ? step->layer - 1 : 0]; @@ -203,7 +228,7 @@ void history_undo() { for (i32 i = 0; i < layers_to_restore->length; ++i) { slot_layer_t *layer = layers_to_restore->buffer[i]; // Replace the current layer's content with the old one - g_context->layer = layer; + g_context->layer = layer; history_undo_i = history_undo_i - 1 < 0 ? g_config->undo_steps - 1 : history_undo_i - 1; slot_layer_t *old_layer = history_undo_layers->buffer[history_undo_i]; slot_layer_swap(g_context->layer, old_layer); @@ -243,16 +268,16 @@ void history_undo() { } else if (step->action == HISTORY_ACTION_LAYER_OPACITY) { context_set_layer(project_layers->buffer[step->layer]); - f32 t = g_context->layer->mask_opacity; + f32 t = g_context->layer->mask_opacity; g_context->layer->mask_opacity = step->layer_opacity; - step->layer_opacity = t; + step->layer_opacity = t; make_material_parse_mesh_material(); } else if (step->action == HISTORY_ACTION_LAYER_BLENDING) { context_set_layer(project_layers->buffer[step->layer]); - blend_type_t t = g_context->layer->blending; + blend_type_t t = g_context->layer->blending; g_context->layer->blending = step->layer_blending; - step->layer_blending = t; + step->layer_blending = t; make_material_parse_mesh_material(); } else if (step->action == HISTORY_ACTION_DELETE_NODE_GROUP) { @@ -262,7 +287,7 @@ void history_undo() { } else if (step->action == HISTORY_ACTION_NEW_MATERIAL) { g_context->material = project_materials->buffer[step->material]; - step->canvas = g_context->material->canvas; + step->canvas = g_context->material->canvas; slot_material_delete(g_context->material); } else if (step->action == HISTORY_ACTION_DELETE_MATERIAL) { @@ -274,7 +299,7 @@ void history_undo() { } else if (step->action == HISTORY_ACTION_DUPLICATE_MATERIAL) { g_context->material = project_materials->buffer[step->material]; - step->canvas = g_context->material->canvas; + step->canvas = g_context->material->canvas; slot_material_delete(g_context->material); } else { // Paint operation @@ -417,8 +442,8 @@ void history_redo() { if (step->action == HISTORY_ACTION_EDIT_NODES) { history_swap_canvas(step); } - else if (step->action == HISTORY_ACTION_NEW_LAYER || step->action == HISTORY_ACTION_NEW_BLACK_MASK || - step->action == HISTORY_ACTION_NEW_WHITE_MASK || step->action == HISTORY_ACTION_NEW_FILL_MASK) { + else if (step->action == HISTORY_ACTION_NEW_LAYER || step->action == HISTORY_ACTION_NEW_BLACK_MASK || step->action == HISTORY_ACTION_NEW_WHITE_MASK || + step->action == HISTORY_ACTION_NEW_FILL_MASK) { slot_layer_t *parent = step->layer_parent > 0 ? project_layers->buffer[step->layer_parent - 1] : NULL; slot_layer_t *l = slot_layer_create("", step->layer_type, parent); array_insert(project_layers, step->layer, l); @@ -506,13 +531,13 @@ void history_redo() { layers_new_mask(false, lay, -1); slot_layer_swap(g_context->layer, lay); g_context->layer_preview_dirty = true; - history_undo_i = (history_undo_i + 1) % g_config->undo_steps; + history_undo_i = (history_undo_i + 1) % g_config->undo_steps; } else if (step->action == HISTORY_ACTION_TO_FILL_LAYER || step->action == HISTORY_ACTION_TO_FILL_MASK) { slot_layer_t *lay = history_undo_layers->buffer[history_undo_i]; slot_layer_swap(g_context->layer, lay); g_context->layer->fill_layer = project_materials->buffer[step->material]; - history_undo_i = (history_undo_i + 1) % g_config->undo_steps; + history_undo_i = (history_undo_i + 1) % g_config->undo_steps; } else if (step->action == HISTORY_ACTION_TO_PAINT_LAYER || step->action == HISTORY_ACTION_TO_PAINT_MASK) { slot_layer_to_paint_layer(g_context->layer); @@ -522,16 +547,16 @@ void history_redo() { } else if (step->action == HISTORY_ACTION_LAYER_OPACITY) { context_set_layer(project_layers->buffer[step->layer]); - f32 t = g_context->layer->mask_opacity; + f32 t = g_context->layer->mask_opacity; g_context->layer->mask_opacity = step->layer_opacity; - step->layer_opacity = t; + step->layer_opacity = t; make_material_parse_mesh_material(); } else if (step->action == HISTORY_ACTION_LAYER_BLENDING) { context_set_layer(project_layers->buffer[step->layer]); - blend_type_t t = g_context->layer->blending; + blend_type_t t = g_context->layer->blending; g_context->layer->blending = step->layer_blending; - step->layer_blending = t; + step->layer_blending = t; make_material_parse_mesh_material(); } else if (step->action == HISTORY_ACTION_DELETE_NODE_GROUP) { @@ -547,7 +572,7 @@ void history_redo() { } else if (step->action == HISTORY_ACTION_DELETE_MATERIAL) { g_context->material = project_materials->buffer[step->material]; - step->canvas = g_context->material->canvas; + step->canvas = g_context->material->canvas; slot_material_delete(g_context->material); } else if (step->action == HISTORY_ACTION_DUPLICATE_MATERIAL) { @@ -563,7 +588,7 @@ void history_redo() { context_set_layer(project_layers->buffer[step->layer]); slot_layer_swap(g_context->layer, lay); g_context->layer_preview_dirty = true; - history_undo_i = (history_undo_i + 1) % g_config->undo_steps; + history_undo_i = (history_undo_i + 1) % g_config->undo_steps; } history_undos++; @@ -587,9 +612,8 @@ void history_reset() { gc_unroot(history_steps); history_steps = any_array_create_from_raw( (void *[]){ - GC_ALLOC_INIT( - history_step_t, - {.name = tr("New"), .layer = 0, .layer_type = LAYER_SLOT_TYPE_LAYER, .layer_parent = -1, .object = 0, .material = 0, .brush = 0}), + GC_ALLOC_INIT(history_step_t, + {.name = tr("New"), .layer = 0, .layer_type = LAYER_SLOT_TYPE_LAYER, .layer_parent = -1, .object = 0, .material = 0, .brush = 0}), }, 1); gc_root(history_steps); @@ -633,7 +657,7 @@ history_step_t *history_push(history_action_t action) { .layer = lpos, .layer_type = slot_layer_is_mask(g_context->layer) ? LAYER_SLOT_TYPE_MASK : slot_layer_is_group(g_context->layer) ? LAYER_SLOT_TYPE_GROUP - : LAYER_SLOT_TYPE_LAYER, + : LAYER_SLOT_TYPE_LAYER, .layer_parent = g_context->layer->parent == NULL ? -1 : array_index_of(project_layers, g_context->layer->parent), .object = opos, .material = mpos, diff --git a/paint/sources/import_asset.c b/paint/sources/import_asset.c index cebe0591..fb27a8e3 100644 --- a/paint/sources/import_asset.c +++ b/paint/sources/import_asset.c @@ -66,7 +66,7 @@ void import_asset_run(char *path, f32 drop_x, f32 drop_y, bool show_box, bool hd if (g_context->tool == TOOL_TYPE_COLORID && project_asset_names->length == 1) { ui_header_handle->redraws = 2; - g_context->ddirty = 2; + g_context->ddirty = 2; } } else if (path_is_project(path)) { diff --git a/paint/sources/import_blend_mesh.c b/paint/sources/import_blend_mesh.c index 9df31fe5..030f2f02 100644 --- a/paint/sources/import_blend_mesh.c +++ b/paint/sources/import_blend_mesh.c @@ -24,8 +24,8 @@ void import_blend_mesh_ui() { 2); ui_row(ar); - ui_handle_t *h = ui_handle(__ID__); - h->text = string_copy(g_config->blender); + ui_handle_t *h = ui_handle(__ID__); + h->text = string_copy(g_config->blender); g_config->blender = string_copy(ui_text_input(h, "", UI_ALIGN_LEFT, true, false)); if (ui_icon_button("", ICON_FOLDER_OPEN, UI_ALIGN_CENTER)) { ui_files_show("", false, false, &import_blend_mesh_ui_blender_folder_picked); diff --git a/paint/sources/import_font.c b/paint/sources/import_font.c index afde18c4..0f88a311 100644 --- a/paint/sources/import_font.c +++ b/paint/sources/import_font.c @@ -3,7 +3,7 @@ void import_font_run_on_next_frame(slot_font_t_array_t *font_slots) { for (i32 i = 0; i < font_slots->length; ++i) { - slot_font_t *f = font_slots->buffer[i]; + slot_font_t *f = font_slots->buffer[i]; g_context->font = f; any_array_push(project_fonts, f); util_render_make_font_preview(); @@ -26,8 +26,8 @@ void import_font_run(char *path) { for (i32 i = 0; i < count; ++i) { string_array_t *ar = string_split(path, PATH_SEP); - char *name = ar->buffer[ar->length - 1]; - draw_font_t *f = GC_ALLOC_INIT(draw_font_t, {.buf = font->buf, .index = font->index}); + char *name = ar->buffer[ar->length - 1]; + draw_font_t *f = GC_ALLOC_INIT(draw_font_t, {.buf = font->buf, .index = font->index}); draw_font_init(f); if (!draw_set_font(f, util_render_font_preview_size)) { console_error(tr("Error: Failed to read font data")); diff --git a/paint/sources/import_legacy.c b/paint/sources/import_legacy.c index 2aa09444..1bc8a66c 100644 --- a/paint/sources/import_legacy.c +++ b/paint/sources/import_legacy.c @@ -119,7 +119,7 @@ project_t *import_arm_from_map_to_arm(any_map_t *old) { project->assets = any_map_get(old, "assets"); project->is_bgra = armpack_map_get_i32(old, "is_bgra") > 0; - any_array_t *pas = any_map_get(old, "packed_assets"); + any_array_t *pas = any_map_get(old, "packed_assets"); if (pas != NULL) { project->packed_assets = any_array_create_from_raw((void *[]){}, 0); for (i32 i = 0; i < pas->length; ++i) { @@ -138,9 +138,9 @@ project_t *import_arm_from_map_to_arm(any_map_t *old) { project->camera_origin = any_map_get(old, "camera_origin"); project->camera_fov = armpack_map_get_f32(old, "camera_fov"); - any_array_t *ss = any_map_get(old, "swatches"); + any_array_t *ss = any_map_get(old, "swatches"); if (ss != NULL) { - project->swatches = any_array_create_from_raw((void *[]){}, 0); + project->swatches = any_array_create_from_raw((void *[]){}, 0); for (i32 i = 0; i < ss->length; ++i) { any_map_t *old = ss->buffer[i]; swatch_color_t *s = GC_ALLOC_INIT(swatch_color_t, {0}); @@ -165,9 +165,9 @@ project_t *import_arm_from_map_to_arm(any_map_t *old) { project->material_icons = any_map_get(old, "material_icons"); project->font_assets = any_map_get(old, "font_assets"); - any_array_t *lds = any_map_get(old, "layer_datas"); + any_array_t *lds = any_map_get(old, "layer_datas"); if (lds != NULL) { - project->layer_datas = any_array_create_from_raw((void *[]){}, 0); + project->layer_datas = any_array_create_from_raw((void *[]){}, 0); for (i32 i = 0; i < lds->length; ++i) { any_map_t *old = lds->buffer[i]; layer_data_t *ld = GC_ALLOC_INIT(layer_data_t, {0}); @@ -203,7 +203,7 @@ project_t *import_arm_from_map_to_arm(any_map_t *old) { } } - any_array_t *ms = any_map_get(old, "mesh_datas"); + any_array_t *ms = any_map_get(old, "mesh_datas"); if (ms != NULL) { project->mesh_datas = any_array_create_from_raw((void *[]){}, 0); for (i32 i = 0; i < ms->length; ++i) { @@ -238,9 +238,9 @@ project_t *import_arm_from_map_to_arm(any_map_t *old) { project_t *import_arm_from_version_4(any_map_t *old) { f32_array_t *camera_world = any_map_get(old, "camera_world"); if (camera_world != NULL) { - mat4_t m = mat4_from_f32_array(camera_world, 0); - m = mat4_transpose(m); - camera_world = mat4_to_f32_array(m); + mat4_t m = mat4_from_f32_array(camera_world, 0); + m = mat4_transpose(m); + camera_world = mat4_to_f32_array(m); any_map_set(old, "camera_world", camera_world); } return import_arm_from_map_to_arm(old); diff --git a/paint/sources/import_mesh.c b/paint/sources/import_mesh.c index 8ba9e868..0787b5d3 100644 --- a/paint/sources/import_mesh.c +++ b/paint/sources/import_mesh.c @@ -12,8 +12,8 @@ void import_mesh_run(char *path, bool _clear_layers, bool replace_existing) { } } - import_mesh_clear_layers = _clear_layers; - g_context->layer_filter = 0; + import_mesh_clear_layers = _clear_layers; + g_context->layer_filter = 0; gc_unroot(import_mesh_meshes_to_unwrap); import_mesh_meshes_to_unwrap = NULL; @@ -101,7 +101,7 @@ void import_mesh_finish_import() { make_material_parse_mesh_material(); ui_view2d_hwnd->redraws = 2; render_path_raytrace_ready = false; - g_context->paint_body = NULL; + g_context->paint_body = NULL; } void _import_mesh_make_mesh_finish_import(void *_) { @@ -115,7 +115,7 @@ void _import_mesh_make_mesh_clear_layers(void *_) { void _import_mesh_make_mesh(raw_mesh_t *mesh) { mesh_data_t *raw = import_mesh_raw_mesh(mesh); - mesh_data_t *md = mesh_data_create(raw); + mesh_data_t *md = mesh_data_create(raw); g_context->paint_object = context_main_object(); context_select_paint_object(context_main_object()); diff --git a/paint/sources/import_obj.c b/paint/sources/import_obj.c index ce33acda..231d928d 100644 --- a/paint/sources/import_obj.c +++ b/paint/sources/import_obj.c @@ -2,9 +2,9 @@ #include "global.h" void import_obj_run(char *path, bool replace_existing) { - split_type_t i = g_context->split_by; - bool is_udim = i == SPLIT_TYPE_UDIM; - i32 split_code = (i == SPLIT_TYPE_OBJECT || is_udim) ? 'o' : 'u'; // usemtl + split_type_t i = g_context->split_by; + bool is_udim = i == SPLIT_TYPE_UDIM; + i32 split_code = (i == SPLIT_TYPE_OBJECT || is_udim) ? 'o' : 'u'; // usemtl buffer_t *b = data_get_blob(path); diff --git a/paint/sources/import_theme.c b/paint/sources/import_theme.c index 18fa974b..670f72d6 100644 --- a/paint/sources/import_theme.c +++ b/paint/sources/import_theme.c @@ -11,7 +11,7 @@ void import_theme_run(char *path) { char *dst_path = string("%s%sthemes%s%s", path_data(), PATH_SEP, PATH_SEP, filename); file_copy(path, dst_path); // Copy to preset folder box_preferences_fetch_themes(); // Refresh file list - g_config->theme = string_copy(filename); + g_config->theme = string_copy(filename); box_preferences_h_theme->i = box_preferences_get_theme_index(); config_load_theme(g_config->theme, true); console_info(string("%s %s", tr("Theme imported:"), filename)); diff --git a/paint/sources/keymap.c b/paint/sources/keymap.c index da7c5957..55c05536 100644 --- a/paint/sources/keymap.c +++ b/paint/sources/keymap.c @@ -6,8 +6,8 @@ void keymap_load() { config_keymap = keymap_get_default(); gc_root(config_keymap); if (!string_equals(g_config->keymap, "default.json")) { - buffer_t *blob = data_get_blob(string("keymap_presets/%s", g_config->keymap)); - any_map_t *new_keymap = json_parse_to_map(sys_buffer_to_string(blob)); + buffer_t *blob = data_get_blob(string("keymap_presets/%s", g_config->keymap)); + any_map_t *new_keymap = json_parse_to_map(sys_buffer_to_string(blob)); string_array_t *keys = map_keys(new_keymap); for (i32 i = 0; i < keys->length; ++i) { char *key = keys->buffer[i]; diff --git a/paint/sources/kickstart.c b/paint/sources/kickstart.c index 0382ca00..af667ca8 100644 --- a/paint/sources/kickstart.c +++ b/paint/sources/kickstart.c @@ -33,29 +33,8 @@ void _kickstart() { 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", + "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); diff --git a/paint/sources/logic_node.c b/paint/sources/logic_node.c index 514607ac..cdecffbf 100644 --- a/paint/sources/logic_node.c +++ b/paint/sources/logic_node.c @@ -24,7 +24,7 @@ void logic_node_add_outputs(logic_node_t *self, logic_node_t_array_t *nodes) { any_array_push(self->outputs, nodes); } -void * logic_node_get(logic_node_t *self, i32 from) { +void *logic_node_get(logic_node_t *self, i32 from) { if (self->get != NULL) { return self->get(self->ext, from); } @@ -38,7 +38,7 @@ gpu_texture_t *logic_node_get_as_image(logic_node_t *self, i32 from) { return NULL; } -void logic_node_set(logic_node_t *self, void * value) { +void logic_node_set(logic_node_t *self, void *value) { if (self->set != NULL) { self->set(self->ext, value); } diff --git a/paint/sources/main.c b/paint/sources/main.c index 932e0d16..33500c5a 100644 --- a/paint/sources/main.c +++ b/paint/sources/main.c @@ -30,8 +30,8 @@ #include "material_nodes/combine_color_node.c" #include "material_nodes/combine_xyz_node.c" #include "material_nodes/curvature_bake_node.c" -#include "material_nodes/gabor_texture_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" diff --git a/paint/sources/make_blur.c b/paint/sources/make_blur.c index 199e78b0..5e518376 100644 --- a/paint/sources/make_blur.c +++ b/paint/sources/make_blur.c @@ -1,7 +1,7 @@ #include "global.h" -char *str_get_smudge_tool_weight = "\ +char *str_get_smudge_tool_weight = "\ fun get_smudge_tool_weight(i: int): float { \ if (i == 0) { return 1.0 / 28.0; } \ if (i == 1) { return 2.0 / 28.0; } \ @@ -13,7 +13,7 @@ fun get_smudge_tool_weight(i: int): float { \ } \ "; -char *str_get_blur_tool_weight = "\ +char *str_get_blur_tool_weight = "\ fun get_blur_tool_weight(i: int): float { \ if (i == 0) { return 0.034619 / 2.0; } \ if (i == 1) { return 0.044859 / 2.0; } \ diff --git a/paint/sources/make_colorid_picker.c b/paint/sources/make_colorid_picker.c index 8aedce1c..8f1051bd 100644 --- a/paint/sources/make_colorid_picker.c +++ b/paint/sources/make_colorid_picker.c @@ -1,7 +1,7 @@ #include "global.h" -char *str_get_pos_nor_from_depth = "\ +char *str_get_pos_nor_from_depth = "\ fun get_pos_from_depth(uv: float2, invVP: float4x4): float3 { \ var depth: float = sample_lod(gbufferD, sampler_linear, float2(uv.x, 1.0 - uv.y), 0.0).r; \ var wpos: float4 = float4(uv * 2.0 - 1.0, depth, 1.0); \ diff --git a/paint/sources/make_mesh_preview.c b/paint/sources/make_mesh_preview.c index 77cea1dc..9065026a 100644 --- a/paint/sources/make_mesh_preview.c +++ b/paint/sources/make_mesh_preview.c @@ -82,7 +82,8 @@ node_shader_context_t *make_mesh_preview_run(material_t *data, material_context_ if (g_context->material->paint_opac_mode == OPACITY_MODE_TRANSLUC) { kong->frag_wvpposition = true; node_shader_add_function(kong, str_dither_bayer); - node_shader_write_frag(kong, "var fragcoord1: float2 = float2(input.wvpposition.x / input.wvpposition.w, input.wvpposition.y / input.wvpposition.w) * 0.5 + 0.5;"); + node_shader_write_frag( + kong, "var fragcoord1: float2 = float2(input.wvpposition.x / input.wvpposition.w, input.wvpposition.y / input.wvpposition.w) * 0.5 + 0.5;"); node_shader_write_frag(kong, "var dither: float = dither_bayer(fragcoord1 * float2(256.0, 256.0));"); node_shader_write_frag(kong, "if (opacity < dither) { discard; }"); } diff --git a/paint/sources/material_nodes/group_node.c b/paint/sources/material_nodes/group_node.c index bf3a9b0c..26b61684 100644 --- a/paint/sources/material_nodes/group_node.c +++ b/paint/sources/material_nodes/group_node.c @@ -31,46 +31,52 @@ void nodes_material_new_group_button(i32 node_id) { break; } } - ui_node_canvas_t *canvas = GC_ALLOC_INIT( - ui_node_canvas_t, - {.name = node->name, - .nodes = any_array_create_from_raw( - (void *[]){ - GC_ALLOC_INIT(ui_node_t, - {.id = 0, - .name = _tr("Group Input"), - .type = "GROUP_INPUT", - .x = 50, - .y = 200, - .color = 0xff448c6d, - .inputs = any_array_create_from_raw((void *[]){}, 0), - .outputs = any_array_create_from_raw((void *[]){}, 0), - .buttons = any_array_create_from_raw( - (void *[]){ - GC_ALLOC_INIT(ui_node_button_t, {.name = "nodes_material_group_input_button", .type = "CUSTOM", .height = 1, .output = -1, .default_value = f32_array_create_x(0.0) }), - }, - 1), - .width = 0, - .flags = 0}), - GC_ALLOC_INIT(ui_node_t, - {.id = 1, - .name = _tr("Group Output"), - .type = "GROUP_OUTPUT", - .x = 450, - .y = 200, - .color = 0xff448c6d, - .inputs = any_array_create_from_raw((void *[]){}, 0), - .outputs = any_array_create_from_raw((void *[]){}, 0), - .buttons = any_array_create_from_raw( - (void *[]){ - GC_ALLOC_INIT(ui_node_button_t, {.name = "nodes_material_group_output_button", .type = "CUSTOM", .height = 1, .output = -1, .default_value = f32_array_create_x(0.0) }), - }, - 1), - .width = 0, - .flags = 0}), - }, - 2), - .links = any_array_create_from_raw((void *[]){}, 0)}); + ui_node_canvas_t *canvas = + GC_ALLOC_INIT(ui_node_canvas_t, + {.name = node->name, + .nodes = any_array_create_from_raw( + (void *[]){ + GC_ALLOC_INIT(ui_node_t, {.id = 0, + .name = _tr("Group Input"), + .type = "GROUP_INPUT", + .x = 50, + .y = 200, + .color = 0xff448c6d, + .inputs = any_array_create_from_raw((void *[]){}, 0), + .outputs = any_array_create_from_raw((void *[]){}, 0), + .buttons = any_array_create_from_raw( + (void *[]){ + GC_ALLOC_INIT(ui_node_button_t, {.name = "nodes_material_group_input_button", + .type = "CUSTOM", + .height = 1, + .output = -1, + .default_value = f32_array_create_x(0.0)}), + }, + 1), + .width = 0, + .flags = 0}), + GC_ALLOC_INIT(ui_node_t, {.id = 1, + .name = _tr("Group Output"), + .type = "GROUP_OUTPUT", + .x = 450, + .y = 200, + .color = 0xff448c6d, + .inputs = any_array_create_from_raw((void *[]){}, 0), + .outputs = any_array_create_from_raw((void *[]){}, 0), + .buttons = any_array_create_from_raw( + (void *[]){ + GC_ALLOC_INIT(ui_node_button_t, {.name = "nodes_material_group_output_button", + .type = "CUSTOM", + .height = 1, + .output = -1, + .default_value = f32_array_create_x(0.0)}), + }, + 1), + .width = 0, + .flags = 0}), + }, + 2), + .links = any_array_create_from_raw((void *[]){}, 0)}); node_group_t *ng = GC_ALLOC_INIT(node_group_t, {.canvas = canvas, .nodes = ui_nodes_create()}); any_array_push(project_material_groups, ng); } diff --git a/paint/sources/material_nodes/text_texture_node.c b/paint/sources/material_nodes/text_texture_node.c index 826b4b7d..58c61120 100644 --- a/paint/sources/material_nodes/text_texture_node.c +++ b/paint/sources/material_nodes/text_texture_node.c @@ -4,8 +4,8 @@ void _parser_material_cache_tex_text_node_on_next_frame(char *text) { char *_text_tool_text = g_context->text_tool_text; gpu_texture_t *_text_tool_image = g_context->text_tool_image; - g_context->text_tool_text = string_copy(text); - g_context->text_tool_image = NULL; + g_context->text_tool_text = string_copy(text); + g_context->text_tool_image = NULL; util_render_make_text_preview(); char *file = string("tex_text_%s", text); // TODO: remove old cache diff --git a/paint/sources/node_shader.c b/paint/sources/node_shader.c index 41ea3a23..2362c391 100644 --- a/paint/sources/node_shader.c +++ b/paint/sources/node_shader.c @@ -54,8 +54,8 @@ void node_shader_add_constant(node_shader_t *raw, char *s, char *link) { // inp: float4 if (string_array_index_of(raw->consts, s) == -1) { string_array_t *ar = string_split(s, ": "); - char *uname = ar->buffer[0]; - char *utype = ar->buffer[1]; + char *uname = ar->buffer[0]; + char *utype = ar->buffer[1]; //// if (string_equals(utype, "float2")) diff --git a/paint/sources/nodes_material.c b/paint/sources/nodes_material.c index ed260e03..6734c3c5 100644 --- a/paint/sources/nodes_material.c +++ b/paint/sources/nodes_material.c @@ -78,15 +78,15 @@ void nodes_material_init() { vector_rotate_node_init(); vector_transform_node_init(); - #if defined(IRON_WINDOWS) || defined(IRON_LINUX) || defined(IRON_MACOS) +#if defined(IRON_WINDOWS) || defined(IRON_LINUX) || defined(IRON_MACOS) gc_unroot(nodes_material_neural); nodes_material_neural = any_array_create_from_raw((void *[]){}, 0); gc_root(nodes_material_neural); edit_image_node_init(); - #ifdef IRON_WINDOWS +#ifdef IRON_WINDOWS image_to_3d_mesh_node_init(); - #endif +#endif image_to_depth_node_init(); image_to_normal_map_node_init(); image_to_pbr_node_init(); @@ -97,14 +97,14 @@ void nodes_material_init() { upscale_image_node_init(); vary_image_node_init(); - #endif +#endif gc_unroot(nodes_material_group); nodes_material_group = any_array_create_from_raw((void *[]){}, 0); gc_root(nodes_material_group); group_node_init(); - #if defined(IRON_WINDOWS) || defined(IRON_LINUX) || defined(IRON_MACOS) +#if defined(IRON_WINDOWS) || defined(IRON_LINUX) || defined(IRON_MACOS) gc_unroot(nodes_material_list); nodes_material_list = any_array_create_from_raw( @@ -119,7 +119,7 @@ void nodes_material_init() { 6); gc_root(nodes_material_list); - #else +#else gc_unroot(nodes_material_list); nodes_material_list = any_array_create_from_raw( @@ -133,7 +133,7 @@ void nodes_material_init() { 5); gc_root(nodes_material_list); - #endif +#endif } ui_node_t *nodes_material_get_node_t(char *node_type) { diff --git a/paint/sources/physics_body.c b/paint/sources/physics_body.c index dfe90e01..b1881491 100644 --- a/paint/sources/physics_body.c +++ b/paint/sources/physics_body.c @@ -1,8 +1,8 @@ #ifdef arm_physics -#include "global.h" #include "../libs/asim.h" +#include "global.h" physics_body_t *physics_body_create() { physics_body_t *body = GC_ALLOC_INIT(physics_body_t, {0}); @@ -14,25 +14,25 @@ void physics_body_init(physics_body_t *body, object_t *obj) { body->obj = obj; transform_compute_dim(obj->transform); - body->dimx = obj->transform->dim.x; - body->dimy = obj->transform->dim.y; - body->dimz = obj->transform->dim.z; + body->dimx = obj->transform->dim.x; + body->dimy = obj->transform->dim.y; + body->dimz = obj->transform->dim.z; f32 scale_pos = 1.0; i16_array_t *posa = NULL; u32_array_t *inda = NULL; if (body->shape == PHYSICS_SHAPE_MESH || body->shape == PHYSICS_SHAPE_HULL || body->shape == PHYSICS_SHAPE_TERRAIN) { - mesh_object_t *mo = obj->ext; - mesh_data_t *data = mo->data; - vec4_t scale = obj->transform->scale; + mesh_object_t *mo = obj->ext; + mesh_data_t *data = mo->data; + vec4_t scale = obj->transform->scale; - i16_array_t *positions = mesh_data_get_vertex_array(data, "pos")->values; - u32_array_t *indices0 = data->index_array; + i16_array_t *positions = mesh_data_get_vertex_array(data, "pos")->values; + u32_array_t *indices0 = data->index_array; - scale_pos = scale.x * data->scale_pos; - posa = positions; - inda = indices0; + scale_pos = scale.x * data->scale_pos; + posa = positions; + inda = indices0; // triangles = f32_array_create(indices0.length * 3); // let ar: u32_array_t = indices[0]; diff --git a/paint/sources/physics_world.c b/paint/sources/physics_world.c index b948ea4d..012c1fb7 100644 --- a/paint/sources/physics_world.c +++ b/paint/sources/physics_world.c @@ -1,8 +1,8 @@ #ifdef arm_physics -#include "global.h" #include "../libs/asim.h" +#include "global.h" physics_world_t *physics_world_create() { asim_world_create(); diff --git a/paint/sources/project.c b/paint/sources/project.c index 8e368cbc..8065aaeb 100644 --- a/paint/sources/project.c +++ b/paint/sources/project.c @@ -114,7 +114,7 @@ void project_new_box_draw() { if (h_project_type->init) { h_project_type->i = g_context->project_type; } - g_context->project_type = ui_combo(h_project_type, project_mesh_list, tr("Template"), true, UI_ALIGN_LEFT, true); + g_context->project_type = ui_combo(h_project_type, project_mesh_list, tr("Template"), true, UI_ALIGN_LEFT, true); ui_handle_t *h_project_aspect_ratio = ui_handle(__ID__); if (h_project_aspect_ratio->init) { h_project_aspect_ratio->i = g_context->project_aspect_ratio; @@ -276,7 +276,7 @@ void project_new(bool reset_layers) { g_context->picker_mask_handle->i = PICKER_MASK_NONE; g_context->material = project_materials->buffer[0]; - ui_nodes_hwnd->redraws = 2; + ui_nodes_hwnd->redraws = 2; gc_unroot(ui_nodes_group_stack); ui_nodes_group_stack = any_array_create_from_raw((void *[]){}, 0); gc_root(ui_nodes_group_stack); @@ -318,8 +318,8 @@ void project_new(bool reset_layers) { project_asset_map = any_imap_create(); gc_root(project_asset_map); project_asset_id = 0; - g_project->packed_assets = any_array_create_from_raw((void *[]){}, 0); - g_context->ddirty = 4; + g_project->packed_assets = any_array_create_from_raw((void *[]){}, 0); + g_context->ddirty = 4; ui_base_hwnds->buffer[TAB_AREA_SIDEBAR0]->redraws = 2; ui_base_hwnds->buffer[TAB_AREA_SIDEBAR1]->redraws = 2; @@ -354,16 +354,16 @@ void project_new(bool reset_layers) { void project_set_default_envmap() { g_context->saved_envmap = NULL; g_context->envmap_loaded = false; - scene_world->_->envmap = g_context->empty_envmap; - scene_world->envmap = "World_radiance.k"; + scene_world->_->envmap = g_context->empty_envmap; + scene_world->envmap = "World_radiance.k"; g_context->show_envmap_handle->b = g_context->show_envmap = false; - scene_world->_->radiance = g_context->default_radiance; - scene_world->_->radiance_mipmaps = g_context->default_radiance_mipmaps; - scene_world->_->irradiance = g_context->default_irradiance; - scene_world->strength = 2.0; - g_context->envmap_angle = 0.0; - g_context->show_envmap_blur = false; - g_project->envmap = NULL; + scene_world->_->radiance = g_context->default_radiance; + scene_world->_->radiance_mipmaps = g_context->default_radiance_mipmaps; + scene_world->_->irradiance = g_context->default_irradiance; + scene_world->strength = 2.0; + g_context->envmap_angle = 0.0; + g_context->show_envmap_blur = false; + g_project->envmap = NULL; } void project_import_material_on_file_picked(char *path) { @@ -781,13 +781,13 @@ void project_set_default_swatches() { // 32-Color Palette by Andrew Kensler // http://eastfarthing.com/blog/2016-05-06-palette/ g_project->swatches = any_array_create_from_raw((void *[]){}, 0); - i32_array_t *colors = i32_array_create_from_raw( - (i32[]){ - 0xffffffff, 0xff000000, 0xffd6a090, 0xffa12c32, 0xfffa2f7a, 0xfffb9fda, 0xffe61cf7, 0xff992f7c, 0xff47011f, 0xff051155, 0xff4f02ec, - 0xff2d69cb, 0xff00a6ee, 0xff6febff, 0xff08a29a, 0xff2a666a, 0xff063619, 0xff4a4957, 0xff8e7ba4, 0xffb7c0ff, 0xffacbe9c, 0xff827c70, - 0xff5a3b1c, 0xffae6507, 0xfff7aa30, 0xfff4ea5c, 0xff9b9500, 0xff566204, 0xff11963b, 0xff51e113, 0xff08fdcc, - }, - 31); + i32_array_t *colors = i32_array_create_from_raw( + (i32[]){ + 0xffffffff, 0xff000000, 0xffd6a090, 0xffa12c32, 0xfffa2f7a, 0xfffb9fda, 0xffe61cf7, 0xff992f7c, 0xff47011f, 0xff051155, 0xff4f02ec, + 0xff2d69cb, 0xff00a6ee, 0xff6febff, 0xff08a29a, 0xff2a666a, 0xff063619, 0xff4a4957, 0xff8e7ba4, 0xffb7c0ff, 0xffacbe9c, 0xff827c70, + 0xff5a3b1c, 0xffae6507, 0xfff7aa30, 0xfff4ea5c, 0xff9b9500, 0xff566204, 0xff11963b, 0xff51e113, 0xff08fdcc, + }, + 31); for (i32 i = 0; i < colors->length; ++i) { i32 c = colors->buffer[i]; any_array_push(g_project->swatches, project_make_swatch(c)); diff --git a/paint/sources/render_path_base.c b/paint/sources/render_path_base.c index 3d430a2f..ebdddc19 100644 --- a/paint/sources/render_path_base.c +++ b/paint/sources/render_path_base.c @@ -65,9 +65,8 @@ void render_path_base_begin() { } // Match projection matrix jitter - bool skip_taa = - g_context->split_view || g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE || g_context->camera_type == CAMERA_TYPE_ORTHOGRAPHIC || - ((g_context->tool == TOOL_TYPE_CLONE || g_context->tool == TOOL_TYPE_BLUR || g_context->tool == TOOL_TYPE_SMUDGE) && g_context->pdirty > 0); + bool skip_taa = g_context->split_view || g_context->viewport_mode == VIEWPORT_MODE_PATH_TRACE || g_context->camera_type == CAMERA_TYPE_ORTHOGRAPHIC || + ((g_context->tool == TOOL_TYPE_CLONE || g_context->tool == TOOL_TYPE_BLUR || g_context->tool == TOOL_TYPE_SMUDGE) && g_context->pdirty > 0); if (g_config->brush_live) { render_path_base_taa_frame = 0; @@ -137,7 +136,7 @@ bool render_path_base_is_cached() { void render_path_base_draw_split(void (*draw_commands)(void)) { if (g_context->split_view && !g_context->paint2d_view) { - g_context->ddirty = 2; + g_context->ddirty = 2; camera_object_t *cam = scene_camera; g_context->view_index = g_context->view_index == 0 ? 1 : 0; diff --git a/paint/sources/render_path_preview.c b/paint/sources/render_path_preview.c index 07232b34..d0a60b31 100644 --- a/paint/sources/render_path_preview.c +++ b/paint/sources/render_path_preview.c @@ -84,7 +84,7 @@ void render_path_preview_commands_preview() { render_path_set_target("mtex", NULL, "mmain", GPU_CLEAR_NONE, 0, 0.0); render_path_draw_skydome("Scene/world_pass/world_pass"); - char *framebuffer = "texpreview"; + char *framebuffer = "texpreview"; slot_material_t *selected_mat = g_context->material; render_target_t *texpreview = any_map_get(render_path_render_targets, "texpreview"); render_target_t *texpreview_icon = any_map_get(render_path_render_targets, "texpreview_icon"); @@ -122,7 +122,7 @@ void render_path_preview_commands_decal() { render_path_set_target(output, NULL, "main", GPU_CLEAR_NONE, 0, 0.0); render_path_draw_skydome("Scene/world_pass/world_pass"); - char *framebuffer = "texpreview"; + char *framebuffer = "texpreview"; render_target_t *texpreview = any_map_get(render_path_render_targets, "texpreview"); texpreview->_image = g_context->decal_image; diff --git a/paint/sources/render_path_raytrace_bake.c b/paint/sources/render_path_raytrace_bake.c index 32b0ad62..770865ef 100644 --- a/paint/sources/render_path_raytrace_bake.c +++ b/paint/sources/render_path_raytrace_bake.c @@ -15,7 +15,7 @@ char *render_path_raytrace_bake_get_bake_shader_name() { return g_context->bake_type == BAKE_TYPE_AO ? string("raytrace_bake_ao%s", render_path_raytrace_ext) : g_context->bake_type == BAKE_TYPE_LIGHTMAP ? string("raytrace_bake_light%s", render_path_raytrace_ext) : g_context->bake_type == BAKE_TYPE_BENT_NORMAL ? string("raytrace_bake_bent%s", render_path_raytrace_ext) - : string("raytrace_bake_thick%s", render_path_raytrace_ext); + : string("raytrace_bake_thick%s", render_path_raytrace_ext); } bool render_path_raytrace_bake_commands(void (*parse_paint_material)(bool)) { @@ -66,7 +66,7 @@ bool render_path_raytrace_bake_commands(void (*parse_paint_material)(bool)) { } bake_type_t _bake_type = g_context->bake_type; - g_context->bake_type = BAKE_TYPE_INIT; + g_context->bake_type = BAKE_TYPE_INIT; parse_paint_material(true); render_path_set_target("baketex0", NULL, NULL, GPU_CLEAR_COLOR, 0x00000000, 0.0); // Pixels with alpha of 0.0 are skipped during raytracing diff --git a/paint/sources/resource.c b/paint/sources/resource.c index a8a0e0fd..039c0fc2 100644 --- a/paint/sources/resource.c +++ b/paint/sources/resource.c @@ -3,7 +3,7 @@ void resource_load(string_array_t *names) { for (i32 i = 0; i < names->length; ++i) { - char *s = names->buffer[i]; + char *s = names->buffer[i]; gpu_texture_t *image = data_get_image(s); any_map_set(resource_bundled, s, image); } diff --git a/paint/sources/slot_brush.c b/paint/sources/slot_brush.c index d613e0ab..c02c6af0 100644 --- a/paint/sources/slot_brush.c +++ b/paint/sources/slot_brush.c @@ -1,7 +1,7 @@ #include "global.h" -buffer_t *slot_brush_default_canvas = NULL; +buffer_t *slot_brush_default_canvas = NULL; slot_brush_t *slot_brush_create(ui_node_canvas_t *c) { slot_brush_t *raw = GC_ALLOC_INIT(slot_brush_t, {0}); diff --git a/paint/sources/slot_layer.c b/paint/sources/slot_layer.c index a413b820..d07516e2 100644 --- a/paint/sources/slot_layer.c +++ b/paint/sources/slot_layer.c @@ -1203,8 +1203,8 @@ void layers_update_fill_layer(bool parse_paint) { void layers_update_linked_layers() { slot_material_t *_material = g_context->material; for (i32 i = 0; i < project_materials->length; ++i) { - slot_material_t *m = project_materials->buffer[i]; - bool has_linked = false; + slot_material_t *m = project_materials->buffer[i]; + bool has_linked = false; for (i32 j = 0; j < m->canvas->nodes->length; ++j) { ui_node_t *node = m->canvas->nodes->buffer[j]; if (string_equals(node->type, "LAYER") || string_equals(node->type, "LAYER_MASK")) { @@ -1407,7 +1407,7 @@ void layers_create_filter_on_next_frame(void *_) { for (int i = 0; i < 9; ++i) { ui_node_link_t *l = - GC_ALLOC_INIT(ui_node_link_t, {.id = ui_next_link_id(canvas->links), .from_id = n->id, .from_socket = i, .to_id = nout->id, .to_socket = i}); + GC_ALLOC_INIT(ui_node_link_t, {.id = ui_next_link_id(canvas->links), .from_id = n->id, .from_socket = i, .to_id = nout->id, .to_socket = i}); any_array_push(canvas->links, l); } diff --git a/paint/sources/strings.c b/paint/sources/strings.c index 3360db31..ccb91098 100644 --- a/paint/sources/strings.c +++ b/paint/sources/strings.c @@ -26,13 +26,13 @@ char *strings_asset_already_imported() { } char *strings_graphics_api() { - #ifdef IRON_DIRECT3D12 +#ifdef IRON_DIRECT3D12 return "Direct3D12"; - #elif defined(IRON_METAL) +#elif defined(IRON_METAL) return "Metal"; - #elif defined(IRON_VULKAN) +#elif defined(IRON_VULKAN) return "Vulkan"; - #else +#else return "WebGPU"; - #endif +#endif } diff --git a/paint/sources/tab_brushes.c b/paint/sources/tab_brushes.c index 83cd526e..09d249e1 100644 --- a/paint/sources/tab_brushes.c +++ b/paint/sources/tab_brushes.c @@ -74,8 +74,8 @@ void tab_brushes_draw(ui_handle_t *htab) { ui_end_sticky(); ui_separator(3, false); - i32 slotw = math_floor(51 * UI_SCALE()); - i32 num = math_floor(ui->_window_w / (float)slotw); + i32 slotw = math_floor(51 * UI_SCALE()); + i32 num = math_floor(ui->_window_w / (float)slotw); if (num == 0) { return; } @@ -125,9 +125,9 @@ void tab_brushes_draw(ui_handle_t *htab) { ui_fill(w + 1, -2, 2, w + 4, ui->ops->theme->HIGHLIGHT_COL); } - uix = ui->_x; - uiy = ui->_y; - i32 tile = UI_SCALE() > 1 ? 100 : 50; + uix = ui->_x; + uiy = ui->_y; + i32 tile = UI_SCALE() > 1 ? 100 : 50; if (base_drag_brush != NULL && tab_brushes_drag_pos == i) { ui_fill(-1, -2, 2, imgw_val + 4, ui->ops->theme->HIGHLIGHT_COL); diff --git a/paint/sources/tab_fonts.c b/paint/sources/tab_fonts.c index 95bd0606..a4c3bd57 100644 --- a/paint/sources/tab_fonts.c +++ b/paint/sources/tab_fonts.c @@ -66,8 +66,8 @@ void tab_fonts_draw(ui_handle_t *htab) { ui_end_sticky(); ui_separator(3, false); - i32 slotw = math_floor(51 * UI_SCALE()); - i32 num = math_floor(ui->_window_w / (float)slotw); + i32 slotw = math_floor(51 * UI_SCALE()); + i32 num = math_floor(ui->_window_w / (float)slotw); if (num == 0) { return; } @@ -116,9 +116,9 @@ void tab_fonts_draw(ui_handle_t *htab) { ui_fill(w + 1, -2, 2, w + 4, ui->ops->theme->HIGHLIGHT_COL); } - uix = ui->_x; - uiy = ui->_y; - i32 tile = UI_SCALE() > 1 ? 100 : 50; + uix = ui->_x; + uiy = ui->_y; + i32 tile = UI_SCALE() > 1 ? 100 : 50; if (base_drag_font != NULL && tab_fonts_drag_pos == i) { ui_fill(-1, -2, 2, imgw_val + 4, ui->ops->theme->HIGHLIGHT_COL); diff --git a/paint/sources/tab_materials.c b/paint/sources/tab_materials.c index 332fb999..4bd92cf7 100644 --- a/paint/sources/tab_materials.c +++ b/paint/sources/tab_materials.c @@ -162,11 +162,11 @@ void tab_materials_draw_slots_menu() { ui_handle_t *opac_mode_handle = ui_handle(__ID__); opac_mode_handle->i = m->paint_opac_mode; string_array_t *opac_mode_items = any_array_create_from_raw( - (void *[]){ - tr("Alpha"), - tr("Translucency"), - }, - 2); + (void *[]){ + tr("Alpha"), + tr("Translucency"), + }, + 2); m->paint_opac_mode = ui_inline_radio(opac_mode_handle, opac_mode_items, UI_ALIGN_LEFT); ui_menu_separator(); @@ -201,8 +201,8 @@ void tab_materials_draw_slots_menu() { } void tab_materials_draw_slots(bool mini) { - i32 slotw = math_floor(51 * UI_SCALE() + g_config->window_scale * 2); - i32 num = math_floor(ui->_window_w / (float)slotw); + i32 slotw = math_floor(51 * UI_SCALE() + g_config->window_scale * 2); + i32 num = math_floor(ui->_window_w / (float)slotw); if (num == 0) { return; } @@ -256,10 +256,10 @@ void tab_materials_draw_slots(bool mini) { } // Draw material icon - uix = ui->_x; - uiy = ui->_y; - i32 tile = UI_SCALE() > 1 ? 100 : 50; - f32 imgh = mini ? ui_sidebar_default_w_mini * 0.85 * UI_SCALE() : 50 * UI_SCALE(); + uix = ui->_x; + uiy = ui->_y; + i32 tile = UI_SCALE() > 1 ? 100 : 50; + f32 imgh = mini ? ui_sidebar_default_w_mini * 0.85 * UI_SCALE() : 50 * UI_SCALE(); if (base_drag_material != NULL && tab_materials_drag_pos == i) { ui_fill(-1, -2, 2, imgw_val + 4, ui->ops->theme->HIGHLIGHT_COL); diff --git a/paint/sources/tab_scripts.c b/paint/sources/tab_scripts.c index 6d838d69..55ba88d3 100644 --- a/paint/sources/tab_scripts.c +++ b/paint/sources/tab_scripts.c @@ -36,7 +36,7 @@ void tab_scripts_draw_export(char *path) { } void tab_scripts_draw_import(char *path) { - buffer_t *b = data_get_blob(path); + buffer_t *b = data_get_blob(path); tab_scripts_set(sys_buffer_to_string(b)); data_delete_blob(path); } diff --git a/paint/sources/tab_textures.c b/paint/sources/tab_textures.c index f6c72051..e31bd016 100644 --- a/paint/sources/tab_textures.c +++ b/paint/sources/tab_textures.c @@ -186,8 +186,8 @@ void tab_textures_draw(ui_handle_t *htab) { if (project_assets->length > 0) { - i32 slotw = math_floor(52 * UI_SCALE()); - i32 num = math_floor(ui->_window_w / (float)slotw); + i32 slotw = math_floor(52 * UI_SCALE()); + i32 num = math_floor(ui->_window_w / (float)slotw); if (num == 0) { return; } @@ -228,9 +228,9 @@ void tab_textures_draw(ui_handle_t *htab) { render_target_t *empty_rt = any_map_get(render_path_render_targets, "empty_black"); img = empty_rt->_image; } - uix = ui->_x; - uiy = ui->_y; - i32 sw = img->height < img->width ? img->height : 0; + uix = ui->_x; + uiy = ui->_y; + i32 sw = img->height < img->width ? img->height : 0; if (base_drag_asset != NULL && tab_textures_drag_pos == i) { ui_fill(-1, -2, 2, imgw_val + 4, ui->ops->theme->HIGHLIGHT_COL); diff --git a/paint/sources/translator.c b/paint/sources/translator.c index 5b12cead..68c0f1e7 100644 --- a/paint/sources/translator.c +++ b/paint/sources/translator.c @@ -57,8 +57,8 @@ void translator_init_font_on_next_frame(void *_) { draw_font_t *f = data_get_font(font_path); if (cjk) { - i32 font_index = i32_map_get(translator_cjk_font_indices, g_config->locale) != -1 ? i32_map_get(translator_cjk_font_indices, g_config->locale) : 0; - f->index = font_index; + i32 font_index = i32_map_get(translator_cjk_font_indices, g_config->locale) != -1 ? i32_map_get(translator_cjk_font_indices, g_config->locale) : 0; + f->index = font_index; f->glyphs_version = 0; draw_font_init(f); } diff --git a/paint/sources/ui_header.c b/paint/sources/ui_header.c index 64c046ca..75212959 100644 --- a/paint/sources/ui_header.c +++ b/paint/sources/ui_header.c @@ -47,8 +47,8 @@ void ui_header_draw_tool_properties_color_picker_normal() { ui_color_wheel(_ui_header_draw_tool_properties_h, false, -1, 10 * ui->ops->theme->ELEMENT_H * UI_SCALE(), false, NULL, NULL); if (ui->changed) { g_context->picked_color->normal = _ui_header_draw_tool_properties_h->color; - ui_header_handle->redraws = 2; - ui_menu_keep_open = true; + ui_header_handle->redraws = 2; + ui_menu_keep_open = true; } } @@ -58,8 +58,8 @@ void ui_header_draw_tool_properties_color_picker_base() { ui_color_wheel(_ui_header_draw_tool_properties_h, false, -1, 10 * ui->ops->theme->ELEMENT_H * UI_SCALE(), false, NULL, NULL); if (ui->changed) { g_context->picked_color->base = _ui_header_draw_tool_properties_h->color; - ui_header_handle->redraws = 2; - ui_menu_keep_open = true; + ui_header_handle->redraws = 2; + ui_menu_keep_open = true; } } @@ -74,8 +74,8 @@ void ui_header_draw_tool_properties_to_mask(slot_layer_t *m) { gpu_draw(); gpu_end(); g_context->colorid_picked = false; - ui_toolbar_handle->redraws = 1; - ui_header_handle->redraws = 1; + ui_toolbar_handle->redraws = 1; + ui_header_handle->redraws = 1; g_context->layer_preview_dirty = true; layers_update_fill_layers(); } @@ -90,8 +90,8 @@ void ui_header_draw_tool_properties_import(char *path) { g_context->colorid_handle->i = array_index_of(project_assets, a); } } - g_context->ddirty = 2; - g_context->colorid_picked = false; + g_context->ddirty = 2; + g_context->colorid_picked = false; ui_toolbar_handle->redraws = 1; ui_base_hwnds->buffer[2]->redraws = 2; } @@ -105,8 +105,8 @@ void ui_header_draw_tool_properties() { } ui->enabled = g_context->colorid_picked; if (ui_icon_button(tr("Clear"), ICON_ERASE, UI_ALIGN_CENTER)) { - g_context->colorid_picked = false; - ui_toolbar_handle->redraws = 1; + g_context->colorid_picked = false; + ui_toolbar_handle->redraws = 1; } ui->enabled = true; ui_text(tr("Color ID Map"), UI_ALIGN_LEFT, 0x00000000); @@ -116,9 +116,9 @@ void ui_header_draw_tool_properties() { ui->combo_selected_images = base_combo_enum_images("TEX_IMAGE"); } if (g_context->colorid_handle->changed) { - g_context->ddirty = 2; - g_context->colorid_picked = false; - ui_toolbar_handle->redraws = 1; + g_context->ddirty = 2; + g_context->colorid_picked = false; + ui_toolbar_handle->redraws = 1; } ui_image(project_get_image(project_assets->buffer[cid]), 0xffffffff, -1.0); if (ui->is_hovered) { @@ -139,7 +139,7 @@ void ui_header_draw_tool_properties() { } ui->enabled = true; - ui_handle_t *h_viewport_mask = ui_handle(__ID__); + ui_handle_t *h_viewport_mask = ui_handle(__ID__); g_context->colorid_viewport_mask = ui_check(h_viewport_mask, tr("Viewport Mask"), ""); if (h_viewport_mask->changed) { make_material_parse_mesh_material(); @@ -194,25 +194,25 @@ void ui_header_draw_tool_properties() { ui_text(tr("Normal"), UI_ALIGN_LEFT, 0x00000000); ui->_w = _w; - ui_handle_t *hocc = ui_handle(__ID__); - hocc->f = g_context->picked_color->occlusion; + ui_handle_t *hocc = ui_handle(__ID__); + hocc->f = g_context->picked_color->occlusion; g_context->picked_color->occlusion = ui_slider(hocc, tr("Occlusion"), 0.0, 1.0, true, 100.0, true, UI_ALIGN_RIGHT, true); - ui_handle_t *hrough = ui_handle(__ID__); - hrough->f = g_context->picked_color->roughness; + ui_handle_t *hrough = ui_handle(__ID__); + hrough->f = g_context->picked_color->roughness; g_context->picked_color->roughness = ui_slider(hrough, tr("Roughness"), 0.0, 1.0, true, 100.0, true, UI_ALIGN_RIGHT, true); - ui_handle_t *hmet = ui_handle(__ID__); - hmet->f = g_context->picked_color->metallic; + ui_handle_t *hmet = ui_handle(__ID__); + hmet->f = g_context->picked_color->metallic; g_context->picked_color->metallic = ui_slider(hmet, tr("Metallic"), 0.0, 1.0, true, 100.0, true, UI_ALIGN_RIGHT, true); - ui_handle_t *hheight = ui_handle(__ID__); - hheight->f = g_context->picked_color->height; + ui_handle_t *hheight = ui_handle(__ID__); + hheight->f = g_context->picked_color->height; g_context->picked_color->height = ui_slider(hheight, tr("Height"), 0.0, 1.0, true, 100.0, true, UI_ALIGN_RIGHT, true); } - ui_handle_t *hopac = ui_handle(__ID__); - hopac->f = g_context->picked_color->opacity; + ui_handle_t *hopac = ui_handle(__ID__); + hopac->f = g_context->picked_color->opacity; g_context->picked_color->opacity = ui_slider(hopac, tr("Opacity"), 0.0, 1.0, true, 100.0, true, UI_ALIGN_RIGHT, true); ui_handle_t *h_select_mat = ui_handle(__ID__); @@ -290,8 +290,7 @@ void ui_header_draw_tool_properties() { g_context->bake_samples = math_floor(ui_slider(samples_handle, tr("Samples"), 1, 512, true, 1, true, UI_ALIGN_RIGHT, true)); } - if (g_context->bake_type == BAKE_TYPE_NORMAL_OBJECT || g_context->bake_type == BAKE_TYPE_POSITION || - g_context->bake_type == BAKE_TYPE_BENT_NORMAL) { + if (g_context->bake_type == BAKE_TYPE_NORMAL_OBJECT || g_context->bake_type == BAKE_TYPE_POSITION || g_context->bake_type == BAKE_TYPE_BENT_NORMAL) { ui_handle_t *bake_up_axis_handle = ui_handle(__ID__); if (bake_up_axis_handle->init) { bake_up_axis_handle->i = g_context->bake_up_axis; @@ -330,12 +329,12 @@ void ui_header_draw_tool_properties() { strength_handle->f = g_context->bake_ao_strength; } g_context->bake_ao_strength = ui_slider(strength_handle, tr("Strength"), 0.0, 2.0, true, 100.0, true, UI_ALIGN_RIGHT, true); - ui_handle_t *radius_handle = ui_handle(__ID__); + ui_handle_t *radius_handle = ui_handle(__ID__); if (radius_handle->init) { radius_handle->f = g_context->bake_ao_radius; } - g_context->bake_ao_radius = ui_slider(radius_handle, tr("Radius"), 0.0, 2.0, true, 100.0, true, UI_ALIGN_RIGHT, true); - ui_handle_t *offset_handle = ui_handle(__ID__); + g_context->bake_ao_radius = ui_slider(radius_handle, tr("Radius"), 0.0, 2.0, true, 100.0, true, UI_ALIGN_RIGHT, true); + ui_handle_t *offset_handle = ui_handle(__ID__); if (offset_handle->init) { offset_handle->f = g_context->bake_ao_offset; } @@ -363,17 +362,17 @@ void ui_header_draw_tool_properties() { strength_handle->f = g_context->bake_curv_strength; } g_context->bake_curv_strength = ui_slider(strength_handle, tr("Strength"), 0.0, 2.0, true, 100.0, true, UI_ALIGN_RIGHT, true); - ui_handle_t *radius_handle = ui_handle(__ID__); + ui_handle_t *radius_handle = ui_handle(__ID__); if (radius_handle->init) { radius_handle->f = g_context->bake_curv_radius; } g_context->bake_curv_radius = ui_slider(radius_handle, tr("Radius"), 0.0, 2.0, true, 100.0, true, UI_ALIGN_RIGHT, true); - ui_handle_t *offset_handle = ui_handle(__ID__); + ui_handle_t *offset_handle = ui_handle(__ID__); if (offset_handle->init) { offset_handle->f = g_context->bake_curv_offset; } g_context->bake_curv_offset = ui_slider(offset_handle, tr("Offset"), -2.0, 2.0, true, 100.0, true, UI_ALIGN_RIGHT, true); - ui_handle_t *smooth_handle = ui_handle(__ID__); + ui_handle_t *smooth_handle = ui_handle(__ID__); if (smooth_handle->init) { smooth_handle->f = g_context->bake_curv_smooth; } @@ -538,7 +537,7 @@ void ui_header_draw_tool_properties() { ui->_w *= 3; } g_context->text_tool_text = string_copy(ui_text_input(h, "", UI_ALIGN_LEFT, true, true)); - ui->_w = w; + ui->_w = w; if (h->changed) { gpu_texture_t *current = _draw_current; draw_end(); @@ -606,7 +605,7 @@ void ui_header_draw_tool_properties() { if (g_config->layout->buffer[LAYOUT_SIZE_HEADER] == 1) { if (g_config->touch_ui) { - ui->_w = math_floor(19 * sc); + ui->_w = math_floor(19 * sc); g_context->sym_x = ui_check(sym_x_handle, "", ""); ui->_x -= 4 * sc; g_context->sym_y = ui_check(sym_y_handle, "", ""); @@ -622,7 +621,7 @@ void ui_header_draw_tool_properties() { else { ui->_w = math_floor(56 * sc); ui_text(tr("Symmetry"), UI_ALIGN_LEFT, 0x00000000); - ui->_w = math_floor(25 * sc); + ui->_w = math_floor(25 * sc); g_context->sym_x = ui_check(sym_x_handle, tr("X"), ""); g_context->sym_y = ui_check(sym_y_handle, tr("Y"), ""); g_context->sym_z = ui_check(sym_z_handle, tr("Z"), ""); @@ -631,7 +630,7 @@ void ui_header_draw_tool_properties() { } else { // Popup - ui->_w = _w; + ui->_w = _w; g_context->sym_x = ui_check(sym_x_handle, string("%s %s", tr("Symmetry"), tr("X")), ""); g_context->sym_y = ui_check(sym_y_handle, string("%s %s", tr("Symmetry"), tr("Y")), ""); g_context->sym_z = ui_check(sym_z_handle, string("%s %s", tr("Symmetry"), tr("Z")), ""); diff --git a/paint/sources/ui_menubar.c b/paint/sources/ui_menubar.c index 35470ea5..8d10ff11 100644 --- a/paint/sources/ui_menubar.c +++ b/paint/sources/ui_menubar.c @@ -264,9 +264,9 @@ void ui_menubar_draw_category_items() { project_save_as(false); } - ui->changed = false; - ui_handle_t *h_pack_assets = ui_handle(__ID__); - h_pack_assets->b = g_context->pack_assets_on_save; + ui->changed = false; + ui_handle_t *h_pack_assets = ui_handle(__ID__); + h_pack_assets->b = g_context->pack_assets_on_save; g_context->pack_assets_on_save = ui_check(h_pack_assets, tr("Pack Assets"), ""); if (ui->changed) { ui_menu_keep_open = true; @@ -640,7 +640,7 @@ void ui_menubar_draw_category_items() { viewport_zoom(-0.2); } - camera_object_t *cam = scene_camera; + camera_object_t *cam = scene_camera; g_context->fov_handle->f = math_floor(cam->data->fov * 100) / 100.0; ui_menu_align(); cam->data->fov = ui_slider(g_context->fov_handle, tr("FoV"), 0.3, 1.4, true, 100.0, true, UI_ALIGN_RIGHT, true); diff --git a/paint/sources/ui_sidebar.c b/paint/sources/ui_sidebar.c index af95c356..5083d833 100644 --- a/paint/sources/ui_sidebar.c +++ b/paint/sources/ui_sidebar.c @@ -107,7 +107,7 @@ void ui_sidebar_show(bool b) { g_context->maximized_sidebar_width != 0 ? g_context->maximized_sidebar_width : math_floor(ui_sidebar_default_w * g_config->window_scale); } else { - ui_base_htabs->buffer[TAB_AREA_SIDEBAR0]->i = ui_sidebar_last_tab; + ui_base_htabs->buffer[TAB_AREA_SIDEBAR0]->i = ui_sidebar_last_tab; g_config->layout_tabs->buffer[TAB_AREA_SIDEBAR0] = ui_sidebar_last_tab; g_context->maximized_sidebar_width = g_config->layout->buffer[LAYOUT_SIZE_SIDEBAR_W]; g_config->layout->buffer[LAYOUT_SIZE_SIDEBAR_W] = 0; diff --git a/paint/sources/ui_statusbar.c b/paint/sources/ui_statusbar.c index fe694ae2..35811abe 100644 --- a/paint/sources/ui_statusbar.c +++ b/paint/sources/ui_statusbar.c @@ -28,7 +28,7 @@ void ui_statusbar_render_ui() { if (!g_config->touch_ui) { bool minimized = g_config->layout->buffer[LAYOUT_SIZE_STATUS_H] <= (ui_statusbar_default_h * g_config->window_scale); if (ui_tab(ui_base_htabs->buffer[TAB_AREA_STATUS], minimized ? "<" : ">", false, -2, false)) { - ui_base_htabs->buffer[TAB_AREA_STATUS]->i = ui_statusbar_last_tab; + ui_base_htabs->buffer[TAB_AREA_STATUS]->i = ui_statusbar_last_tab; g_config->layout_tabs->buffer[TAB_AREA_STATUS] = ui_statusbar_last_tab; } } diff --git a/paint/sources/uniforms_ext.c b/paint/sources/uniforms_ext.c index 80740ec1..62bc2a67 100644 --- a/paint/sources/uniforms_ext.c +++ b/paint/sources/uniforms_ext.c @@ -165,7 +165,7 @@ vec2_t uniforms_ext_vec2_link(object_t *object, material_data_t *mat, char *link f32 uniforms_ext_vec2d(f32 x) { // Transform from 3d viewport coord to 2d view coord g_context->paint2d_view = false; - f32 res = (x * base_w() - base_w()) / (float)ui_view2d_ww; + f32 res = (x * base_w() - base_w()) / (float)ui_view2d_ww; g_context->paint2d_view = true; return res; } @@ -184,8 +184,8 @@ vec4_t uniforms_ext_vec3_link(object_t *object, material_data_t *mat, char *link x = uniforms_ext_vec2d(x); lastx = uniforms_ext_vec2d(lastx); } - f32 angle = math_atan2(-y + lasty, x - lastx) - math_pi() / 2.0; - v = (vec4_t){math_cos(angle), math_sin(angle), allow_paint ? 1 : 0, 1.0}; + f32 angle = math_atan2(-y + lasty, x - lastx) - math_pi() / 2.0; + v = (vec4_t){math_cos(angle), math_sin(angle), allow_paint ? 1 : 0, 1.0}; g_context->prev_paint_vec_x = g_context->last_paint_vec_x; g_context->prev_paint_vec_y = g_context->last_paint_vec_y; return v; @@ -201,12 +201,12 @@ vec4_t uniforms_ext_vec3_link(object_t *object, material_data_t *mat, char *link } else if (string_equals(link, "_picker_base")) { v = (vec4_t){color_get_rb(g_context->picked_color->base) / 255.0, color_get_gb(g_context->picked_color->base) / 255.0, - color_get_bb(g_context->picked_color->base) / 255.0, 1.0}; + color_get_bb(g_context->picked_color->base) / 255.0, 1.0}; return v; } else if (string_equals(link, "_picker_normal")) { v = (vec4_t){color_get_rb(g_context->picked_color->normal) / 255.0, color_get_gb(g_context->picked_color->normal) / 255.0, - color_get_bb(g_context->picked_color->normal) / 255.0, 1.0}; + color_get_bb(g_context->picked_color->normal) / 255.0, 1.0}; return v; } else if (string_equals(link, "_particle_hit")) { diff --git a/paint/sources/util_mesh.c b/paint/sources/util_mesh.c index 0187c1a6..0d63a92b 100644 --- a/paint/sources/util_mesh.c +++ b/paint/sources/util_mesh.c @@ -47,9 +47,9 @@ void util_mesh_merge(mesh_object_t_array_t *paint_objects) { return; } g_context->merged_object_is_atlas = paint_objects->length < project_paint_objects->length; - i32 vlen = 0; - i32 ilen = 0; - f32 max_scale = 0.0; + i32 vlen = 0; + i32 ilen = 0; + f32 max_scale = 0.0; for (i32 i = 0; i < paint_objects->length; ++i) { vlen += paint_objects->buffer[i]->data->vertex_arrays->buffer[0]->values->length; ilen += paint_objects->buffer[i]->data->index_array->length; @@ -141,7 +141,7 @@ void util_mesh_merge(mesh_object_t_array_t *paint_objects) { any_array_push(raw->vertex_arrays, va); } util_mesh_remove_merged(); - mesh_data_t *md = mesh_data_create(raw); + mesh_data_t *md = mesh_data_create(raw); g_context->merged_object = mesh_object_create(md, g_context->paint_object->material); g_context->merged_object->base->name = string("%s_merged", g_context->paint_object->base->name); g_context->merged_object->force_context = "paint"; diff --git a/paint/sources/util_particle.c b/paint/sources/util_particle.c index 4b517589..15bbd913 100644 --- a/paint/sources/util_particle.c +++ b/paint/sources/util_particle.c @@ -26,7 +26,7 @@ void util_particle_init() { } } - material_data_t *md = data_get_material("Scene", "MaterialParticle"); + material_data_t *md = data_get_material("Scene", "MaterialParticle"); g_context->particle_material = md; for (i32 i = 0; i < _scene_raw->objects->length; ++i) { @@ -58,10 +58,10 @@ void util_particle_init_mesh() { util_mesh_merge(NULL); } - mesh_object_t *po = g_context->merged_object; - po->base->transform->scale.x = po->base->parent->transform->scale.x; - po->base->transform->scale.y = po->base->parent->transform->scale.y; - po->base->transform->scale.z = po->base->parent->transform->scale.z; + mesh_object_t *po = g_context->merged_object; + po->base->transform->scale.x = po->base->parent->transform->scale.x; + po->base->transform->scale.y = po->base->parent->transform->scale.y; + po->base->transform->scale.z = po->base->parent->transform->scale.z; g_context->paint_body = physics_body_create(); g_context->paint_body->shape = PHYSICS_SHAPE_MESH; physics_body_init(g_context->paint_body, po->base); diff --git a/paint/sources/viewport.c b/paint/sources/viewport.c index a7c5f425..e4f113f3 100644 --- a/paint/sources/viewport.c +++ b/paint/sources/viewport.c @@ -27,9 +27,9 @@ void viewport_reset() { if (string_equals(o->type, "camera_object")) { cam->base->transform->local = mat4_from_f32_array(o->transform, 0); transform_decompose(cam->base->transform); - cam->data->fov = g_config->camera_fov; + cam->data->fov = g_config->camera_fov; g_context->cam_handle->i = 0; - cam->data->ortho = NULL; + cam->data->ortho = NULL; camera_object_build_proj(cam, -1.0); g_context->ddirty = 2; camera_reset(-1); @@ -42,10 +42,10 @@ void viewport_reset() { void viewport_set_view(f32 x, f32 y, f32 z, f32 rx, f32 ry, f32 rz) { g_context->paint_object->base->transform->rot = (quat_t){0, 0, 0, 1}; g_context->paint_object->base->transform->dirty = true; - camera_object_t *cam = scene_camera; - f32 dist = vec4_len(cam->base->transform->loc); - cam->base->transform->loc = (vec4_t){x * dist, y * dist, z * dist, 1.0}; - cam->base->transform->rot = quat_from_euler(rx, ry, rz); + camera_object_t *cam = scene_camera; + f32 dist = vec4_len(cam->base->transform->loc); + cam->base->transform->loc = (vec4_t){x * dist, y * dist, z * dist, 1.0}; + cam->base->transform->rot = quat_from_euler(rx, ry, rz); transform_build_matrix(cam->base->transform); camera_object_build_proj(cam, -1.0); g_context->ddirty = 2;