kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Use enums rather than defines for clips/tracking flags.

Browse Source 
Helps a lot when debugging.
This commit is contained in:
Sergey Sharybin 2012-11-05 09:40:00 +00:00
parent c557f6f0b6
commit fdcf4e3385
2 changed files with 126 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
source/blender/makesdna/DNA_movieclip_types.h
View File

@ -118,38 +118,50 @@ typedef struct MovieClipScopes {
} MovieClipScopes; } MovieClipScopes;
/* MovieClipProxy->build_size_flag */ /* MovieClipProxy->build_size_flag */
#define MCLIP_PROXY_SIZE_25 (1 << 0) enum {
#define MCLIP_PROXY_SIZE_50 (1 << 1) MCLIP_PROXY_SIZE_25 = (1 << 0),
#define MCLIP_PROXY_SIZE_75 (1 << 2) MCLIP_PROXY_SIZE_50 = (1 << 1),
#define MCLIP_PROXY_SIZE_100 (1 << 3) MCLIP_PROXY_SIZE_75 = (1 << 2),
#define MCLIP_PROXY_UNDISTORTED_SIZE_25 (1 << 4) MCLIP_PROXY_SIZE_100 = (1 << 3),
#define MCLIP_PROXY_UNDISTORTED_SIZE_50 (1 << 5) MCLIP_PROXY_UNDISTORTED_SIZE_25 = (1 << 4),
#define MCLIP_PROXY_UNDISTORTED_SIZE_75 (1 << 6) MCLIP_PROXY_UNDISTORTED_SIZE_50 = (1 << 5),
#define MCLIP_PROXY_UNDISTORTED_SIZE_100 (1 << 7) MCLIP_PROXY_UNDISTORTED_SIZE_75 = (1 << 6),
MCLIP_PROXY_UNDISTORTED_SIZE_100 = (1 << 7)
};
/* MovieClip->source */ /* MovieClip->source */
#define MCLIP_SRC_SEQUENCE 1 enum {
#define MCLIP_SRC_MOVIE 2 MCLIP_SRC_SEQUENCE = 1,
MCLIP_SRC_MOVIE = 2
};
/* MovieClip->selection types */ /* MovieClip->selection types */
#define MCLIP_SEL_NONE 0 enum {
#define MCLIP_SEL_TRACK 1 MCLIP_SEL_NONE = 0,
MCLIP_SEL_TRACK = 1
};
/* MovieClip->flag */ /* MovieClip->flag */
#define MCLIP_USE_PROXY (1 << 0) enum {
#define MCLIP_USE_PROXY_CUSTOM_DIR (1 << 1) MCLIP_USE_PROXY = (1 << 0),
/*#define MCLIP_CUSTOM_START_FRAME (1<<2)*/ /* UNUSED */ MCLIP_USE_PROXY_CUSTOM_DIR = (1 << 1),
/* MCLIP_CUSTOM_START_FRAME = (1<<2), */ /* UNUSED */
#define MCLIP_TIMECODE_FLAGS (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR) MCLIP_TIMECODE_FLAGS = (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR)
};
/* MovieClip->render_size */ /* MovieClip->render_size */
#define MCLIP_PROXY_RENDER_SIZE_FULL 0 enum {
#define MCLIP_PROXY_RENDER_SIZE_25 1 MCLIP_PROXY_RENDER_SIZE_FULL = 0,
#define MCLIP_PROXY_RENDER_SIZE_50 2 MCLIP_PROXY_RENDER_SIZE_25 = 1,
#define MCLIP_PROXY_RENDER_SIZE_75 3 MCLIP_PROXY_RENDER_SIZE_50 = 2,
#define MCLIP_PROXY_RENDER_SIZE_100 4 MCLIP_PROXY_RENDER_SIZE_75 = 3,
MCLIP_PROXY_RENDER_SIZE_100 = 4
};
/* MovieClip->render_flag */ /* MovieClip->render_flag */
#define MCLIP_PROXY_RENDER_UNDISTORT 1 enum {
MCLIP_PROXY_RENDER_UNDISTORT = 1
};
#endif #endif

150
source/blender/makesdna/DNA_tracking_types.h
View File

@ -284,95 +284,129 @@ enum {
}; };
/* MovieTrackingMarker->flag */ /* MovieTrackingMarker->flag */
#define MARKER_DISABLED (1 << 0) enum {
#define MARKER_TRACKED (1 << 1) MARKER_DISABLED = (1 << 0),
#define MARKER_GRAPH_SEL_X (1 << 2) MARKER_TRACKED = (1 << 1),
#define MARKER_GRAPH_SEL_Y (1 << 3) MARKER_GRAPH_SEL_X = (1 << 2),
#define MARKER_GRAPH_SEL (MARKER_GRAPH_SEL_X | MARKER_GRAPH_SEL_Y) MARKER_GRAPH_SEL_Y = (1 << 3),
MARKER_GRAPH_SEL = (MARKER_GRAPH_SEL_X | MARKER_GRAPH_SEL_Y)
};
/* MovieTrackingTrack->flag */ /* MovieTrackingTrack->flag */
#define TRACK_HAS_BUNDLE (1 << 1) enum {
#define TRACK_DISABLE_RED (1 << 2) TRACK_HAS_BUNDLE = (1 << 1),
#define TRACK_DISABLE_GREEN (1 << 3) TRACK_DISABLE_RED = (1 << 2),
#define TRACK_DISABLE_BLUE (1 << 4) TRACK_DISABLE_GREEN = (1 << 3),
#define TRACK_HIDDEN (1 << 5) TRACK_DISABLE_BLUE = (1 << 4),
#define TRACK_LOCKED (1 << 6) TRACK_HIDDEN = (1 << 5),
#define TRACK_CUSTOMCOLOR (1 << 7) TRACK_LOCKED = (1 << 6),
#define TRACK_USE_2D_STAB (1 << 8) TRACK_CUSTOMCOLOR = (1 << 7),
#define TRACK_PREVIEW_GRAYSCALE (1 << 9) TRACK_USE_2D_STAB = (1 << 8),
#define TRACK_DOPE_SEL (1 << 10) TRACK_PREVIEW_GRAYSCALE = (1 << 9),
#define TRACK_PREVIEW_ALPHA (1 << 11) TRACK_DOPE_SEL = (1 << 10),
TRACK_PREVIEW_ALPHA = (1 << 11)
};
/* MovieTrackingTrack->motion_model */ /* MovieTrackingTrack->motion_model */
#define TRACK_MOTION_MODEL_TRANSLATION 0 enum {
#define TRACK_MOTION_MODEL_TRANSLATION_ROTATION 1 TRACK_MOTION_MODEL_TRANSLATION = 0,
#define TRACK_MOTION_MODEL_TRANSLATION_SCALE 2 TRACK_MOTION_MODEL_TRANSLATION_ROTATION = 1,
#define TRACK_MOTION_MODEL_TRANSLATION_ROTATION_SCALE 3 TRACK_MOTION_MODEL_TRANSLATION_SCALE = 2,
#define TRACK_MOTION_MODEL_AFFINE 4 TRACK_MOTION_MODEL_TRANSLATION_ROTATION_SCALE = 3,
#define TRACK_MOTION_MODEL_HOMOGRAPHY 5 TRACK_MOTION_MODEL_AFFINE = 4,
TRACK_MOTION_MODEL_HOMOGRAPHY = 5
};
/* MovieTrackingTrack->algorithm_flag */ /* MovieTrackingTrack->algorithm_flag */
#define TRACK_ALGORITHM_FLAG_USE_BRUTE (1 << 0) enum {
#define TRACK_ALGORITHM_FLAG_USE_NORMALIZATION (1 << 2) TRACK_ALGORITHM_FLAG_USE_BRUTE = (1 << 0),
#define TRACK_ALGORITHM_FLAG_USE_MASK (1 << 3) TRACK_ALGORITHM_FLAG_USE_NORMALIZATION = (1 << 2),
TRACK_ALGORITHM_FLAG_USE_MASK = (1 << 3)
};
/* MovieTrackingTrack->adjframes */ /* MovieTrackingTrack->adjframes */
#define TRACK_MATCH_KEYFRAME 0 enum {
#define TRACK_MATCH_PREVFRAME 1 TRACK_MATCH_KEYFRAME = 0,
TRACK_MATCH_PREVFRAME = 1
};
/* MovieTrackingSettings->flag */ /* MovieTrackingSettings->flag */
#define TRACKING_SETTINGS_SHOW_DEFAULT_EXPANDED (1 << 0) enum {
TRACKING_SETTINGS_SHOW_DEFAULT_EXPANDED = (1 << 0)
};
/* MovieTrackingSettings->motion_flag */ /* MovieTrackingSettings->motion_flag */
#define TRACKING_MOTION_TRIPOD (1 << 0) enum {
TRACKING_MOTION_TRIPOD = (1 << 0),
#define TRACKING_MOTION_MODAL (TRACKING_MOTION_TRIPOD) TRACKING_MOTION_MODAL = (TRACKING_MOTION_TRIPOD)
};
/* MovieTrackingSettings->speed */ /* MovieTrackingSettings->speed */
#define TRACKING_SPEED_FASTEST 0 enum {
#define TRACKING_SPEED_REALTIME 1 TRACKING_SPEED_FASTEST = 0,
#define TRACKING_SPEED_HALF 2 TRACKING_SPEED_REALTIME = 1,
#define TRACKING_SPEED_QUARTER 4 TRACKING_SPEED_HALF = 2,
#define TRACKING_SPEED_DOUBLE 5 TRACKING_SPEED_QUARTER = 4,
TRACKING_SPEED_DOUBLE = 5
};
/* MovieTrackingObject->reconstruction_flag */ /* MovieTrackingObject->reconstruction_flag */
#define TRACKING_USE_FALLBACK_RECONSTRUCTION (1 << 0) enum {
TRACKING_USE_FALLBACK_RECONSTRUCTION = (1 << 0)
};
/* MovieTrackingSettings->refine_camera_intrinsics */ /* MovieTrackingSettings->refine_camera_intrinsics */
#define REFINE_FOCAL_LENGTH (1 << 0) enum {
#define REFINE_PRINCIPAL_POINT (1 << 1) REFINE_FOCAL_LENGTH = (1 << 0),
#define REFINE_RADIAL_DISTORTION_K1 (1 << 2) REFINE_PRINCIPAL_POINT = (1 << 1),
#define REFINE_RADIAL_DISTORTION_K2 (1 << 4) REFINE_RADIAL_DISTORTION_K1 = (1 << 2),
REFINE_RADIAL_DISTORTION_K2 = (1 << 4)
};
/* MovieTrackingStrabilization->flag */ /* MovieTrackingStrabilization->flag */
#define TRACKING_2D_STABILIZATION (1 << 0) enum {
#define TRACKING_AUTOSCALE (1 << 1) TRACKING_2D_STABILIZATION = (1 << 0),
#define TRACKING_STABILIZE_ROTATION (1 << 2) TRACKING_AUTOSCALE = (1 << 1),
TRACKING_STABILIZE_ROTATION = (1 << 2)
};
/* MovieTrackingStrabilization->filter */ /* MovieTrackingStrabilization->filter */
#define TRACKING_FILTER_NEAREAST 0 enum {
#define TRACKING_FILTER_BILINEAR 1 TRACKING_FILTER_NEAREAST = 0,
#define TRACKING_FILTER_BICUBIC 2 TRACKING_FILTER_BILINEAR = 1,
TRACKING_FILTER_BICUBIC = 2
};
/* MovieTrackingReconstruction->flag */ /* MovieTrackingReconstruction->flag */
#define TRACKING_RECONSTRUCTED (1 << 0) enum {
TRACKING_RECONSTRUCTED = (1 << 0)
};
/* MovieTrackingObject->flag */ /* MovieTrackingObject->flag */
#define TRACKING_OBJECT_CAMERA (1 << 0) enum {
TRACKING_OBJECT_CAMERA = (1 << 0)
};
#define TRACKING_CLEAN_SELECT 0 enum {
#define TRACKING_CLEAN_DELETE_TRACK 1 TRACKING_CLEAN_SELECT = 0,
#define TRACKING_CLEAN_DELETE_SEGMENT 2 TRACKING_CLEAN_DELETE_TRACK = 1,
TRACKING_CLEAN_DELETE_SEGMENT = 2
};
/* MovieTrackingDopesheet->sort_method */ /* MovieTrackingDopesheet->sort_method */
#define TRACKING_DOPE_SORT_NAME 0 enum {
#define TRACKING_DOPE_SORT_LONGEST 1 TRACKING_DOPE_SORT_NAME = 0,
#define TRACKING_DOPE_SORT_TOTAL 2 TRACKING_DOPE_SORT_LONGEST = 1,
#define TRACKING_DOPE_SORT_AVERAGE_ERROR 3 TRACKING_DOPE_SORT_TOTAL = 2,
TRACKING_DOPE_SORT_AVERAGE_ERROR = 3
};
/* MovieTrackingDopesheet->flag */ /* MovieTrackingDopesheet->flag */
#define TRACKING_DOPE_SORT_INVERSE (1 << 0) enum {
#define TRACKING_DOPE_SELECTED_ONLY (1 << 1) TRACKING_DOPE_SORT_INVERSE = (1 << 0),
#define TRACKING_DOPE_SHOW_HIDDEN (1 << 2) TRACKING_DOPE_SELECTED_ONLY = (1 << 1),
TRACKING_DOPE_SHOW_HIDDEN = (1 << 2)
};
#endif #endif