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

paint: cleanup

Browse Source
This commit is contained in:
luboslenco
2026-08-22 10:19:06 +02:00
parent 1ded1bd956
commit fdfef3b85f
4 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/render/render_path_raytrace.c
+4 -8
View File
@@ -36,9 +36,9 @@ void render_path_raytrace_commands(bool use_live_layer) {
if (render_path_raytrace_last_envmap != saved_envmap) {
render_path_raytrace_last_envmap = saved_envmap;
gpu_texture_t *bnoise_sobol = any_map_get(scene_embedded, "bnoise_sobol.k");
gpu_texture_t *bnoise_scramble = any_map_get(scene_embedded, "bnoise_scramble.k");
gpu_texture_t *bnoise_rank = any_map_get(scene_embedded, "bnoise_rank.k");
gpu_texture_t *bnoise_sobol = data_get_texture("bnoise_sobol.k");
gpu_texture_t *bnoise_scramble = data_get_texture("bnoise_scramble.k");
gpu_texture_t *bnoise_rank = data_get_texture("bnoise_rank.k");
slot_layer_t *l = layers_flatten(true, NULL);
gpu_raytrace_set_textures(l->texpaint, l->texpaint_nor, l->texpaint_pack, saved_envmap, bnoise_sobol, bnoise_scramble, bnoise_rank);
@@ -154,11 +154,7 @@ void render_path_raytrace_build_data() {
void render_path_raytrace_raytrace_init(char *shader_name, bool build) {
if (render_path_raytrace_init_shader) {
render_path_raytrace_init_shader = false;
scene_embed_data("bnoise_sobol.k");
scene_embed_data("bnoise_scramble.k");
scene_embed_data("bnoise_rank.k");
buffer_t *shader = data_get_blob(shader_name);
buffer_t *shader = data_get_blob(shader_name);
_gpu_raytrace_init(shader);
}
paint/sources/render/render_path_raytrace_bake.c
+3 -3
View File
@@ -101,9 +101,9 @@ bool render_path_raytrace_bake_commands(void (*parse_paint_material)(bool)) {
render_path_raytrace_bake_last_layer = g_context->layer->texpaint;
render_path_raytrace_bake_last_bake_type2 = g_context->bake_type;
gpu_texture_t *bnoise_sobol = any_map_get(scene_embedded, "bnoise_sobol.k");
gpu_texture_t *bnoise_scramble = any_map_get(scene_embedded, "bnoise_scramble.k");
gpu_texture_t *bnoise_rank = any_map_get(scene_embedded, "bnoise_rank.k");
gpu_texture_t *bnoise_sobol = data_get_texture("bnoise_sobol.k");
gpu_texture_t *bnoise_scramble = data_get_texture("bnoise_scramble.k");
gpu_texture_t *bnoise_rank = data_get_texture("bnoise_rank.k");
render_target_t *baketex0 = any_map_get(render_path_render_targets, "baketex0");
render_target_t *baketex1 = any_map_get(render_path_render_targets, "baketex1");
paint/sources/startup.c
-2
View File
@@ -4456,7 +4456,5 @@ scene_t *startup_get_scene(void) {
obj13->material_ref = "Material";
scene->objects->buffer[4] = obj13;
}
scene->embedded_datas = string_array_create(1);
scene->embedded_datas->buffer[0] = "noise256.k";
return scene;
}
paint/sources/util/util_encode.c
+1 -5
View File
@@ -51,7 +51,7 @@ buffer_t *util_encode_scene(scene_t *raw) {
i32 size = 8 * 1024 * 1024 + util_encode_mesh_data_size(raw->mesh_datas);
buffer_t *encoded = buffer_create(size);
armpack_encode_start(encoded->buffer);
armpack_encode_map(13);
armpack_encode_map(9);
armpack_encode_string("name");
armpack_encode_null();
armpack_encode_string("objects");
@@ -69,10 +69,6 @@ buffer_t *util_encode_scene(scene_t *raw) {
armpack_encode_null();
armpack_encode_string("world_ref");
armpack_encode_null();
armpack_encode_string("speaker_datas"); // TODO: deprecated
armpack_encode_null();
armpack_encode_string("embedded_datas");
armpack_encode_null();
i32 ei = armpack_encode_end();
encoded->length = ei;
return encoded;