Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_dynamicpaint.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/BKE_dynamicpaint.h')
-rw-r--r--source/blender/blenkernel/BKE_dynamicpaint.h64
1 files changed, 38 insertions, 26 deletions
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h
index 6b470a89703..9f4f2862c95 100644
--- a/source/blender/blenkernel/BKE_dynamicpaint.h
+++ b/source/blender/blenkernel/BKE_dynamicpaint.h
@@ -31,38 +31,40 @@ struct ViewLayer;
/* Actual surface point */
typedef struct PaintSurfaceData {
- void *format_data; /* special data for each surface "format" */
- void *type_data; /* data used by specific surface type */
- struct PaintAdjData *adj_data; /* adjacency data for current surface */
+ void *format_data; /* special data for each surface "format" */
+ void *type_data; /* data used by specific surface type */
+ struct PaintAdjData *adj_data; /* adjacency data for current surface */
- struct PaintBakeData *bData; /* temporary per step data used for frame calculation */
- int total_points;
+ struct PaintBakeData *bData; /* temporary per step data used for frame calculation */
+ int total_points;
} PaintSurfaceData;
/* Paint type surface point */
typedef struct PaintPoint {
- /* Wet paint is handled at effect layer only
- * and mixed to surface when drying */
- float e_color[4];
- float wetness;
- short state;
- float color[4];
+ /* Wet paint is handled at effect layer only
+ * and mixed to surface when drying */
+ float e_color[4];
+ float wetness;
+ short state;
+ float color[4];
} PaintPoint;
/* height field waves */
typedef struct PaintWavePoint {
- float height;
- float velocity;
- float brush_isect;
- short state;
+ float height;
+ float velocity;
+ float brush_isect;
+ short state;
} PaintWavePoint;
-struct Mesh *dynamicPaint_Modifier_do(
- struct DynamicPaintModifierData *pmd, struct Depsgraph *depsgraph, struct Scene *scene,
- struct Object *ob, struct Mesh *me);
+struct Mesh *dynamicPaint_Modifier_do(struct DynamicPaintModifierData *pmd,
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *ob,
+ struct Mesh *me);
void dynamicPaint_Modifier_free(struct DynamicPaintModifierData *pmd);
void dynamicPaint_Modifier_free_runtime(struct DynamicPaintRuntime *runtime);
void dynamicPaint_Modifier_copy(const struct DynamicPaintModifierData *pmd,
@@ -70,7 +72,8 @@ void dynamicPaint_Modifier_copy(const struct DynamicPaintModifierData *pmd,
int flag);
bool dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, struct Scene *scene);
-struct DynamicPaintSurface *dynamicPaint_createNewSurface(struct DynamicPaintCanvasSettings *canvas, struct Scene *scene);
+struct DynamicPaintSurface *dynamicPaint_createNewSurface(
+ struct DynamicPaintCanvasSettings *canvas, struct Scene *scene);
void dynamicPaint_clearSurface(const struct Scene *scene, struct DynamicPaintSurface *surface);
bool dynamicPaint_resetSurface(const struct Scene *scene, struct DynamicPaintSurface *surface);
void dynamicPaint_freeSurface(const struct DynamicPaintModifierData *pmd,
@@ -80,19 +83,28 @@ void dynamicPaint_freeBrush(struct DynamicPaintModifierData *pmd);
void dynamicPaint_freeSurfaceData(struct DynamicPaintSurface *surface);
void dynamicPaint_cacheUpdateFrames(struct DynamicPaintSurface *surface);
-bool dynamicPaint_surfaceHasColorPreview(struct DynamicPaintSurface *surface);
-bool dynamicPaint_outputLayerExists(struct DynamicPaintSurface *surface, struct Object *ob, int output);
+bool dynamicPaint_surfaceHasColorPreview(struct DynamicPaintSurface *surface);
+bool dynamicPaint_outputLayerExists(struct DynamicPaintSurface *surface,
+ struct Object *ob,
+ int output);
void dynamicPaintSurface_updateType(struct DynamicPaintSurface *surface);
void dynamicPaintSurface_setUniqueName(struct DynamicPaintSurface *surface, const char *basename);
void dynamicPaint_resetPreview(struct DynamicPaintCanvasSettings *canvas);
struct DynamicPaintSurface *get_activeSurface(struct DynamicPaintCanvasSettings *canvas);
/* image sequence baking */
-int dynamicPaint_createUVSurface(struct Scene *scene, struct DynamicPaintSurface *surface, float *progress, short *do_update);
-int dynamicPaint_calculateFrame(
- struct DynamicPaintSurface *surface, struct Depsgraph *depsgraph,
- struct Scene *scene, struct Object *cObject, int frame);
-void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface, char *filename, short output_layer);
+int dynamicPaint_createUVSurface(struct Scene *scene,
+ struct DynamicPaintSurface *surface,
+ float *progress,
+ short *do_update);
+int dynamicPaint_calculateFrame(struct DynamicPaintSurface *surface,
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *cObject,
+ int frame);
+void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface,
+ char *filename,
+ short output_layer);
/* PaintPoint state */
#define DPAINT_PAINT_NONE -1