diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-16 20:53:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-16 20:53:34 +0400 |
commit | e6cdce725c624ab06b7d682445d0548d507ff5c8 (patch) | |
tree | 65c20ed384a50809f9a1a7d1b993e4a15dda8b7b /source | |
parent | ee387c6addb2a6c92b48525b0ee5b3b734430002 (diff) |
Code cleanup: use bools & const args
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/transform/transform.h | 13 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 20 |
2 files changed, 17 insertions, 16 deletions
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index e574d1ad469..a3cb9077266 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -80,9 +80,9 @@ typedef struct TransSnap { short modePoint; short modeSelect; bool align; - char project; - char snap_self; - short peel; + bool project; + bool snap_self; + bool peel; short status; float snapPoint[3]; /* snapping from this point */ float snapTarget[3]; /* to this point */ @@ -96,7 +96,8 @@ typedef struct TransSnap { void (*applySnap)(struct TransInfo *, float *); void (*calcSnap)(struct TransInfo *, float *); void (*targetSnap)(struct TransInfo *); - float (*distance)(struct TransInfo *, float p1[3], float p2[3]); // Get the transform distance between two points (used by Closest snap) + /* Get the transform distance between two points (used by Closest snap) */ + float (*distance)(struct TransInfo *, const float p1[3], const float p2[3]); } TransSnap; typedef struct TransCon { @@ -276,7 +277,7 @@ typedef struct MouseInput { void (*post)(struct TransInfo *t, float values[3]); int imval[2]; /* initial mouse position */ - char precision; + bool precision; int precision_mval[2]; /* mouse position when precision key was pressed */ float center[2]; float factor; @@ -349,7 +350,7 @@ typedef struct TransInfo { float axis[3]; float axis_orig[3]; /* TransCon can change 'axis', store the original value here */ - short remove_on_cancel; /* remove elements if operator is canceled */ + bool remove_on_cancel; /* remove elements if operator is canceled */ void *view; struct bContext *context; /* Only valid (non null) during an operator called function. */ diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index c9805ff82c3..9226b05d1dd 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -105,9 +105,9 @@ static void TargetSnapCenter(TransInfo *t); static void TargetSnapClosest(TransInfo *t); static void TargetSnapActive(TransInfo *t); -static float RotationBetween(TransInfo *t, float p1[3], float p2[3]); -static float TranslationBetween(TransInfo *t, float p1[3], float p2[3]); -static float ResizeBetween(TransInfo *t, float p1[3], float p2[3]); +static float RotationBetween(TransInfo *t, const float p1[3], const float p2[3]); +static float TranslationBetween(TransInfo *t, const float p1[3], const float p2[3]); +static float ResizeBetween(TransInfo *t, const float p1[3], const float p2[3]); /****************** IMPLEMENTATIONS *********************/ @@ -596,10 +596,10 @@ void initSnapping(TransInfo *t, wmOperator *op) t->modifiers |= MOD_SNAP; } - t->tsnap.align = ((t->settings->snap_flag & SCE_SNAP_ROTATE) == SCE_SNAP_ROTATE); - t->tsnap.project = ((t->settings->snap_flag & SCE_SNAP_PROJECT) == SCE_SNAP_PROJECT); - t->tsnap.snap_self = !((t->settings->snap_flag & SCE_SNAP_NO_SELF) == SCE_SNAP_NO_SELF); - t->tsnap.peel = ((t->settings->snap_flag & SCE_SNAP_PROJECT) == SCE_SNAP_PROJECT); + t->tsnap.align = ((t->settings->snap_flag & SCE_SNAP_ROTATE) != 0); + t->tsnap.project = ((t->settings->snap_flag & SCE_SNAP_PROJECT) != 0); + t->tsnap.snap_self = !((t->settings->snap_flag & SCE_SNAP_NO_SELF) != 0); + t->tsnap.peel = ((t->settings->snap_flag & SCE_SNAP_PROJECT) != 0); } } @@ -798,12 +798,12 @@ static void ApplySnapResize(TransInfo *t, float vec[3]) /********************** DISTANCE **************************/ -static float TranslationBetween(TransInfo *UNUSED(t), float p1[3], float p2[3]) +static float TranslationBetween(TransInfo *UNUSED(t), const float p1[3], const float p2[3]) { return len_v3v3(p1, p2); } -static float RotationBetween(TransInfo *t, float p1[3], float p2[3]) +static float RotationBetween(TransInfo *t, const float p1[3], const float p2[3]) { float angle, start[3], end[3], center[3]; @@ -859,7 +859,7 @@ static float RotationBetween(TransInfo *t, float p1[3], float p2[3]) return angle; } -static float ResizeBetween(TransInfo *t, float p1[3], float p2[3]) +static float ResizeBetween(TransInfo *t, const float p1[3], const float p2[3]) { float d1[3], d2[3], center[3], len_d1; |