From 79ef35889f850aa7173800bcf67918c14f3b1291 Mon Sep 17 00:00:00 2001 From: Miika Hamalainen Date: Mon, 5 Sep 2011 16:04:15 +0000 Subject: Dynamic Paint: * Added "Initial Color" setting for surfaces. You can for example set color from UV mapped texture or from vertex colors. * Added clamping option for "wave" brushes. * Merged smudge and drip adjacency search code. This fixes some issues with drip effect and makes code easier to maintain. * Some adjustments to the bounding box generation code. * OpenMP is now completely disabled if no compile flag is set. * Wetness values are now properly clamped on vertex surfaces. No more black dots on >1.0 wetness. * Textured brushes now use same function calls as internal renderer, instead of modified duplicates. * Moved operator code to editors/physics/. * Re-enabled some particle brush optimizations. * Fixed sometimes incorrect volume brush influence. * Fixed possible crash when using a brush that uses "Voxel Data" texture simultaneously with material preview or render. * Fixed texture mapping issues for "Object Center" brush. * Fixed possible crash/corruption when duplicating brush object that uses color ramps. * Other tweaking and code cleanup. --- source/blender/blenkernel/BKE_dynamicpaint.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/BKE_dynamicpaint.h') diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index 24cb8c39844..26ad3c294eb 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -18,6 +18,8 @@ struct PaintEffectData; struct PaintBakeData; +struct bContext; +struct wmOperator; /* Actual surface point */ typedef struct PaintSurfaceData { @@ -61,12 +63,22 @@ struct DerivedMesh *dynamicPaint_Modifier_do(struct DynamicPaintModifierData *pm void dynamicPaint_Modifier_free (struct DynamicPaintModifierData *pmd); void dynamicPaint_Modifier_copy(struct DynamicPaintModifierData *pmd, struct DynamicPaintModifierData *tsmd); -void dynamicPaint_cacheUpdateFrames(struct DynamicPaintSurface *surface); -void dynamicPaint_clearSurface(DynamicPaintSurface *surface); +int dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, struct Scene *scene); +struct DynamicPaintSurface *dynamicPaint_createNewSurface(struct DynamicPaintCanvasSettings *canvas, struct Scene *scene); +void dynamicPaint_clearSurface(struct DynamicPaintSurface *surface); int dynamicPaint_resetSurface(struct DynamicPaintSurface *surface); -int dynamicPaint_surfaceHasColorPreview(DynamicPaintSurface *surface); +void dynamicPaint_freeSurface(struct DynamicPaintSurface *surface); +void dynamicPaint_freeCanvas(struct DynamicPaintModifierData *pmd); +void dynamicPaint_freeBrush(struct DynamicPaintModifierData *pmd); + +void dynamicPaint_cacheUpdateFrames(struct DynamicPaintSurface *surface); +int dynamicPaint_surfaceHasColorPreview(struct DynamicPaintSurface *surface); int dynamicPaint_outputLayerExists(struct DynamicPaintSurface *surface, struct Object *ob, int index); void dynamicPaintSurface_updateType(struct DynamicPaintSurface *surface); -void dynamicPaintSurface_setUniqueName(DynamicPaintSurface *surface, char *basename); +void dynamicPaintSurface_setUniqueName(struct DynamicPaintSurface *surface, char *basename); +void dynamicPaint_resetPreview(struct DynamicPaintCanvasSettings *canvas); +struct DynamicPaintSurface *get_activeSurface(struct DynamicPaintCanvasSettings *canvas); + +int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op); #endif /* BKE_DYNAMIC_PAINT_H_ */ -- cgit v1.2.3