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

Build fixes

Browse Source
This commit is contained in:
luboslenco
2024-10-19 19:44:38 +02:00
parent f63f18597f
commit 6883244073
14 changed files with 128 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/sources/base.ts
+32 -21
View File
@@ -1119,24 +1119,24 @@ function base_init_layers() {
///end
///if is_lab
let texpaint: image_t = map_get(render_path_render_targets, "texpaint")._image;
let texpaint_nor: image_t = map_get(render_path_render_targets, "texpaint_nor")._image;
let texpaint_pack: image_t = map_get(render_path_render_targets, "texpaint_pack")._image;
g2_begin(texpaint);
let texpaint: render_target_t = map_get(render_path_render_targets, "texpaint");
let texpaint_nor: render_target_t = map_get(render_path_render_targets, "texpaint_nor");
let texpaint_pack: render_target_t = map_get(render_path_render_targets, "texpaint_pack");
g2_begin(texpaint._image);
g2_draw_scaled_image(resource_get("placeholder.k"), 0, 0, config_get_texture_res_x(), config_get_texture_res_y()); // Base
g2_end();
g4_begin(texpaint_nor);
g4_begin(texpaint_nor._image);
g4_clear(color_from_floats(0.5, 0.5, 1.0, 0.0)); // Nor
g4_end();
g4_begin(texpaint_pack);
g4_begin(texpaint_pack._image);
g4_clear(color_from_floats(1.0, 0.4, 0.0, 0.0)); // Occ, rough, met
g4_end();
let texpaint_nor_empty: image_t = map_get(render_path_render_targets, "texpaint_nor_empty")._image;
let texpaint_pack_empty: image_t = map_get(render_path_render_targets, "texpaint_pack_empty")._image;
g4_begin(texpaint_nor_empty);
let texpaint_nor_empty: render_target_t = map_get(render_path_render_targets, "texpaint_nor_empty");
let texpaint_pack_empty: render_target_t = map_get(render_path_render_targets, "texpaint_pack_empty");
g4_begin(texpaint_nor_empty._image);
g4_clear(color_from_floats(0.5, 0.5, 1.0, 0.0)); // Nor
g4_end();
g4_begin(texpaint_pack_empty);
g4_begin(texpaint_pack_empty._image);
g4_clear(color_from_floats(1.0, 0.4, 0.0, 0.0)); // Occ, rough, met
g4_end();
///end
@@ -2382,7 +2382,7 @@ function base_on_layers_resized() {
///end
///if is_lab
function base_flatten(height_to_normal: bool = false): any {
function base_flatten(height_to_normal: bool = false): slot_layer_t {
let texpaint: image_t = brush_output_node_inst.texpaint;
let texpaint_nor: image_t = brush_output_node_inst.texpaint_nor;
let texpaint_pack: image_t = brush_output_node_inst.texpaint_pack;
@@ -2394,21 +2394,29 @@ function base_flatten(height_to_normal: bool = false): any {
let brush_node: logic_node_t = parser_logic_get_logic_node(node);
if (brush_node != null && logic_node_get_cached_image(brush_node) != null) {
texpaint = logic_node_get_cached_image(brush_node);
texpaint_nor = map_get(render_path_render_targets, "texpaint_nor_empty")._image;
texpaint_pack = map_get(render_path_render_targets, "texpaint_pack_empty")._image;
let texpaint_nor_rt: render_target_t = map_get(render_path_render_targets, "texpaint_nor_empty");
let texpaint_pack_rt: render_target_t = map_get(render_path_render_targets, "texpaint_pack_empty");
texpaint_nor = texpaint_nor_rt._image;
texpaint_pack = texpaint_pack_rt._image;
}
}
return { texpaint: texpaint, texpaint_nor: texpaint_nor, texpaint_pack: texpaint_pack };
let l: slot_layer_t = { texpaint: texpaint, texpaint_nor: texpaint_nor, texpaint_pack: texpaint_pack };
return l;
}
function base_on_layers_resized() {
image_unload(brush_output_node_inst.texpaint);
brush_output_node_inst.texpaint = map_get(render_path_render_targets, "texpaint")._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y());
let texpaint_rt: render_target_t = map_get(render_path_render_targets, "texpaint");
brush_output_node_inst.texpaint = texpaint_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y());
image_unload(brush_output_node_inst.texpaint_nor);
brush_output_node_inst.texpaint_nor = map_get(render_path_render_targets, "texpaint_nor")._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y());
let texpaint_nor_rt: render_target_t = map_get(render_path_render_targets, "texpaint_nor");
brush_output_node_inst.texpaint_nor = texpaint_nor_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y());
image_unload(brush_output_node_inst.texpaint_pack);
brush_output_node_inst.texpaint_pack = map_get(render_path_render_targets, "texpaint_pack")._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y());
let texpaint_pack_rt: render_target_t = map_get(render_path_render_targets, "texpaint_pack");
brush_output_node_inst.texpaint_pack = texpaint_pack_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y());
if (inpaint_node_image != null) {
image_unload(inpaint_node_image);
@@ -2433,10 +2441,13 @@ function base_on_layers_resized() {
tiling_node_init();
}
image_unload(map_get(render_path_render_targets, "texpaint_blend0")._image);
map_get(render_path_render_targets, "texpaint_blend0")._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y(), tex_format_t.R8);
image_unload(map_get(render_path_render_targets, "texpaint_blend1")._image);
map_get(render_path_render_targets, "texpaint_blend1")._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y(), tex_format_t.R8);
let texpaint_blend0_rt: render_target_t = map_get(render_path_render_targets, "texpaint_blend0");
image_unload(texpaint_blend0_rt._image);
texpaint_blend0_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y(), tex_format_t.R8);
let texpaint_blend1_rt: render_target_t = map_get(render_path_render_targets, "texpaint_blend1");
image_unload(texpaint_blend1_rt._image);
texpaint_blend1_rt._image = image_create_render_target(config_get_texture_res_x(), config_get_texture_res_y(), tex_format_t.R8);
if (map_get(render_path_render_targets, "texpaint_node") != null) {
map_delete(render_path_render_targets, "texpaint_node");
base/sources/context.ts
+8 -3
View File
@@ -271,8 +271,8 @@ type context_t = {
///end
///if is_lab
material?: any; ////
layer?: any; ////
material?: slot_material_t; ////
layer?: slot_layer_t; ////
tool?: workspace_tool_t;
color_picker_previous_tool?: workspace_tool_t;
@@ -991,7 +991,12 @@ function context_update() {
let dy: i32 = math_abs(context_raw.lock_start_y - mouse_view_y());
if (dx > 1 || dy > 1) {
context_raw.lock_begin = false;
dx > dy ? context_raw.lock_y = true : context_raw.lock_x = true;
if (dx > dy) {
context_raw.lock_y = true;
}
else {
context_raw.lock_x = true;
}
}
}
base/sources/parser_material.ts
-4
View File
@@ -2040,7 +2040,3 @@ enum color_space_t {
SRGB,
DIRECTX_NORMAL_MAP,
}
///if is_lab
type slot_material_t = any;
///end
base/sources/project.ts
-1
View File
@@ -795,7 +795,6 @@ type project_format_t = {
///if is_lab
material?: ui_node_canvas_t;
material_groups?: ui_node_canvas_t[];
mesh_data?: mesh_data_t;
mesh_icon?: buffer_t;
///end
base/sources/tab_textures.ts
+2 -1
View File
@@ -296,11 +296,12 @@ function tab_textures_delete_texture(asset: asset_t) {
///end
});
///if (is_paint || is_sculpt)
for (let i: i32 = 0; i < project_materials.length; ++i) {
let m: slot_material_t = project_materials[i];
tab_textures_update_texture_pointers(m.canvas.nodes, i);
}
///if (is_paint || is_sculpt)
for (let i: i32 = 0; i < project_brushes.length; ++i) {
let b: slot_brush_t = project_brushes[i];
tab_textures_update_texture_pointers(b.canvas.nodes, i);
base/sources/ui_menubar.ts
+4 -4
View File
@@ -5,7 +5,7 @@ let ui_menubar_menu_handle: ui_handle_t = ui_handle_create();
let ui_menubar_w: i32 = ui_menubar_default_w;
///if is_lab
let _ui_menubar_saved_camera: mat4_t = null;
let _ui_menubar_saved_camera: mat4_t = mat4_nan();
let _ui_menubar_plane: mesh_object_t = null;
///end
@@ -138,9 +138,9 @@ function ui_menubar_render_ui() {
context_main_object().skip_context = null;
if (ui_header_worktab.position == space_type_t.SPACE3D) {
if (_ui_menubar_saved_camera != null) {
if (!mat4_isnan(_ui_menubar_saved_camera)) {
transform_set_matrix(scene_camera.base.transform, _ui_menubar_saved_camera);
_ui_menubar_saved_camera = null;
_ui_menubar_saved_camera = mat4_nan();
}
scene_meshes = [context_main_object()];
}
@@ -181,7 +181,7 @@ function ui_menubar_render_ui() {
array_remove(scene_meshes, _ui_menubar_plane);
}
if (_ui_menubar_saved_camera == null) {
if (mat4_isnan(_ui_menubar_saved_camera)) {
_ui_menubar_saved_camera = mat4_clone(scene_camera.base.transform.local);
}
scene_meshes = [_ui_menubar_plane];