paint: merge sculpt

paint/sources/util/util_layer.c

@@ -115,6 +115,23 @@ void layers_resize() {
 	if (render_path_paint_live_layer != NULL) {
 		slot_layer_resize_and_set_bits(render_path_paint_live_layer);
 	}
+
+	render_target_t *sculpt_ref = any_map_get(rts, "texpaint_sculpt_ref");
+	if (sculpt_ref != NULL) {
+		gpu_delete_texture(sculpt_ref->_image);
+		sculpt_ref->width  = config_get_texture_res_x();
+		sculpt_ref->height = config_get_texture_res_y();
+		sculpt_ref->_image = gpu_create_render_target(config_get_texture_res_x(), config_get_texture_res_y(), GPU_TEXTURE_FORMAT_RGBA128);
+	}
+
+	render_target_t *sculpt_base = any_map_get(rts, "texpaint_sculpt_base");
+	if (sculpt_base != NULL) {
+		gpu_delete_texture(sculpt_base->_image);
+		sculpt_base->width  = config_get_texture_res_x();
+		sculpt_base->height = config_get_texture_res_y();
+		sculpt_base->_image = gpu_create_render_target(config_get_texture_res_x(), config_get_texture_res_y(), GPU_TEXTURE_FORMAT_RGBA128);
+	}
+
 	render_path_raytrace_ready = false; // Rebuild baketex
 	g_context->ddirty          = 2;
 }
@@ -344,7 +361,7 @@ void layers_update_fill_layers() {
 					if (l->texpaint_sculpt != NULL) {
 						i32 tid = l->id;
 						i32 hid = history_undo_i - 1 < 0 ? g_config->undo_steps - 1 : history_undo_i - 1;
-						sculpt_import_mesh_pack_to_texture(g_context->paint_object->data, l->texpaint_sculpt);
+						sculpt_import_mesh_pack_to_texture(l->texpaint_sculpt);
 						render_path_set_target(string("texpaint_sculpt_undo%d", hid), NULL, NULL, GPU_CLEAR_NONE, 0, 0.0);
 						render_path_bind_target(string("texpaint_sculpt%d", tid), "tex");
 						render_path_draw_shader("Scene/copy_pass/copyRGBA128_pass");
@@ -424,7 +441,7 @@ void layers_update_fill_layer(bool parse_paint) {
 	if (g_context->layer->texpaint_sculpt != NULL) {
 		i32 tid = g_context->layer->id;
 		i32 hid = history_undo_i - 1 < 0 ? g_config->undo_steps - 1 : history_undo_i - 1;
-		sculpt_import_mesh_pack_to_texture(g_context->paint_object->data, g_context->layer->texpaint_sculpt);
+		sculpt_import_mesh_pack_to_texture(g_context->layer->texpaint_sculpt);
 		render_path_set_target(string("texpaint_sculpt_undo%d", hid), NULL, NULL, GPU_CLEAR_NONE, 0, 0.0);
 		render_path_bind_target(string("texpaint_sculpt%d", tid), "tex");
 		render_path_draw_shader("Scene/copy_pass/copyRGBA128_pass");
@@ -637,6 +654,13 @@ slot_layer_t *layers_new_group() {
 	return l;
 }
 
+static slot_layer_t *_layers_path_sculpt_layer = NULL;
+
+void layers_new_path_layer_sculpt_init(void *_) {
+	sculpt_init();
+	sculpt_init_sculpt_texture(_layers_path_sculpt_layer);
+}
+
 slot_layer_t *layers_new_path_layer(bool curved) {
 	slot_layer_t *l = layers_new_layer(true, -1, NULL);
 	if (l == NULL) {
@@ -650,6 +674,12 @@ slot_layer_t *layers_new_path_layer(bool curved) {
 	l->path_curved        = curved;
 	l->path_material      = g_context->material;
 	l->name               = string(curved ? "Curve %d" : "Path %d", l->id + 1);
+
+	if (g_config->workflow == WORKFLOW_SCULPT) {
+		_layers_path_sculpt_layer = l;
+		sys_notify_on_next_frame(&layers_new_path_layer_sculpt_init, NULL);
+	}
+
 	return l;
 }
 
@@ -663,9 +693,8 @@ void layers_create_fill_layer_on_next_frame(void *_) {
 	l->object_mask = g_context->layer_filter;
 
 	if (g_config->workflow == WORKFLOW_SCULPT) {
-		mesh_data_t *md = g_context->paint_object->data;
 		sculpt_init();
-		sculpt_init_sculpt_texture(l, md);
+		sculpt_init_sculpt_texture(l);
 	}
 
 	history_to_fill_layer();

paint/sources/util/util_particle.c

@@ -27,6 +27,7 @@ void util_particle_update() {
 	}
 
 	util_particle_init_physics();
+	make_particle_get_bullet_material();
 	physics_world_t *world = physics_world_active;
 	physics_world_update(world);
 
@@ -73,6 +74,7 @@ void util_particle_update() {
 			mesh_object_t *mo = o->ext;
 			mo->base->name    = ".Bullet";
 			mo->base->visible = true;
+			mo->material      = make_particle_get_bullet_material();
 
 			util_render_pick_pos_nor_tex();
 			f32 nx            = g_context->norx_picked;

paint/sources/util/util_path.c

@@ -77,6 +77,9 @@ static void path_set_camera(f32_array_t *points_camera, i32 num_camera, i32 ci)
 		camera_object_build_proj(scene_camera, points_camera->buffer[ci * 9 + 8]);
 		camera_object_build_mat(scene_camera);
 		render_path_base_draw_gbuffer();
+		if (g_context->layer->texpaint_sculpt != NULL) {
+			render_path_sculpt_snapshot_gbuffer();
+		}
 	}
 }
 
@@ -291,6 +294,11 @@ static void path_repaint(slot_layer_t *l) {
 
 	slot_layer_clear(l, 0x00000000, NULL, 1.0, layers_default_rough, 0.0);
 
+	if (l->texpaint_sculpt != NULL) {
+		// Restore the undeformed base mesh
+		sculpt_import_mesh_pack_to_texture(l->texpaint_sculpt);
+	}
+
 	vec4_t _camera_loc = scene_camera->base->transform->loc;
 	quat_t _camera_rot = scene_camera->base->transform->rot;
 

paint/sources/util/util_render.c

@@ -226,6 +226,10 @@ void util_render_make_brush_preview() {
 		return;
 	}
 
+	if (g_config->workflow == WORKFLOW_SCULPT) {
+		return;
+	}
+
 	gpu_texture_t *current = _draw_current;
 	bool           in_use  = gpu_in_use;
 	if (in_use)