diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-28 18:46:09 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-28 18:46:09 +0400 |
| commit | fae903e263fd11d788a4e55900ff25f4fc8b26db (patch) | |
| tree | 28315139a473093c9e697e5dfb111688cfd1c995 /source/blender/blenkernel/BKE_dynamicpaint.h | |
| parent | e441c71f770446c942362a3c75b453159b15c0d1 (diff) | |
Dynamic Paint:
* More code changes pointed by Brecht in codereview.
* Some user interface improvements.
* Updating brush settings now also updates canvas preview.
Diffstat (limited to 'source/blender/blenkernel/BKE_dynamicpaint.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_dynamicpaint.h | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index d9cbed815fc..75b1f74a403 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -14,8 +14,6 @@ #ifndef BKE_DYNAMIC_PAINT_H_ #define BKE_DYNAMIC_PAINT_H_ -#include "DNA_dynamicpaint_types.h" - struct bContext; struct wmOperator; @@ -38,11 +36,7 @@ typedef struct PaintPoint { float e_color[3]; float e_alpha; float wetness; - short state; /* -1 = doesn't exist (On UV mapped image - * there can be points that doesn't exist on mesh surface) - * 0 = empty or dry - * 1 = wet paint - * 2 = new paint */ + short state; float color[3]; float alpha; } PaintPoint; @@ -52,9 +46,7 @@ typedef struct PaintWavePoint { float height; float velocity; - short state; /* 0 = neutral - * 1 = obstacle - * 2 = reflect only */ + short state; } PaintWavePoint; struct DerivedMesh *dynamicPaint_Modifier_do(struct DynamicPaintModifierData *pmd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm); @@ -81,17 +73,17 @@ struct DynamicPaintSurface *get_activeSurface(struct DynamicPaintCanvasSettings /* image sequence baking */ int dynamicPaint_createUVSurface(struct DynamicPaintSurface *surface); int dynamicPaint_calculateFrame(struct DynamicPaintSurface *surface, struct Scene *scene, struct Object *cObject, int frame); -void dynamicPaint_outputImage(struct DynamicPaintSurface *surface, char* filename, short format, short type); - - -/* surface -> image file flags */ -#define DPOUTPUT_JPEG 0 -#define DPOUTPUT_PNG 1 -#define DPOUTPUT_OPENEXR 2 - -#define DPOUTPUT_PAINT 0 -#define DPOUTPUT_WET 1 -#define DPOUTPUT_DISPLACE 2 -#define DPOUTPUT_WAVES 3 +void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface, char* filename, short output_layer); + +/* PaintPoint state */ +#define DPAINT_PAINT_NONE -1 +#define DPAINT_PAINT_DRY 0 +#define DPAINT_PAINT_WET 1 +#define DPAINT_PAINT_NEW 2 + +/* PaintWavePoint state */ +#define DPAINT_WAVE_NONE 0 +#define DPAINT_WAVE_OBSTACLE 1 +#define DPAINT_WAVE_REFLECT_ONLY 2 #endif /* BKE_DYNAMIC_PAINT_H_ */ |