From 8bf78d7f5676520bf6f4241afb88fba506e342f4 Mon Sep 17 00:00:00 2001 From: Miika Hamalainen Date: Thu, 13 Oct 2011 20:00:22 +0000 Subject: Dynamic Paint: * Fix: Wave "timescale" also changed simulation behavior. Now different timescale values will lead to nearly identical results, just slower or faster. * Added "Displace Factor" setting for vertex displace surfaces. You can use it to adjust final displace strength or use negative values to paint bumps. * Added clamp/map value to wave image sequence output settings. * RNA description tweaking. * General code tweaking. --- source/blender/editors/physics/dynamicpaint_ops.c | 243 ++++++++++++++++++++-- 1 file changed, 221 insertions(+), 22 deletions(-) (limited to 'source/blender/editors/physics/dynamicpaint_ops.c') diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index 8a4007745de..a868cb55ca5 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -18,16 +18,25 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include +#include +#include + +#include "BLI_blenlib.h" + #include "DNA_dynamicpaint_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "BKE_blender.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_depsgraph.h" #include "BKE_dynamicpaint.h" +#include "BKE_global.h" #include "BKE_modifier.h" +#include "BKE_report.h" #include "ED_mesh.h" #include "ED_screen.h" @@ -36,30 +45,12 @@ #include "RNA_define.h" #include "RNA_enum_types.h" +/* Platform independend time */ +#include "PIL_time.h" + #include "WM_types.h" #include "WM_api.h" -static int dynamicpaint_bake_exec(bContext *C, wmOperator *op) -{ - /* Bake dynamic paint */ - if(!dynamicPaint_initBake(C, op)) { - return OPERATOR_CANCELLED;} - - return OPERATOR_FINISHED; -} - -void DPAINT_OT_bake(wmOperatorType *ot) -{ - /* identifiers */ - ot->name= "Dynamic Paint Bake"; - ot->description= "Bake dynamic paint image sequence surface"; - ot->idname= "DPAINT_OT_bake"; - - /* api callbacks */ - ot->exec= dynamicpaint_bake_exec; - ot->poll= ED_operator_object_active_editable; -} - static int surface_slot_add_exec(bContext *C, wmOperator *op) { DynamicPaintModifierData *pmd = 0; @@ -253,7 +244,7 @@ void DPAINT_OT_output_toggle(wmOperatorType *ot) /* identifiers */ ot->name= "Toggle Output Layer"; ot->idname= "DPAINT_OT_output_toggle"; - ot->description = "Adds or removes Dynamic Paint output data layer."; + ot->description = "Adds or removes Dynamic Paint output data layer"; /* api callbacks */ ot->exec= output_toggle_exec; @@ -266,3 +257,211 @@ void DPAINT_OT_output_toggle(wmOperatorType *ot) prop= RNA_def_int(ot->srna, "index", 0, 0, 1, "Index", "", 0, 1); ot->prop= prop; } + + +/***************************** Image Sequence Baking ******************************/ + +/* +* Do actual bake operation. Loop through to-be-baked frames. +* Returns 0 on failture. +*/ +static int dynamicPaint_bakeImageSequence(bContext *C, DynamicPaintSurface *surface, Object *cObject) +{ + DynamicPaintCanvasSettings *canvas = surface->canvas; + Scene *scene= CTX_data_scene(C); + wmWindow *win = CTX_wm_window(C); + int frame = 1; + int frames; + + frames = surface->end_frame - surface->start_frame + 1; + if (frames <= 0) {sprintf(canvas->error, "No frames to bake.");printf("DynamicPaint bake failed: %s", canvas->error);return 0;} + + /* + * Set frame to start point (also inits modifier data) + */ + frame = surface->start_frame; + scene->r.cfra = (int)frame; + ED_update_for_newframe(CTX_data_main(C), scene, win->screen, 1); + + /* Init surface */ + if (!dynamicPaint_createUVSurface(surface)) return 0; + + /* + * Loop through selected frames + */ + for (frame=surface->start_frame; frame<=surface->end_frame; frame++) + { + float progress = (frame - surface->start_frame) / (float)frames * 100; + surface->current_frame = frame; + + /* If user requested stop (esc), quit baking */ + if (blender_test_break()) return 0; + + /* Update progress bar cursor */ + WM_timecursor(win, (int)progress); + printf("DynamicPaint: Baking frame %i\n", frame); + + /* calculate a frame */ + scene->r.cfra = (int)frame; + ED_update_for_newframe(CTX_data_main(C), scene, win->screen, 1); + if (!dynamicPaint_calculateFrame(surface, scene, cObject, frame)) return 0; + + /* + * Save output images + */ + { + char filename[250]; + char pad[4]; + char dir_slash[2]; + /* OpenEXR or PNG */ + short format = (surface->image_fileformat & MOD_DPAINT_IMGFORMAT_OPENEXR) ? DPOUTPUT_OPENEXR : DPOUTPUT_PNG; + + /* Add frame number padding */ + if (frame<10) sprintf(pad,"000"); + else if (frame<100) sprintf(pad,"00"); + else if (frame<1000) sprintf(pad,"0"); + else pad[0] = '\0'; + + /* make sure directory path is valid to append filename */ + if (surface->image_output_path[strlen(surface->image_output_path)-1] != 47 && + surface->image_output_path[strlen(surface->image_output_path)-1] != 92) + strcpy(dir_slash,"/"); + else + dir_slash[0] = '\0'; + + + /* color map */ + if (surface->type == MOD_DPAINT_SURFACE_T_PAINT) { + if (surface->flags & MOD_DPAINT_OUT1) { + sprintf(filename, "%s%s%s%s%i", surface->image_output_path, dir_slash, surface->output_name, pad, (int)frame); + dynamicPaint_outputImage(surface, filename, format, DPOUTPUT_PAINT); + } + if (surface->flags & MOD_DPAINT_OUT2) { + sprintf(filename, "%s%s%s%s%i", surface->image_output_path, dir_slash, surface->output_name2, pad, (int)frame); + dynamicPaint_outputImage(surface, filename, format, DPOUTPUT_WET); + } + } + + /* displacement map */ + else if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE) { + sprintf(filename, "%s%s%s%s%i", surface->image_output_path, dir_slash, surface->output_name, pad, (int)frame); + dynamicPaint_outputImage(surface, filename, format, DPOUTPUT_DISPLACE); + } + + /* waves */ + else if (surface->type == MOD_DPAINT_SURFACE_T_WAVE) { + sprintf(filename, "%s%s%s%s%i", surface->image_output_path, dir_slash, surface->output_name, pad, (int)frame); + dynamicPaint_outputImage(surface, filename, format, DPOUTPUT_WAVES); + } + } + } + return 1; +} + + +/* +* Bake Dynamic Paint image sequence surface +*/ +int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op) +{ + DynamicPaintModifierData *pmd = NULL; + Object *ob = CTX_data_pointer_get_type(C, "object", &RNA_Object).data; + int status = 0; + double timer = PIL_check_seconds_timer(); + DynamicPaintSurface *surface; + + /* + * Get modifier data + */ + pmd = (DynamicPaintModifierData *)modifiers_findByType(ob, eModifierType_DynamicPaint); + if (!pmd) { + BKE_report(op->reports, RPT_ERROR, "Bake Failed: No Dynamic Paint modifier found."); + return 0; + } + + /* Make sure we're dealing with a canvas */ + if (!pmd->canvas) { + BKE_report(op->reports, RPT_ERROR, "Bake Failed: Invalid Canvas."); + return 0; + } + surface = get_activeSurface(pmd->canvas); + + /* Set state to baking and init surface */ + pmd->canvas->error[0] = '\0'; + pmd->canvas->flags |= MOD_DPAINT_BAKING; + G.afbreek= 0; /* reset blender_test_break*/ + + /* Bake Dynamic Paint */ + status = dynamicPaint_bakeImageSequence(C, surface, ob); + /* Clear bake */ + pmd->canvas->flags &= ~MOD_DPAINT_BAKING; + WM_cursor_restore(CTX_wm_window(C)); + dynamicPaint_freeSurfaceData(surface); + + /* Bake was successful: + * Report for ended bake and how long it took */ + if (status) { + + /* Format time string */ + char timestr[30]; + double time = PIL_check_seconds_timer() - timer; + int tmp_val; + timestr[0] = '\0'; + + /* days (just in case someone actually has a very slow pc) */ + tmp_val = (int)floor(time / 86400.0f); + if (tmp_val > 0) sprintf(timestr, "%i Day(s) - ", tmp_val); + /* hours */ + time -= 86400.0f * tmp_val; + tmp_val = (int)floor(time / 3600.0f); + if (tmp_val > 0) sprintf(timestr, "%s%i h ", timestr, tmp_val); + /* minutes */ + time -= 3600.0f * tmp_val; + tmp_val = (int)floor(time / 60.0f); + if (tmp_val > 0) sprintf(timestr, "%s%i min ", timestr, tmp_val); + /* seconds */ + time -= 60.0f * tmp_val; + tmp_val = (int)ceil(time); + sprintf(timestr, "%s%i s", timestr, tmp_val); + + /* Show bake info */ + sprintf(pmd->canvas->ui_info, "Bake Complete! (Time: %s)", timestr); + printf("%s\n", pmd->canvas->ui_info); + } + else { + if (strlen(pmd->canvas->error)) { /* If an error occured */ + sprintf(pmd->canvas->ui_info, "Bake Failed: %s", pmd->canvas->error); + BKE_report(op->reports, RPT_ERROR, pmd->canvas->ui_info); + } + else { /* User cancelled the bake */ + sprintf(pmd->canvas->ui_info, "Baking Cancelled!"); + BKE_report(op->reports, RPT_WARNING, pmd->canvas->ui_info); + } + + /* Print failed bake to console */ + printf("Baking Cancelled!\n"); + } + + return status; +} + +static int dynamicpaint_bake_exec(bContext *C, wmOperator *op) +{ + /* Bake dynamic paint */ + if(!dynamicPaint_initBake(C, op)) { + return OPERATOR_CANCELLED;} + + return OPERATOR_FINISHED; +} + +void DPAINT_OT_bake(wmOperatorType *ot) +{ + /* identifiers */ + ot->name= "Dynamic Paint Bake"; + ot->description= "Bake dynamic paint image sequence surface"; + ot->idname= "DPAINT_OT_bake"; + + /* api callbacks */ + ot->exec= dynamicpaint_bake_exec; + ot->poll= ED_operator_object_active_editable; +} \ No newline at end of file -- cgit v1.2.3