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/makesdna/DNA_color_types.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/makesdna/DNA_color_types.h')
-rw-r--r--source/blender/makesdna/DNA_color_types.h255
1 files changed, 127 insertions, 128 deletions
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index 76746ef2759..219fc96554a 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -29,187 +29,186 @@
/* general defines for kernel functions */
#define CM_RESOL 32
#define CM_TABLE 256
-#define CM_TABLEDIV (1.0f/256.0f)
+#define CM_TABLEDIV (1.0f / 256.0f)
-#define CM_TOT 4
+#define CM_TOT 4
typedef struct CurveMapPoint {
- float x, y;
- /** Shorty for result lookup. */
- short flag, shorty;
+ float x, y;
+ /** Shorty for result lookup. */
+ short flag, shorty;
} CurveMapPoint;
/* curvepoint->flag */
enum {
- CUMA_SELECT = (1 << 0),
- CUMA_HANDLE_VECTOR = (1 << 1),
- CUMA_HANDLE_AUTO_ANIM = (1 << 2),
+ CUMA_SELECT = (1 << 0),
+ CUMA_HANDLE_VECTOR = (1 << 1),
+ CUMA_HANDLE_AUTO_ANIM = (1 << 2),
};
typedef struct CurveMap {
- short totpoint, flag;
-
- /** Quick multiply value for reading table. */
- float range;
- /** The x-axis range for the table. */
- float mintable, maxtable;
- /** For extrapolated curves, the direction vector. */
- float ext_in[2], ext_out[2];
- /** Actual curve. */
- CurveMapPoint *curve;
- /** Display and evaluate table. */
- CurveMapPoint *table;
-
- /** For RGB curves, premulled table. */
- CurveMapPoint *premultable;
- /** For RGB curves, premulled extrapolation vector. */
- float premul_ext_in[2];
- float premul_ext_out[2];
+ short totpoint, flag;
+
+ /** Quick multiply value for reading table. */
+ float range;
+ /** The x-axis range for the table. */
+ float mintable, maxtable;
+ /** For extrapolated curves, the direction vector. */
+ float ext_in[2], ext_out[2];
+ /** Actual curve. */
+ CurveMapPoint *curve;
+ /** Display and evaluate table. */
+ CurveMapPoint *table;
+
+ /** For RGB curves, premulled table. */
+ CurveMapPoint *premultable;
+ /** For RGB curves, premulled extrapolation vector. */
+ float premul_ext_in[2];
+ float premul_ext_out[2];
} CurveMap;
/* cuma->flag */
-#define CUMA_EXTEND_EXTRAPOLATE 1
+#define CUMA_EXTEND_EXTRAPOLATE 1
typedef struct CurveMapping {
- /** Cur; for buttons, to show active curve. */
- int flag, cur;
- int preset;
- int changed_timestamp;
-
- /** Current rect, clip rect (is default rect too). */
- rctf curr, clipr;
-
- /** Max 4 builtin curves per mapping struct now. */
- CurveMap cm[4];
- /** Black/white point (black[0] abused for current frame). */
- float black[3], white[3];
- /** Black/white point multiply value, for speed. */
- float bwmul[3];
-
- /** Sample values, if flag set it draws line and intersection. */
- float sample[3];
-
- short tone;
- char _pad[6];
+ /** Cur; for buttons, to show active curve. */
+ int flag, cur;
+ int preset;
+ int changed_timestamp;
+
+ /** Current rect, clip rect (is default rect too). */
+ rctf curr, clipr;
+
+ /** Max 4 builtin curves per mapping struct now. */
+ CurveMap cm[4];
+ /** Black/white point (black[0] abused for current frame). */
+ float black[3], white[3];
+ /** Black/white point multiply value, for speed. */
+ float bwmul[3];
+
+ /** Sample values, if flag set it draws line and intersection. */
+ float sample[3];
+
+ short tone;
+ char _pad[6];
} CurveMapping;
/* cumapping->flag */
-#define CUMA_DO_CLIP (1 << 0)
-#define CUMA_PREMULLED (1 << 1)
-#define CUMA_DRAW_CFRA (1 << 2)
-#define CUMA_DRAW_SAMPLE (1 << 3)
+#define CUMA_DO_CLIP (1 << 0)
+#define CUMA_PREMULLED (1 << 1)
+#define CUMA_DRAW_CFRA (1 << 2)
+#define CUMA_DRAW_SAMPLE (1 << 3)
/* cumapping->preset */
typedef enum eCurveMappingPreset {
- CURVE_PRESET_LINE = 0,
- CURVE_PRESET_SHARP = 1,
- CURVE_PRESET_SMOOTH = 2,
- CURVE_PRESET_MAX = 3,
- CURVE_PRESET_MID9 = 4,
- CURVE_PRESET_ROUND = 5,
- CURVE_PRESET_ROOT = 6,
- CURVE_PRESET_GAUSS = 7,
- CURVE_PRESET_BELL = 8,
+ CURVE_PRESET_LINE = 0,
+ CURVE_PRESET_SHARP = 1,
+ CURVE_PRESET_SMOOTH = 2,
+ CURVE_PRESET_MAX = 3,
+ CURVE_PRESET_MID9 = 4,
+ CURVE_PRESET_ROUND = 5,
+ CURVE_PRESET_ROOT = 6,
+ CURVE_PRESET_GAUSS = 7,
+ CURVE_PRESET_BELL = 8,
} eCurveMappingPreset;
/* CurveMapping->tone */
typedef enum eCurveMappingTone {
- CURVE_TONE_STANDARD = 0,
- CURVE_TONE_FILMLIKE = 2,
+ CURVE_TONE_STANDARD = 0,
+ CURVE_TONE_FILMLIKE = 2,
} eCurveMappingTone;
/* histogram->mode */
enum {
- HISTO_MODE_LUMA = 0,
- HISTO_MODE_RGB = 1,
- HISTO_MODE_R = 2,
- HISTO_MODE_G = 3,
- HISTO_MODE_B = 4,
- HISTO_MODE_ALPHA = 5,
+ HISTO_MODE_LUMA = 0,
+ HISTO_MODE_RGB = 1,
+ HISTO_MODE_R = 2,
+ HISTO_MODE_G = 3,
+ HISTO_MODE_B = 4,
+ HISTO_MODE_ALPHA = 5,
};
enum {
- HISTO_FLAG_LINE = (1 << 0),
- HISTO_FLAG_SAMPLELINE = (1 << 1),
+ HISTO_FLAG_LINE = (1 << 0),
+ HISTO_FLAG_SAMPLELINE = (1 << 1),
};
typedef struct Histogram {
- int channels;
- int x_resolution;
- float data_luma[256];
- float data_r[256];
- float data_g[256];
- float data_b[256];
- float data_a[256];
- float xmax, ymax;
- short mode;
- short flag;
- int height;
-
- /* sample line only */
- /* image coords src -> dst */
- float co[2][2];
+ int channels;
+ int x_resolution;
+ float data_luma[256];
+ float data_r[256];
+ float data_g[256];
+ float data_b[256];
+ float data_a[256];
+ float xmax, ymax;
+ short mode;
+ short flag;
+ int height;
+
+ /* sample line only */
+ /* image coords src -> dst */
+ float co[2][2];
} Histogram;
-
typedef struct Scopes {
- int ok;
- int sample_full;
- int sample_lines;
- float accuracy;
- int wavefrm_mode;
- float wavefrm_alpha;
- float wavefrm_yfac;
- int wavefrm_height;
- float vecscope_alpha;
- int vecscope_height;
- float minmax[3][2];
- struct Histogram hist;
- float *waveform_1;
- float *waveform_2;
- float *waveform_3;
- float *vecscope;
- int waveform_tot;
- char _pad[4];
+ int ok;
+ int sample_full;
+ int sample_lines;
+ float accuracy;
+ int wavefrm_mode;
+ float wavefrm_alpha;
+ float wavefrm_yfac;
+ int wavefrm_height;
+ float vecscope_alpha;
+ int vecscope_height;
+ float minmax[3][2];
+ struct Histogram hist;
+ float *waveform_1;
+ float *waveform_2;
+ float *waveform_3;
+ float *vecscope;
+ int waveform_tot;
+ char _pad[4];
} Scopes;
/* scopes->wavefrm_mode */
-#define SCOPES_WAVEFRM_LUMA 0
-#define SCOPES_WAVEFRM_RGB_PARADE 1
-#define SCOPES_WAVEFRM_YCC_601 2
-#define SCOPES_WAVEFRM_YCC_709 3
-#define SCOPES_WAVEFRM_YCC_JPEG 4
-#define SCOPES_WAVEFRM_RGB 5
+#define SCOPES_WAVEFRM_LUMA 0
+#define SCOPES_WAVEFRM_RGB_PARADE 1
+#define SCOPES_WAVEFRM_YCC_601 2
+#define SCOPES_WAVEFRM_YCC_709 3
+#define SCOPES_WAVEFRM_YCC_JPEG 4
+#define SCOPES_WAVEFRM_RGB 5
typedef struct ColorManagedViewSettings {
- int flag;
- char _pad[4];
- /** Look which is being applied when displaying buffer on the screen
- * (prior to view transform). */
- char look[64];
- /** View transform which is being applied when displaying buffer on the screen. */
- char view_transform[64];
- /** Fstop exposure. */
- float exposure;
- /** Post-display gamma transform. */
- float gamma;
- /** Pre-display RGB curves transform. */
- struct CurveMapping *curve_mapping;
- void *_pad2;
+ int flag;
+ char _pad[4];
+ /** Look which is being applied when displaying buffer on the screen
+ * (prior to view transform). */
+ char look[64];
+ /** View transform which is being applied when displaying buffer on the screen. */
+ char view_transform[64];
+ /** Fstop exposure. */
+ float exposure;
+ /** Post-display gamma transform. */
+ float gamma;
+ /** Pre-display RGB curves transform. */
+ struct CurveMapping *curve_mapping;
+ void *_pad2;
} ColorManagedViewSettings;
typedef struct ColorManagedDisplaySettings {
- char display_device[64];
+ char display_device[64];
} ColorManagedDisplaySettings;
typedef struct ColorManagedColorspaceSettings {
- /** MAX_COLORSPACE_NAME. */
- char name[64];
+ /** MAX_COLORSPACE_NAME. */
+ char name[64];
} ColorManagedColorspaceSettings;
/* ColorManagedViewSettings->flag */
enum {
- COLORMANAGE_VIEW_USE_CURVES = (1 << 0),
+ COLORMANAGE_VIEW_USE_CURVES = (1 << 0),
};
#endif